Validate riemann_solver: require explicit value, remove unimplemented option 3 (#1412)

Author: sbryngelson

benchmarks/igr/case.py

@@ -69,6 +69,7 @@
             "num_patches": 1,
             "model_eqns": 2,
             "num_fluids": 1,
+            "riemann_solver": 5,
             "time_stepper": 3,
             "bc_x%beg": -1,
             "bc_x%end": -1,

examples/2D_IGR_2fluid/case.py

@@ -45,6 +45,7 @@
     "mixture_err": "T",
     "mpp_lim": "F",
     "time_stepper": 3,
+    "riemann_solver": 5,
     "bc_x%beg": -1,
     "bc_x%end": -1,
     "bc_y%beg": -1,

examples/2D_IGR_triple_point/case.py

@@ -30,6 +30,7 @@
             "alt_soundspeed": "F",
             "num_fluids": 2,
             "time_stepper": 3,
+            "riemann_solver": 5,
             "elliptic_smoothing": "T",
             "elliptic_smoothing_iters": 50,
             "igr": "T",

examples/3D_IGR_33jet/case.py

@@ -52,6 +52,7 @@
             "num_fluids": 1,
             "mpp_lim": "F",
             "time_stepper": 3,
+            "riemann_solver": 5,
             "igr": "T",
             "igr_order": 3,
             "igr_pres_lim": "T",

examples/3D_IGR_TaylorGreenVortex/case.py

@@ -49,6 +49,7 @@
             "model_eqns": 2,
             "num_fluids": 1,
             "time_stepper": 3,
+            "riemann_solver": 5,
             "bc_x%beg": -1,
             "bc_x%end": -1,
             "bc_y%beg": -1,

examples/3D_IGR_TaylorGreenVortex_nvidia/case.py

@@ -54,6 +54,7 @@
             "model_eqns": 2,
             "num_fluids": 1,
             "time_stepper": 3,
+            "riemann_solver": 5,
             "bc_x%beg": -1,
             "bc_x%end": -1,
             "bc_y%beg": -1,

examples/3D_IGR_jet/case.py

@@ -78,6 +78,7 @@
             "num_fluids": 2,
             "mpp_lim": "T",
             "time_stepper": 3,
+            "riemann_solver": 5,
             "igr": "T",
             "igr_order": 3,
             "igr_pres_lim": "T",

examples/3D_IGR_jet_1fluid/case.py

@@ -53,6 +53,7 @@
             "num_fluids": 1,
             "mpp_lim": "F",
             "time_stepper": 3,
+            "riemann_solver": 5,
             "igr": "T",
             "igr_order": 5,
             "igr_pres_lim": "T",

toolchain/mfc/case_validator.py

@@ -678,16 +678,16 @@ def check_riemann_solver(self):
         cyl_coord = self.get("cyl_coord", "F") == "T"
         viscous = self.get("viscous", "F") == "T"
 
+        self.prohibit(riemann_solver is None, "riemann_solver must be specified (1=HLL, 2=HLLC, 4=HLLD, 5=Lax-Friedrichs)")
         if riemann_solver is None:
             return
 
-        self.prohibit(riemann_solver < 1 or riemann_solver > 5, "riemann_solver must be 1, 2, 3, 4 or 5")
+        self.prohibit(riemann_solver not in [1, 2, 4, 5], "riemann_solver must be 1 (HLL), 2 (HLLC), 4 (HLLD), or 5 (Lax-Friedrichs)")
         self.prohibit(riemann_solver != 2 and model_eqns == 3, "6-equation model (model_eqns = 3) requires riemann_solver = 2 (HLLC)")
         self.prohibit(wave_speeds is not None and wave_speeds not in [1, 2], "wave_speeds must be 1 or 2")
-        self.prohibit(riemann_solver == 3 and wave_speeds is not None, "Exact Riemann (riemann_solver = 3) does not support wave_speeds")
         self.prohibit(avg_state is not None and avg_state not in [1, 2], "avg_state must be 1 or 2")
-        self.prohibit(riemann_solver not in [3, 5] and wave_speeds is None, "wave_speeds must be set if riemann_solver != 3,5")
-        self.prohibit(riemann_solver not in [3, 5] and avg_state is None, "avg_state must be set if riemann_solver != 3,5")
+        self.prohibit(riemann_solver != 5 and wave_speeds is None, "wave_speeds must be set for riemann_solver 1, 2, or 4")
+        self.prohibit(riemann_solver != 5 and avg_state is None, "avg_state must be set for riemann_solver 1, 2, or 4")
         self.prohibit(low_Mach not in [0, 1, 2], "low_Mach must be 0, 1, or 2")
         self.prohibit(riemann_solver != 2 and low_Mach == 2, "low_Mach = 2 requires riemann_solver = 2")
         self.prohibit(low_Mach != 0 and model_eqns not in [2, 3], "low_Mach = 1 or 2 requires model_eqns = 2 or 3")

toolchain/mfc/params/definitions.py

@@ -623,8 +623,8 @@ def get_value_label(param_name: str, value: int) -> str:
     },
     # Riemann solver
     "riemann_solver": {
-        "choices": [1, 2, 3, 4, 5],
-        "value_labels": {1: "HLL", 2: "HLLC", 3: "Exact", 4: "HLLD", 5: "Lax-Friedrichs"},
+        "choices": [1, 2, 4, 5],
+        "value_labels": {1: "HLL", 2: "HLLC", 4: "HLLD", 5: "Lax-Friedrichs"},
     },
     "wave_speeds": {
         "choices": [1, 2],