Add support for analytic definition of color function (#571)

Co-authored-by: Ben Wilfong <[email protected]>
Co-authored-by: Spencer Bryngelson <[email protected]>

Author: wilfonba

src/pre_process/m_patches.fpp

@@ -969,9 +969,6 @@ contains
 
                         @:analytical()
 
-                        call s_assign_patch_primitive_variables(patch_id, i, j, 0, &
-                                                                eta, q_prim_vf, patch_id_fp)
-
                         if ((q_prim_vf(1)%sf(i, j, 0) < 1.e-10) .and. (model_eqns == 4)) then
                             !zero density, reassign according to Tait EOS
                             q_prim_vf(1)%sf(i, j, 0) = &

toolchain/mfc/case.py

@@ -10,7 +10,8 @@
 
 QPVF_IDX_VARS = {
     'alpha_rho': 'contxb', 'vel'  : 'momxb',         'pres': 'E_idx', 
-    'alpha':     'advxb',  'tau_e': 'stress_idx%beg', 'Y':   'chemxb'
+    'alpha':     'advxb',  'tau_e': 'stress_idx%beg', 'Y':   'chemxb',
+    'cf_val': 'c_idx'
 }
 
 @dataclasses.dataclass(init=False)

toolchain/mfc/run/case_dicts.py

@@ -116,7 +116,7 @@ def analytic(self):
 
     for real_attr in ["radius",  "radii", "epsilon", "beta", "normal", "alpha_rho",
                       "smooth_coeff", "rho", "vel", "alpha", "gamma",
-                      "pi_inf", "r0", "v0", "p0", "m0", "cv", "qv", "qvp", "cf_val"]: 
+                      "pi_inf", "r0", "v0", "p0", "m0", "cv", "qv", "qvp"]:
         PRE_PROCESS[f"patch_icpp({p_id})%{real_attr}"] = ParamType.REAL
     PRE_PROCESS[f"patch_icpp({p_id})%pres"] = ParamType.REAL.analytic()
 
@@ -149,6 +149,8 @@ def analytic(self):
     for taue_id in range(1, 6+1):
         PRE_PROCESS[f'patch_icpp({p_id})%tau_e({taue_id})'] = ParamType.REAL.analytic()
 
+    PRE_PROCESS[f'patch_icpp({p_id})%cf_val'] = ParamType.REAL.analytic()
+
     if p_id >= 2:
         PRE_PROCESS[f'patch_icpp({p_id})%alter_patch'] = ParamType.LOG