precice · MakisH · Feb 7, 2024 · Feb 4, 2024 · Feb 4, 2024 · BenjaminRodenberg
diff --git a/partitioned-heat-conduction/fenics/clean.sh → ...heat-conduction/dirichlet-fenics/clean.sh b/partitioned-heat-conduction/fenics/clean.sh → ...heat-conduction/dirichlet-fenics/clean.sh
diff --git a/...tion/fenics/precice-adapter-config-D.json → ...ichlet-fenics/precice-adapter-config.json b/...tion/fenics/precice-adapter-config-D.json → ...ichlet-fenics/precice-adapter-config.json
diff --git a/partitioned-heat-conduction/dirichlet-fenics/run.sh b/partitioned-heat-conduction/dirichlet-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/heat.py Dirichlet
diff --git a/...at-conduction/openfoam-dirichlet/0.orig/T → ...at-conduction/dirichlet-openfoam/0.orig/T b/...at-conduction/openfoam-dirichlet/0.orig/T → ...at-conduction/dirichlet-openfoam/0.orig/T
diff --git a/...at-conduction/openfoam-dirichlet/clean.sh → ...at-conduction/dirichlet-openfoam/clean.sh b/...at-conduction/openfoam-dirichlet/clean.sh → ...at-conduction/dirichlet-openfoam/clean.sh
diff --git a/...am-dirichlet/constant/transportProperties → ...let-openfoam/constant/transportProperties b/...am-dirichlet/constant/transportProperties → ...let-openfoam/constant/transportProperties
diff --git a/...heat-conduction/openfoam-dirichlet/run.sh → ...heat-conduction/dirichlet-openfoam/run.sh b/...heat-conduction/openfoam-dirichlet/run.sh → ...heat-conduction/dirichlet-openfoam/run.sh
diff --git a/...ion/openfoam-dirichlet/setInitialField.sh → ...ion/dirichlet-openfoam/setInitialField.sh b/...ion/openfoam-dirichlet/setInitialField.sh → ...ion/dirichlet-openfoam/setInitialField.sh
diff --git a/...n/openfoam-dirichlet/system/blockMeshDict → ...n/dirichlet-openfoam/system/blockMeshDict b/...n/openfoam-dirichlet/system/blockMeshDict → ...n/dirichlet-openfoam/system/blockMeshDict
diff --git a/...ion/openfoam-dirichlet/system/controlDict → ...ion/dirichlet-openfoam/system/controlDict b/...ion/openfoam-dirichlet/system/controlDict → ...ion/dirichlet-openfoam/system/controlDict
diff --git a/...penfoam-dirichlet/system/decomposeParDict → ...irichlet-openfoam/system/decomposeParDict b/...penfoam-dirichlet/system/decomposeParDict → ...irichlet-openfoam/system/decomposeParDict
diff --git a/...ction/openfoam-dirichlet/system/fvSchemes → ...ction/dirichlet-openfoam/system/fvSchemes b/...ction/openfoam-dirichlet/system/fvSchemes → ...ction/dirichlet-openfoam/system/fvSchemes
diff --git a/...tion/openfoam-dirichlet/system/fvSolution → ...tion/dirichlet-openfoam/system/fvSolution b/...tion/openfoam-dirichlet/system/fvSolution → ...tion/dirichlet-openfoam/system/fvSolution
diff --git a/...ion/openfoam-dirichlet/system/preciceDict → ...ion/dirichlet-openfoam/system/preciceDict b/...ion/openfoam-dirichlet/system/preciceDict → ...ion/dirichlet-openfoam/system/preciceDict
diff --git a/partitioned-heat-conduction/fenics/.gitignore b/partitioned-heat-conduction/fenics/.gitignore
diff --git a/partitioned-heat-conduction/fenics/run.sh b/partitioned-heat-conduction/fenics/run.sh
diff --git a/partitioned-heat-conduction/neumann-fenics/clean.sh b/partitioned-heat-conduction/neumann-fenics/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e -u
+
+. ../../tools/cleaning-tools.sh
+
+clean_fenics .
diff --git a/...tion/fenics/precice-adapter-config-N.json → ...eumann-fenics/precice-adapter-config.json b/...tion/fenics/precice-adapter-config-N.json → ...eumann-fenics/precice-adapter-config.json
diff --git a/partitioned-heat-conduction/neumann-fenics/run.sh b/partitioned-heat-conduction/neumann-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/heat.py Neumann
diff --git a/...heat-conduction/openfoam-neumann/0.orig/T → ...heat-conduction/neumann-openfoam/0.orig/T b/...heat-conduction/openfoam-neumann/0.orig/T → ...heat-conduction/neumann-openfoam/0.orig/T
diff --git a/...heat-conduction/openfoam-neumann/clean.sh → ...heat-conduction/neumann-openfoam/clean.sh b/...heat-conduction/openfoam-neumann/clean.sh → ...heat-conduction/neumann-openfoam/clean.sh
diff --git a/...foam-neumann/constant/transportProperties → ...ann-openfoam/constant/transportProperties b/...foam-neumann/constant/transportProperties → ...ann-openfoam/constant/transportProperties
diff --git a/...d-heat-conduction/openfoam-neumann/run.sh → ...d-heat-conduction/neumann-openfoam/run.sh b/...d-heat-conduction/openfoam-neumann/run.sh → ...d-heat-conduction/neumann-openfoam/run.sh
diff --git a/...ction/openfoam-neumann/setInitialField.sh → ...ction/neumann-openfoam/setInitialField.sh b/...ction/openfoam-neumann/setInitialField.sh → ...ction/neumann-openfoam/setInitialField.sh
diff --git a/...ion/openfoam-neumann/system/blockMeshDict → ...ion/neumann-openfoam/system/blockMeshDict b/...ion/openfoam-neumann/system/blockMeshDict → ...ion/neumann-openfoam/system/blockMeshDict
diff --git a/...ction/openfoam-neumann/system/controlDict → ...ction/neumann-openfoam/system/controlDict b/...ction/openfoam-neumann/system/controlDict → ...ction/neumann-openfoam/system/controlDict
diff --git a/...duction/openfoam-neumann/system/fvSchemes → ...duction/neumann-openfoam/system/fvSchemes b/...duction/openfoam-neumann/system/fvSchemes → ...duction/neumann-openfoam/system/fvSchemes
diff --git a/...uction/openfoam-neumann/system/fvSolution → ...uction/neumann-openfoam/system/fvSolution b/...uction/openfoam-neumann/system/fvSolution → ...uction/neumann-openfoam/system/fvSolution
diff --git a/...ction/openfoam-neumann/system/preciceDict → ...ction/neumann-openfoam/system/preciceDict b/...ction/openfoam-neumann/system/preciceDict → ...ction/neumann-openfoam/system/preciceDict
diff --git a/partitioned-heat-conduction/openfoam-solver/Make/files b/partitioned-heat-conduction/openfoam-solver/Make/files
diff --git a/partitioned-heat-conduction/openfoam-solver/Make/options b/partitioned-heat-conduction/openfoam-solver/Make/options
diff --git a/...eat-conduction/fenics/errorcomputation.py → ...duction/solver-fenics/errorcomputation.py b/...eat-conduction/fenics/errorcomputation.py → ...duction/solver-fenics/errorcomputation.py
diff --git a/partitioned-heat-conduction/fenics/heat.py → ...ned-heat-conduction/solver-fenics/heat.py b/partitioned-heat-conduction/fenics/heat.py → ...ned-heat-conduction/solver-fenics/heat.py
@@ -53,13 +53,11 @@ def determine_gradient(V_g, u, flux):
 
 
 parser = argparse.ArgumentParser(description="Solving heat equation for simple or complex interface case")
-command_group = parser.add_mutually_exclusive_group(required=True)
-command_group.add_argument("-d", "--dirichlet", help="create a dirichlet problem", dest="dirichlet",
-                           action="store_true")
-command_group.add_argument("-n", "--neumann", help="create a neumann problem", dest="neumann", action="store_true")
+parser.add_argument("participantName", help="Name of the solver.", type=str, choices=[p.value for p in ProblemType])
 parser.add_argument("-e", "--error-tol", help="set error tolerance", type=float, default=10**-8,)
 
 args = parser.parse_args()
+participant_name = args.participantName
 
 fenics_dt = .01  # time step size
 # Error is bounded by coupling accuracy. In theory we would obtain the analytical solution.
@@ -68,10 +66,10 @@ def determine_gradient(V_g, u, flux):
 alpha = 3  # parameter alpha
 beta = 1.2  # parameter beta
 
-if args.dirichlet and not args.neumann:
+if participant_name == ProblemType.DIRICHLET.value:
     problem = ProblemType.DIRICHLET
     domain_part = DomainPart.LEFT
-elif args.neumann and not args.dirichlet:
+elif participant_name == ProblemType.NEUMANN.value:
     problem = ProblemType.NEUMANN
     domain_part = DomainPart.RIGHT
 
@@ -101,15 +99,14 @@ def determine_gradient(V_g, u, flux):
 precice, precice_dt, initial_data = None, 0.0, None
 
 # Initialize the adapter according to the specific participant
+precice = Adapter(adapter_config_filename="precice-adapter-config.json")
+
 if problem is ProblemType.DIRICHLET:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-D.json")
     precice.initialize(coupling_boundary, read_function_space=V, write_object=f_N_function)
-    precice_dt = precice.get_max_time_step_size()
 elif problem is ProblemType.NEUMANN:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-N.json")
     precice.initialize(coupling_boundary, read_function_space=W, write_object=u_D_function)
-    precice_dt = precice.get_max_time_step_size()
 
+precice_dt = precice.get_max_time_step_size()
 dt = Constant(0)
 dt.assign(np.min([fenics_dt, precice_dt]))
 

diff --git a/...heat-conduction/fenics/heatHigherOrder.py → ...nduction/solver-fenics/heatHigherOrder.py b/...heat-conduction/fenics/heatHigherOrder.py → ...nduction/solver-fenics/heatHigherOrder.py
@@ -61,13 +61,11 @@ def determine_gradient(V_g, u, flux):
 
 
 parser = argparse.ArgumentParser(description="Solving heat equation for simple or complex interface case")
-command_group = parser.add_mutually_exclusive_group(required=True)
-command_group.add_argument("-d", "--dirichlet", help="create a dirichlet problem", dest="dirichlet",
-                           action="store_true")
-command_group.add_argument("-n", "--neumann", help="create a neumann problem", dest="neumann", action="store_true")
+parser.add_argument("participantName", help="Name of the solver.", type=str, choices=[p.value for p in ProblemType])
 parser.add_argument("-e", "--error-tol", help="set error tolerance", type=float, default=10**-8,)
 
 args = parser.parse_args()
+participant_name = args.participantName
 
 fenics_dt = .01  # time step size
 # Error is bounded by coupling accuracy. In theory we would obtain the analytical solution.
@@ -76,10 +74,10 @@ def determine_gradient(V_g, u, flux):
 alpha = 3  # parameter alpha
 beta = 1.2  # parameter beta
 
-if args.dirichlet and not args.neumann:
+if participant_name == ProblemType.DIRICHLET.value:
     problem = ProblemType.DIRICHLET
     domain_part = DomainPart.LEFT
-elif args.neumann and not args.dirichlet:
+elif participant_name == ProblemType.NEUMANN.value:
     problem = ProblemType.NEUMANN
     domain_part = DomainPart.RIGHT
 
@@ -121,15 +119,14 @@ def determine_gradient(V_g, u, flux):
 precice, precice_dt, initial_data = None, 0.0, None
 
 # Initialize the adapter according to the specific participant
+precice = Adapter(adapter_config_filename="precice-adapter-config.json")
+
 if problem is ProblemType.DIRICHLET:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-D.json")
     precice.initialize(coupling_boundary, read_function_space=V, write_object=f_N_function)
-    precice_dt = precice.get_max_time_step_size()
 elif problem is ProblemType.NEUMANN:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-N.json")
     precice.initialize(coupling_boundary, read_function_space=W, write_object=u_D_function)
-    precice_dt = precice.get_max_time_step_size()
 
+precice_dt = precice.get_max_time_step_size()
 dt = Constant(0)
 dt.assign(np.min([fenics_dt, precice_dt]))
 

diff --git a/...tioned-heat-conduction/fenics/my_enums.py → ...heat-conduction/solver-fenics/my_enums.py b/...tioned-heat-conduction/fenics/my_enums.py → ...heat-conduction/solver-fenics/my_enums.py
@@ -5,8 +5,8 @@ class ProblemType(Enum):
     """
     Enum defines problem type. Details see above.
     """
-    DIRICHLET = 1  # Dirichlet problem
-    NEUMANN = 2  # Neumann problem
+    DIRICHLET = "Dirichlet"  # Dirichlet problem
+    NEUMANN = "Neumann"  # Neumann problem
 
 
 class DomainPart(Enum):

diff --git a/...d-heat-conduction/fenics/problem_setup.py → ...conduction/solver-fenics/problem_setup.py b/...d-heat-conduction/fenics/problem_setup.py → ...conduction/solver-fenics/problem_setup.py
diff --git a/...onduction/fenics/utils/ButcherTableaux.py → ...on/solver-fenics/utils/ButcherTableaux.py b/...onduction/fenics/utils/ButcherTableaux.py → ...on/solver-fenics/utils/ButcherTableaux.py
diff --git a/...-heat-conduction/fenics/utils/__init__.py → ...onduction/solver-fenics/utils/__init__.py b/...-heat-conduction/fenics/utils/__init__.py → ...onduction/solver-fenics/utils/__init__.py
diff --git a/...ned-heat-conduction/fenics/utils/utils.py → ...t-conduction/solver-fenics/utils/utils.py b/...ned-heat-conduction/fenics/utils/utils.py → ...t-conduction/solver-fenics/utils/utils.py
@@ -30,7 +30,7 @@ def b_splines(precice, degree, dt):
     for node in nodes:
         val = precice.read_data(node)
         # check if every key set is equal
-        assert(key_ref == val.keys())
+        assert (key_ref == val.keys())
         weights[i] = val
         i += 1
 

diff --git a/...eat-conduction/openfoam-solver/.gitignore → ...eat-conduction/solver-openfoam/.gitignore b/...eat-conduction/openfoam-solver/.gitignore → ...eat-conduction/solver-openfoam/.gitignore
diff --git a/...-heat-conduction/openfoam-solver/clean.sh → ...-heat-conduction/solver-openfoam/clean.sh b/...-heat-conduction/openfoam-solver/clean.sh → ...-heat-conduction/solver-openfoam/clean.sh
diff --git a/...conduction/openfoam-solver/createFields.H → ...conduction/solver-openfoam/createFields.H b/...conduction/openfoam-solver/createFields.H → ...conduction/solver-openfoam/createFields.H
diff --git a/...conduction/openfoam-solver/heatTransfer.C → ...conduction/solver-openfoam/heatTransfer.C b/...conduction/openfoam-solver/heatTransfer.C → ...conduction/solver-openfoam/heatTransfer.C
diff --git a/...d-heat-conduction/openfoam-solver/write.H → ...d-heat-conduction/solver-openfoam/write.H b/...d-heat-conduction/openfoam-solver/write.H → ...d-heat-conduction/solver-openfoam/write.H