5 Equation model and relaxation

examples/1D_exp_tube_phasechange/case.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python3
-import math, json
+import math, json, argparse
+
+parser = argparse.ArgumentParser(prog="phasechange", description="phase change considering both 5 and 6 equation models.", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+parser.add_argument("--mfc", type=json.loads, default="{}", metavar="DICT", help="MFC's toolchain's internal state.")
+parser.add_argument("-me", "--model_eqns", type=int, metavar="MODEL EQN", choices=[2, 3], default=3, help="choose `2' for 5-equation model or `3' for 6-equation model.")
+args = parser.parse_args()
 
 # Pressure
 p01 = 1.175435854855077e05
@@ -123,7 +128,7 @@
             "t_step_save": AS,
             # Simulation Algorithm Parameters
             "num_patches": 2,
-            "model_eqns": 3,
+            "model_eqns": args.model_eqns,
             "num_fluids": 3,
             "mpp_lim": "T",
             "mixture_err": "T",

examples/2D_phasechange_bubble/case.py

@@ -1,5 +1,10 @@
-#!/usr/bin/env python3
-import math, json
+#!/usr/bin/env python3
+import math, json, argparse
+
+parser = argparse.ArgumentParser(prog="phasechange", description="phase change considering both 5 and 6 equation models.", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+parser.add_argument("--mfc", type=json.loads, default="{}", metavar="DICT", help="MFC's toolchain's internal state.")
+parser.add_argument("-me", "--model_eqns", type=int, metavar="MODEL EQN", choices=[2, 3], default=3, help="choose `2' for 5-equation model or `3' for 6-equation model.")
+args = parser.parse_args()
 
 ## 1 FOR BACKGROUND, 2 FOR BUBBLE
 # Pressure [Pa]
@@ -202,7 +207,7 @@
             "t_step_save": AS,
             # Simulation Algorithm Parameters
             "num_patches": 2,
-            "model_eqns": 3,
+            "model_eqns": args.model_eqns,
             "num_fluids": 3,
             "mpp_lim": "T",
             "mixture_err": "T",

examples/2D_phasechange_bubble/casefile.py

@@ -1,5 +1,10 @@
-#!/usr/bin/env python3
-import math, json
+#!/usr/bin/env python3
+import math, json, argparse
+
+parser = argparse.ArgumentParser(prog="phasechange", description="phase change considering both 5 and 6 equation models.", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+parser.add_argument("--mfc", type=json.loads, default="{}", metavar="DICT", help="MFC's toolchain's internal state.")
+parser.add_argument("-me", "--model_eqns", type=int, metavar="MODEL EQN", choices=[2, 3], default=3, help="choose `2' for 5-equation model or `3' for 6-equation model.")
+args = parser.parse_args()
 
 ## 1 FOR BACKGROUND, 2 FOR BUBBLE
 # Pressure [Pa]
@@ -209,7 +214,7 @@
             "t_step_save": AS,
             # Simulation Algorithm Parameters
             "num_patches": 2,
-            "model_eqns": 3,
+            "model_eqns": args.model_eqns,
             "num_fluids": 3,
             "mpp_lim": "T",
             "mixture_err": "T",

examples/2D_shocktube_phasechange/case.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python3
-import math, json
+import math, json, argparse
+
+parser = argparse.ArgumentParser(prog="phasechange", description="phase change considering both 5 and 6 equation models.", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+parser.add_argument("--mfc", type=json.loads, default="{}", metavar="DICT", help="MFC's toolchain's internal state.")
+parser.add_argument("-me", "--model_eqns", type=int, metavar="MODEL EQN", choices=[2, 3], default=3, help="choose `2' for 5-equation model or `3' for 6-equation model.")
+args = parser.parse_args()
 
 ## 1 FOR BACKGROUND, 2 FOR SHOKED STATE, 3 FOR WATER REGION (WHEN NEEDED)
 # Pressure
@@ -173,7 +178,7 @@
             "t_step_save": AS,
             # Simulation Algorithm Parameters
             "num_patches": 3,
-            "model_eqns": 3,
+            "model_eqns": args.model_eqns,
             "num_fluids": 3,
             "mpp_lim": "T",
             "mixture_err": "T",

examples/3D_phasechange_bubble/case.py

@@ -1,5 +1,10 @@
-#!/usr/bin/env python3
-import math, json
+#!/usr/bin/env python3
+import math, json, argparse
+
+parser = argparse.ArgumentParser(prog="phasechange", description="phase change considering both 5 and 6 equation models.", formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+parser.add_argument("--mfc", type=json.loads, default="{}", metavar="DICT", help="MFC's toolchain's internal state.")
+parser.add_argument("-me", "--model_eqns", type=int, metavar="MODEL EQN", choices=[2, 3], default=3, help="choose `2' for 5-equation model or `3' for 6-equation model.")
+args = parser.parse_args()
 
 ## 1 FOR BACKGROUND, 2 FOR BUBBLE
 # Pressure [Pa]
@@ -9,7 +14,6 @@
 # Temperature [K]
 T01 = 298.15
 T02 = 298.15
-# T02 = 7.914
 
 #### FLUID PROPERTIES ####
 
@@ -209,7 +213,7 @@
             "t_step_save": AS,
             # Simulation Algorithm Parameters
             "num_patches": 2,
-            "model_eqns": 3,
+            "model_eqns": args.model_eqns,
             "num_fluids": 3,
             "mpp_lim": "T",
             "mixture_err": "T",

src/common/m_phase_change.fpp

@@ -260,7 +260,9 @@ contains
                         q_cons_vf(i + advxb - 1)%sf(j, k, l) = q_cons_vf(i + contxb - 1)%sf(j, k, l)/rhok(i)
 
                         ! alpha*rho*e
-                        q_cons_vf(i + intxb - 1)%sf(j, k, l) = q_cons_vf(i + contxb - 1)%sf(j, k, l)*ek(i)
+                        if (model_eqns == 3) then
+                            q_cons_vf(i + intxb - 1)%sf(j, k, l) = q_cons_vf(i + contxb - 1)%sf(j, k, l)*ek(i)
+                        end if
 
                         ! Total entropy
                         rhos = rhos + q_cons_vf(i + contxb - 1)%sf(j, k, l)*sk(i)