Merge branch 'main' of https://github.com/PeriHub/PeriLab.jl

Author: CWillberg

Project.toml

@@ -1,7 +1,7 @@
 name = "PeriLab"
 uuid = "2ecefcea-59f0-46dd-9cfd-1d2b8cc5f112"
 authors = ["Christian Willberg <christian.willberg@dlr.de>", "Jan-Timo Hesse <jan-timo.hesse@dlr.de>"]
-version = "1.3.0"
+version = "1.3.1"
 
 [deps]
 AbaqusReader = "bc6b9049-e460-56d6-94b4-a597b2c0390d"

docs/make.jl

@@ -62,6 +62,7 @@ makedocs(
             "Data Manager"=>"lib/data_manager_functions.md",
             "Solver"=>"lib/solver_functions.md",
             "IO"=>"lib/io_functions.md",
+            "Geometry"=>"lib/geometry_functions.md",
             "MPI"=>"lib/mpi_functions.md",
             "Helper"=>"lib/helper_functions.md",
             "Logging"=>"lib/logging_functions.md",

docs/src/lib/geometry_functions.md

@@ -0,0 +1,17 @@
+# IO - Functions
+
+## Index
+
+```@index
+Pages = ["geometry_functions.md"]
+```
+
+```@meta
+CurrentModule = PeriLab
+```
+
+## Geometry
+
+```@autodocs
+Modules = [IO.Geometry]
+Order   = [:function, :type]

docs/src/lib/geometry_functions.md.license

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023 Christian Willberg <christian.willberg@dlr.de>, Jan-Timo Hesse <jan-timo.hesse@dlr.de>
+
+SPDX-License-Identifier: BSD-3-Clause

docs/src/lib/io_functions.md

@@ -17,13 +17,6 @@ Modules = [IO]
 Order   = [:function, :type]
 ```
 
-## Geometry
-
-```@autodocs
-Modules = [IO.Geometry]
-Order   = [:function, :type]
-```
-
 ## parameter_handling
 
 ```@autodocs

src/Core/Data_manager.jl

@@ -20,6 +20,7 @@ export initialize_data
 export get_active_models
 export get_all_field_keys
 export has_key
+export get_step
 export get_accuracy_order
 export get_aniso_crit_values
 export get_block_list
@@ -50,6 +51,7 @@ export get_rotation
 export get_element_rotation
 export init_properties
 export remove_active_model
+export set_step
 export set_accuracy_order
 export set_block_list
 export set_crit_values_matrix
@@ -89,6 +91,7 @@ const data = Dict()
 Initialize all parameter in the datamanager and sets them to the default values.
 """
 function initialize_data()
+    data["step"] = 0
     data["nnodes"] = 0
     data["num_controller"] = 0
     data["num_responder"] = 0
@@ -145,6 +148,31 @@ function initialize_data()
 end
 ###################################
 
+"""
+    set_step(step::Int64)
+
+Set the step of the simulation.
+
+# Arguments
+- `step::Int64`: The step of the simulation.
+
+"""
+function set_step(step::Int64)
+    data["step"] = step
+end
+
+"""
+    get_step()
+
+Get the step of the simulation.
+
+# Returns
+- `Int64`: The step of the simulation.
+
+"""
+function get_step()
+    return data["step"]
+end
 
 """
     add_active_model(key::String, module_name::Module)

src/Core/Solver/Verlet.jl

@@ -477,6 +477,7 @@ function run_solver(
     iter = progress_bar(rank, nsteps, silent)
     #nodes::Vector{Int64} = Vector{Int64}(1:datamanager.get_nnodes())
     @inbounds @fastmath for idt in iter
+        datamanager.set_step(idt)
         @timeit to "Verlet" begin
             if "Material" in solver_options["Models"]
                 uNP1 = datamanager.get_field("Displacements", "NP1")

src/IO/IO.jl

@@ -211,6 +211,8 @@ function get_results_mapping(params::Dict, path::String, datamanager::Module)
         fieldnames = outputs[output]["fieldnames"]
         output_mapping[id]["flush_file"] = get_flush_file(outputs, output)
         output_mapping[id]["write_after_damage"] = get_write_after_damage(outputs, output)
+        output_mapping[id]["start_time"] = get_start_time(outputs, output)
+        output_mapping[id]["end_time"] = get_end_time(outputs, output)
         for fieldname in fieldnames
             compute_name = ""
             compute_params = Dict{}
@@ -577,6 +579,9 @@ function write_results(
         if outputs[id]["write_after_damage"] && max_damage == 0.0
             continue
         end
+        if outputs[id]["start_time"] > time || outputs[id]["end_time"] < time
+            continue
+        end
         output_frequency = datamanager.get_output_frequency()
         output_frequency[id]["Counter"] += 1
         if output_frequency[id]["Counter"] == output_frequency[id]["Output Frequency"]

src/Models/Material/Material_Models/Correspondence/Correspondence_UMAT.jl

@@ -83,10 +83,11 @@ function init_model(
 
     for iID = 1:num_props
         if !haskey(material_parameter, "Property_$iID")
-            @error "Property_$iID is missing. Number of properties is $num_props and properties have to be in order without a missing number."
-            return nothing
+            @warn "Property_$iID is missing. Make sure that all properties are defined."
+            properties[iID] = 0.0
+        else
+            properties[iID] = material_parameter["Property_$iID"]
         end
-        properties[iID] = material_parameter["Property_$iID"]
     end
 
     if !haskey(material_parameter, "UMAT Material Name")
@@ -275,6 +276,8 @@ function compute_stresses(
 
     DFGRD0 = datamanager.get_field("DFGRD0")
     DFGRD1 = datamanager.get_field("Deformation Gradient")
+    JSTEP = datamanager.get_step()
+    KINC::Int64 = 1
     not_supported_int::Int64 = 0
     for iID in nodes
         STATEV_temp = statev[iID, :]
@@ -318,12 +321,12 @@ function compute_stresses(
             not_supported_float,
             DFGRD0[iID, :, :],
             DFGRD1[iID, :, :],
+            iID,
             not_supported_int,
             not_supported_int,
             not_supported_int,
-            not_supported_int,
-            not_supported_int,
-            not_supported_int,
+            JSTEP,
+            KINC,
         )
 
         statev[iID, :] = STATEV_temp

src/PeriLab.jl

@@ -55,7 +55,7 @@ import .Logging_module
 import .IO
 import .Solver_control
 
-PERILAB_VERSION = "1.3.0"
+PERILAB_VERSION = "1.3.1"
 
 export main
 

src/Support/Parameters/parameter_handling.jl

@@ -150,6 +150,8 @@ global expected_structure = Dict(
                             "Output File Type" => [String, false],
                             "Output Filename" => [String, true],
                             "Write After Damage" => [Bool, false],
+                            "Start Time" => [Float64, false],
+                            "End Time" => [Float64, false],
                             "Output Variables" => [
                                 Dict{Any,Any}("Any" => [Bool, true]),
                                 true,

src/Support/Parameters/parameter_handling_output.jl

@@ -4,6 +4,8 @@
 
 export get_flush_file
 export get_write_after_damage
+export get_start_time
+export get_end_time
 export get_outputs
 export get_output_frequency
 export get_output_filenames
@@ -118,6 +120,36 @@ function get_write_after_damage(outputs::Dict, output::String)
     get(outputs[output], "Write After Damage", false)
 end
 
+"""
+    get_start_time(outputs::Dict, output::String)
+
+Get the start_time.
+
+# Arguments
+- `outputs::Dict`: The outputs
+- `output::String`: The output
+# Returns
+- `start_time::Float64`: The value
+"""
+function get_start_time(outputs::Dict, output::String)
+    get(outputs[output], "Start Time", 0.0)
+end
+
+"""
+    get_end_time(outputs::Dict, output::String)
+
+Get the end_time.
+
+# Arguments
+- `outputs::Dict`: The outputs
+- `output::String`: The output
+# Returns
+- `end_time::Float64`: The value
+"""
+function get_end_time(outputs::Dict, output::String)
+    get(outputs[output], "End Time", Inf64)
+end
+
 """
     get_output_fieldnames(outputs::Dict, variables::Vector{String}, computes::Vector{String}, output_type::String)
 

src/Support/Parameters/parameter_handling_solver.jl

@@ -134,7 +134,7 @@ Get the maximum damage.
 # Arguments
 - `params::Dict`: The parameters dictionary.
 # Returns
-- `write_after_damage::Bool`: The value
+- `max_damage::Float64`: The value
 """
 function get_max_damage(params::Dict)
     return Float64(get(params["Solver"], "Maximum Damage", Inf64))

test/unit_tests/Models/Material/Material_Models/Correspondence/ut_Correspondence_UMAT.jl

@@ -60,31 +60,6 @@ end
             Dict{String,Any}(),
         ),
     )
-    @test isnothing(
-        Correspondence_UMAT.init_model(
-            test_data_manager,
-            Vector{Int64}(1:nodes),
-            Dict{String,Any}(
-                "File" => file,
-                "Number of Properties" => 3,
-                "Property_1" => 2,
-                "Property_3" => 2.4,
-            ),
-        ),
-    )
-    @test isnothing(
-        Correspondence_UMAT.init_model(
-            test_data_manager,
-            Vector{Int64}(1:nodes),
-            Dict{String,Any}(
-                "File" => file,
-                "Number of Properties" => 3,
-                "Property_1" => 2,
-                "Property_2" => 2.4,
-                "Property_4" => 2,
-            ),
-        ),
-    )
 
     @test isnothing(
         Correspondence_UMAT.init_model(