Merge pull request #84 from Cthonios/physics-tweak

adding num props and num states to abstract physics type. Also fixed …

Author: cmhamel

src/FiniteElementContainers.jl

@@ -79,6 +79,11 @@ export SymmetricTensorFunction
 export TensorFunction
 export VectorFunction
 
+# Physics
+export AbstractPhysics
+export num_properties
+export num_states
+
 # dependencies
 import AcceleratedKernels as AK
 import KernelAbstractions as KA

src/assemblers/Assemblers.jl

@@ -136,13 +136,11 @@ KA.@kernel function _assemble_block_stiffness_kernel!(assembler, physics, ref_fe
     K_el = K_el + K_q
   end
 
-  # start_id = (block_id - 1) * assembler.pattern.block_sizes[block_id] + 
-  #            (el_id - 1) * assembler.pattern.block_offsets[block_id] + 1
-  # end_id = start_id + assembler.pattern.block_offsets[block_id] - 1
-  # TODO patch this up for multi-block later
-  # hardcoded for single block quad4
-  start_id = (E - 1) * 16 + 1
-  end_id = start_id + 16 - 1
+  block_size = values(assembler.pattern.block_sizes)[block_id]
+  block_offset = values(assembler.pattern.block_offsets)[block_id]
+  start_id = (block_id - 1) * block_size + 
+             (E - 1) * block_offset + 1
+  end_id = start_id + block_offset - 1
   ids = start_id:end_id
   for (i, id) in enumerate(ids)
     Atomix.@atomic assembler.stiffness_storage[id] += K_el.data[i]
@@ -174,9 +172,10 @@ function assemble!(assembler, physics, U::H1Field, sym::Symbol)
   # fill!(assembler.residual_storage, zero(eltype(assembler.residual_storage)))
   _zero_storage(assembler, Val{sym}())
   fspace = assembler.dof.H1_vars[1].fspace
+  X = fspace.coords
   for (b, conns) in enumerate(values(fspace.elem_conns))
     ref_fe = values(fspace.ref_fes)[b]
-    _assemble_block!(assembler, physics, sym, ref_fe, U, fspace.coords, conns, b)
+    _assemble_block!(assembler, physics, sym, ref_fe, U, X, conns, b)
   end
   return nothing
 end

src/physics/Physics.jl

@@ -1,6 +1,11 @@
-abstract type AbstractPhysics end
+abstract type AbstractPhysics{NP, NS} end
+num_properties(::AbstractPhysics{NP, NS}) where {NP, NS} = NP
+num_states(::AbstractPhysics{NP, NS}) where {NP, NS} = NS
 
 # better define this interface
+# function damping end
+function damping end
 function energy end
+function mass end
 function residual end
 function stiffness end

test/TestPhysics.jl

@@ -0,0 +1,8 @@
+@testset ExtendedTestSet "Physics" begin
+  struct MyPhysics <: AbstractPhysics{2, 3}
+  end
+  
+  physics = MyPhysics()
+  @test num_properties(physics) == 2
+  @test num_states(physics) == 3
+end

test/poisson/TestPoisson2.jl

@@ -13,7 +13,7 @@ output_file = "./poisson/poisson.e"
 f(X, _) = 2. * π^2 * sin(π * X[1]) * sin(π * X[2])
 bc_func(_, _) = 0.
 
-struct Poisson <: FiniteElementContainers.AbstractPhysics
+struct Poisson <: AbstractPhysics{0, 0}
 end
 
 function FiniteElementContainers.residual(::Poisson, cell, u_el, args...)

test/poisson/TestPoissonCUDA.jl

@@ -14,7 +14,7 @@ using SparseArrays
 f(X, _) = 2. * π^2 * sin(2π * X[1]) * sin(2π * X[2])
 bc_func(_, _) = 0.
 
-struct Poisson <: FiniteElementContainers.AbstractPhysics
+struct Poisson <: AbstractPhysics{0, 0}
 end
 
 function FiniteElementContainers.residual(::Poisson, cell, u_el, args...)
@@ -94,7 +94,7 @@ function poisson_cuda()
   close(exo)
 end
 
-# @time poisson_cuda()
-# @time poisson_cuda()
+@time poisson_cuda()
+@time poisson_cuda()
 
-@benchmark poisson_cuda()
+# @benchmark poisson_cuda()

test/runtests.jl

@@ -18,6 +18,7 @@ include("TestFields.jl")
 include("TestFormulations.jl")
 # include("TestFunctionSpaces.jl")
 include("TestMesh.jl")
+include("TestPhysics.jl")
 
 # @testset ExtendedTestSet "Eigen problem" begin
 #   include("eigen/TestEigen.jl")