bug fix

Author: joergfunger

benchmarks/linear-elastic-plate-with-hole/FEniCS/fenics/Snakefile

@@ -1,14 +1,15 @@
 import json
+import os
 
+tool = "fenics"
 result_dir = config["result_dir"]
 configuration_to_parameter_file = config["configuration_to_parameter_file"]
 configurations = config["configurations"]
-tool = "fenics"
 
 
-rule run_simulation:
+rule run_fenics_simulation:
     input: 
-        script = "{tool}/run_simulation.py",
+        script = "{tool}/run_fenics_simulation.py",
         parameters = lambda wildcards: configuration_to_parameter_file[wildcards.configuration],
         mesh = f"{result_dir}/mesh/mesh_{{configuration}}.msh",
     output:

benchmarks/linear-elastic-plate-with-hole/FEniCS/fenics/run_simulation.py renamed to benchmarks/linear-elastic-plate-with-hole/FEniCS/fenics/run_fenics_simulation.py

@@ -17,7 +17,7 @@
 from plateWithHoleSolution import PlateWithHoleSolution
 
 
-def run_simulation(
+def run_fenics_simulation(
     parameter_file: str, mesh_file: str, solution_file_zip: str, metrics_file: str
 ) -> None:
     ureg = UnitRegistry()
@@ -277,7 +277,7 @@ def mises_stress(u):
         help="Path to the output metrics JSON file (output)",
     )
     args, _ = parser.parse_known_args()
-    run_simulation(
+    run_fenics_simulation(
         args.input_parameter_file,
         args.input_mesh_file,
         args.output_solution_file_zip,

benchmarks/linear-elastic-plate-with-hole/FEniCS/kratos/Snakefile

@@ -1,9 +1,10 @@
 import json
+import os
 
+tool = "kratos"
 result_dir = config["result_dir"]
 configuration_to_parameter_file = config["configuration_to_parameter_file"]
 configurations = config["configurations"]
-tool = "kratos"
 
 kratos_input_template = f"{tool}/input_template.json"
 kratos_material_template = f"{tool}/StructuralMaterials_template.json"
@@ -48,9 +49,9 @@ rule create_kratos_input:
             --output_kratos_materialfile {output.kratos_materialfile}
         """
 
-rule run_simulation:
+rule run_kratos_simulation:
     input: 
-        script = f"{tool}/run_simulation.py",
+        script = f"{tool}/run_kratos_simulation.py",
         parameters = lambda wildcards: configuration_to_parameter_file[wildcards.configuration],
         kratos_inputfile = f"{result_dir}/{tool}/ProjectParameters_{{configuration}}.json",
         kratos_materialfile = f"{result_dir}/{tool}/MaterialParameters_{{configuration}}.json",
@@ -66,7 +67,7 @@ rule run_simulation:
             --input_kratos_materialfile {input.kratos_materialfile}
         """
 
-rule postprocess_results:
+rule postprocess_kratos_results:
     input:
         parameters = lambda wildcards: configuration_to_parameter_file[wildcards.configuration],
         result_vtk = f"{result_dir}/{tool}/{{configuration}}/Structure_0_1.vtk",