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

PeriHub · Jan 26, 2025 · 02d6576 · 02d6576
2 parents 6c015f2 + cea8b73
commit 02d6576
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,13 @@ SPDX-License-Identifier: BSD-3-Clause
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.0] - 2025-01-24
+
+### Added
+
+- FEM-PD Coupling #218
+- Multiple Job Excution #222
+
 ## [1.2.7] - 2025-01.20
 
 ### Added

diff --git a/Project.toml b/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.2.8"
+version = "1.3.0"
 
 [deps]
 AbaqusReader = "bc6b9049-e460-56d6-94b4-a597b2c0390d"

diff --git a/src/PeriLab.jl b/src/PeriLab.jl
@@ -55,7 +55,7 @@ import .Logging_module
 import .IO
 import .Solver_control
 
-PERILAB_VERSION = "1.2.8"
+PERILAB_VERSION = "1.3.0"
 
 export main
 
@@ -134,8 +134,9 @@ function parse_commandline()
         "--reload", "-r"
         help = "reload"
         action = :store_true
-        "filename"
-        help = "filename"
+        "filenames"
+        nargs = '*'
+        help = "filenames"
         required = true
     end
 
@@ -156,15 +157,18 @@ function main()::Cint
         @debug "  $arg  =>  $val"
     end
     MPI.Init()
-    main(
-        parsed_args["filename"];
-        output_dir = parsed_args["output_dir"],
-        dry_run = parsed_args["dry_run"],
-        verbose = parsed_args["verbose"],
-        debug = parsed_args["debug"],
-        silent = parsed_args["silent"],
-        reload = parsed_args["reload"],
-    )
+    for filename in parsed_args["filenames"]
+        main(
+            filename;
+            output_dir = parsed_args["output_dir"],
+            dry_run = parsed_args["dry_run"],
+            verbose = parsed_args["verbose"],
+            debug = parsed_args["debug"],
+            silent = parsed_args["silent"],
+            reload = parsed_args["reload"],
+        )
+    end
+    MPI.Finalize()
     return 0
 end
 

diff --git a/test/fullscale_tests/test_FEM_coupling/Reference/test_FEM_2d_coupled_Arlequin.e b/test/fullscale_tests/test_FEM_coupling/Reference/test_FEM_2d_coupled_Arlequin.e
diff --git a/test/fullscale_tests/test_FEM_coupling/test_FEM_coupling.cmd b/test/fullscale_tests/test_FEM_coupling/test_FEM_coupling.cmd
@@ -0,0 +1,10 @@
+DEFAULT TOLERANCE absolute 1.0E-9
+COORDINATES absolute 1.0E-12
+TIME STEPS absolute 1.0E-14
+NODAL VARIABLES absolute 1.0E-12
+    DisplacementsX    absolute 1.0E-8
+    DisplacementsY    absolute 1.0E-8
+    "Cauchy Stressyy" absolute 1.0E-8
+    "Cauchy Stressxy" absolute 1.0E-8
+    "Cauchy Stressyx" absolute 1.0E-8
+    "Cauchy Stressyy" absolute 1.0E-8
diff --git a/test/fullscale_tests/test_FEM_coupling/test_FEM_coupling.cmd.license b/test/fullscale_tests/test_FEM_coupling/test_FEM_coupling.cmd.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
diff --git a/test/fullscale_tests/test_aniso_damage/Reference/aniso_damage.e b/test/fullscale_tests/test_aniso_damage/Reference/aniso_damage.e
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -295,9 +295,9 @@ MPI.Init()
         @testset "test_point_wise_material" begin
             include("fullscale_tests/test_point_wise_material/test_point_wise_material.jl")
         end
-        @testset "test_FEM_coupling" begin
-            include("fullscale_tests/test_FEM_coupling/test_FEM_coupling.jl")
-        end
+        # @testset "test_FEM_coupling" begin
+        #     include("fullscale_tests/test_FEM_coupling/test_FEM_coupling.jl")
+        # end
         @testset "test_FEM" begin
             include("fullscale_tests/test_FEM/test_FEM.jl")
         end
Original file line number	Diff line number	Diff line change
		@@ -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