solve #62

Author: CWillberg

src/Models/Material/Material_Models/Zero_Energy_Control/Global_Zero_Energy_Control.jl

@@ -7,11 +7,12 @@ module Global_Zero_Energy_Control
 using StaticArrays: MMatrix, MVector
 using LoopVectorization
 
-using ...Data_Manager
-using ...Helpers: get_fourth_order
-using ..Material_Basis: get_Hooke_matrix
-using ...Geometry: rotation_tensor
+using ....Data_Manager
+using ....Helpers: get_fourth_order
+using ...Material_Basis: get_Hooke_matrix
+using ....Geometry: rotation_tensor
 
+export init_model
 export control_name
 export compute_control
 export global_zero_energy_mode_stiffness
@@ -264,8 +265,7 @@ function create_zero_energy_mode_stiffness!(nodes::AbstractVector{Int64},
                                             CVoigt::AbstractArray{Float64,3},
                                             angles::AbstractArray{Float64},
                                             Kinv::AbstractArray{Float64,3},
-                                            zStiff::AbstractArray{Float64,3}) where {N,
-                                                                                     N2}
+                                            zStiff::AbstractArray{Float64,3})
     for iID in nodes
         @views C = get_fourth_order(CVoigt[iID, :, :], dof)
         @views C = rotate_fourth_order_tensor(angles[iID, :], C, dof, false)

src/Models/Material/Material_Models/Zero_Energy_Control/Zero_Energy_Control.jl

@@ -7,17 +7,18 @@ using TimerOutputs: @timeit
 
 using .....Data_Manager
 using .....Solver_Manager: find_module_files, create_module_specifics
-global module_list = find_module_files(@__DIR__, "correspondence_name")
+global module_list = find_module_files(@__DIR__, "control_name")
 for mod in module_list
     include(mod["File"])
 end
 
 function init_model(nodes::AbstractVector{Int64}, material_parameter::Dict, block::Int64)
     if haskey(material_parameter, "Zero Energy Control")
         zero_energy_model = material_parameter["Zero Energy Control"]
-        @info zero_energy_model
+        @info "Init zero energy control model ''$zero_energy_model'' at block $block."
         Data_Manager.set_analysis_model("Zero Energy Control Model", block,
                                         zero_energy_model)
+
         mod = create_module_specifics(zero_energy_model,
                                       module_list,
                                       @__MODULE__,
@@ -27,7 +28,7 @@ function init_model(nodes::AbstractVector{Int64}, material_parameter::Dict, bloc
     else
         Data_Manager.set_analysis_model("Zero Energy Control Model", block, [])
 
-        @warn "No zero energy control activated for corresponcence in block $block. Might cause errors."
+        @warn "No zero energy control activated for corresponcence in block $block. This might cause errors."
     end
 end
 
@@ -36,13 +37,15 @@ function compute_control(nodes::AbstractVector{Int64},
                          block::Int64,
                          time::Float64,
                          dt::Float64)
-    zero_energy_model=Data_Manager.get_analysis_model("Zero Energy Control Model", block)
-    mod = Data_Manager.get_model_module(zero_energy_model)
+    for zero_energy_model in Data_Manager.get_analysis_model("Zero Energy Control Model",
+                                        block)
+        mod = Data_Manager.get_model_module(zero_energy_model)
 
-    zero_energy_model.compute_control(nodes,
-                                      material_parameter,
-                                      time,
-                                      dt)
+        mod.compute_control(nodes,
+                            material_parameter,
+                            time,
+                            dt)
+    end
 end
 ```
 create_zero_energy_mode_stiffness! interface for matrix based models
@@ -53,9 +56,9 @@ function create_zero_energy_mode_stiffness!(nodes::AbstractVector{Int64},
                                             CVoigt::AbstractArray{Float64,3},
                                             Kinv::Array{Float64,3},
                                             zStiff::Array{Float64,3})
-    zero_energy_model=Data_Manager.get_analysis_model("Zero Energy Control Model", 1)
+    zero_energy_model = Data_Manager.get_analysis_model("Zero Energy Control Model", 1)
     mod = Data_Manager.get_model_module(zero_energy_model)
-    return mod.create_zero_energy_mode_stiffness!(nodes, dof, C_voigt,
-                                                  inverse_shape_tensor, zStiff)
+    return mod.create_zero_energy_mode_stiffness!(nodes, dof, CVoigt,
+                                                  Kinv, zStiff)
 end
 end

test/runtests.jl

@@ -177,7 +177,7 @@ MPI.Init()
                     include("unit_tests/Models/Material/ut_Material_Factory.jl")
                 end
                 @testset "ut_control" begin
-                    include("unit_tests/Models/Material/Zero_Energy_Control/ut_global_control.jl")
+                    include("unit_tests/Models/Material/Zero_Energy_Control/ut_Global_Zero_Energy_Control.jl")
                 end
                 @testset "ut_material_basis" begin
                     include("unit_tests/Models/Material/ut_material_basis.jl")