fix frontier bug

ChrisZYJ · ChrisZYJ · commit 6ca33675356d · 2025-03-30T22:29:27.000-07:00
diff --git a/examples/1D_brio_wu/case.py b/examples/1D_brio_wu/case.py
@@ -55,8 +55,8 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 1.0,
-            "patch_icpp(1)%B%y": 1.0,
-            "patch_icpp(1)%B%z": 0.0,
+            "patch_icpp(1)%By": 1.0,
+            "patch_icpp(1)%Bz": 0.0,
             "patch_icpp(1)%alpha_rho(1)": 1.0,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 Right
@@ -67,8 +67,8 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 0.1,
-            "patch_icpp(2)%B%y": -1.0,
-            "patch_icpp(2)%B%z": 0.0,
+            "patch_icpp(2)%By": -1.0,
+            "patch_icpp(2)%Bz": 0.0,
             "patch_icpp(2)%alpha_rho(1)": 0.125,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/1D_brio_wu_hlld/case.py b/examples/1D_brio_wu_hlld/case.py
@@ -56,8 +56,8 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 1.0,
-            "patch_icpp(1)%B%y": 1.0,
-            "patch_icpp(1)%B%z": 0.0,
+            "patch_icpp(1)%By": 1.0,
+            "patch_icpp(1)%Bz": 0.0,
             "patch_icpp(1)%alpha_rho(1)": 1.0,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 Right
@@ -68,8 +68,8 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 0.1,
-            "patch_icpp(2)%B%y": -1.0,
-            "patch_icpp(2)%B%z": 0.0,
+            "patch_icpp(2)%By": -1.0,
+            "patch_icpp(2)%Bz": 0.0,
             "patch_icpp(2)%alpha_rho(1)": 0.125,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/1D_brio_wu_rmhd/case.py b/examples/1D_brio_wu_rmhd/case.py
@@ -57,8 +57,8 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 1.0,
-            "patch_icpp(1)%B%y": 1.0,
-            "patch_icpp(1)%B%z": 0.0,
+            "patch_icpp(1)%By": 1.0,
+            "patch_icpp(1)%Bz": 0.0,
             "patch_icpp(1)%alpha_rho(1)": 1.0,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 Right
@@ -69,8 +69,8 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 0.1,
-            "patch_icpp(2)%B%y": -1.0,
-            "patch_icpp(2)%B%z": 0.0,
+            "patch_icpp(2)%By": -1.0,
+            "patch_icpp(2)%Bz": 0.0,
             "patch_icpp(2)%alpha_rho(1)": 0.125,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/1D_dai_woodward/case.py b/examples/1D_dai_woodward/case.py
@@ -64,8 +64,8 @@
             "patch_icpp(1)%vel(2)": 0.01,
             "patch_icpp(1)%vel(3)": 0.5,
             "patch_icpp(1)%pres": 0.95,
-            "patch_icpp(1)%B%y": By_left,
-            "patch_icpp(1)%B%z": Bz_left,
+            "patch_icpp(1)%By": By_left,
+            "patch_icpp(1)%Bz": Bz_left,
             "patch_icpp(1)%alpha_rho(1)": 1.08,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 (Right State)
@@ -76,8 +76,8 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 1.0,
-            "patch_icpp(2)%B%y": By_right,
-            "patch_icpp(2)%B%z": Bz_right,
+            "patch_icpp(2)%By": By_right,
+            "patch_icpp(2)%Bz": Bz_right,
             "patch_icpp(2)%alpha_rho(1)": 1.0,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/1D_dai_woodward_hlld/case.py b/examples/1D_dai_woodward_hlld/case.py
@@ -65,8 +65,8 @@
             "patch_icpp(1)%vel(2)": 0.01,
             "patch_icpp(1)%vel(3)": 0.5,
             "patch_icpp(1)%pres": 0.95,
-            "patch_icpp(1)%B%y": By_left,
-            "patch_icpp(1)%B%z": Bz_left,
+            "patch_icpp(1)%By": By_left,
+            "patch_icpp(1)%Bz": Bz_left,
             "patch_icpp(1)%alpha_rho(1)": 1.08,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 (Right State)
@@ -77,8 +77,8 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 1.0,
-            "patch_icpp(2)%B%y": By_right,
-            "patch_icpp(2)%B%z": Bz_right,
+            "patch_icpp(2)%By": By_right,
+            "patch_icpp(2)%Bz": Bz_right,
             "patch_icpp(2)%alpha_rho(1)": 1.0,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/1D_exp_tube_phasechange/case.py b/examples/1D_exp_tube_phasechange/case.py
@@ -84,7 +84,7 @@
 # save frequency = SF + 1 (because the initial state, 0.dat, is also saved)
 SF = 200
 
-# making Nt divisible B%y SF
+# making Nt divisible By SF
 tendA = (xe - xb) / ss * 0.25
 
 # 1 - ensure NtA is sufficient to go a little beyond tendA
diff --git a/examples/2D_axisym_shockwatercavity/case.py b/examples/2D_axisym_shockwatercavity/case.py
@@ -115,7 +115,7 @@
 
 # I calculating tend twice; first is an estimate, second is
 # the actual value used. This is because I am getting errors in the
-# post process part every time I approximate the actual Nt B%y an integer
+# post process part every time I approximate the actual Nt By an integer
 # number (think of a smarter way).
 
 # dimensionless time
@@ -135,7 +135,7 @@
 # Save Frequency. Note that the number of autosaves will be SF + 1, as th IC (0.dat) is also saved
 SF = 400
 
-## making Nt divisible B%y SF
+## making Nt divisible By SF
 # 1 - ensure NtA goes slightly beyond tendA
 NtA = int(tendA // dt + 1)
 
diff --git a/examples/2D_laplace_pressure_jump/case.py b/examples/2D_laplace_pressure_jump/case.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This case file demonstrates the Laplace pressure jump of a water droplet in air. The laplace pressure jump
-# in 2D is given B%y delta = sigma / r where delta is the pressure jump, sigma is the surface tension coefficient,
+# in 2D is given By delta = sigma / r where delta is the pressure jump, sigma is the surface tension coefficient,
 # and r is the radius of the droplet. The results of this simulation agree with theory to well within 1%
 # relative error.
 
diff --git a/examples/2D_orszag_tang/case.py b/examples/2D_orszag_tang/case.py
@@ -63,9 +63,9 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 5.0 / (12 * math.pi),
-            "patch_icpp(1)%B%x": 0.0,
-            "patch_icpp(1)%B%y": 0.0,
-            "patch_icpp(1)%B%z": 0.0,
+            "patch_icpp(1)%Bx": 0.0,
+            "patch_icpp(1)%By": 0.0,
+            "patch_icpp(1)%Bz": 0.0,
             "patch_icpp(1)%alpha_rho(1)": 25.0 / (36.0 * math.pi),
             "patch_icpp(1)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/2D_orszag_tang_powell/case.py b/examples/2D_orszag_tang_powell/case.py
@@ -65,9 +65,9 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 5.0 / (12 * math.pi),
-            "patch_icpp(1)%B%x": 0.0,
-            "patch_icpp(1)%B%y": 0.0,
-            "patch_icpp(1)%B%z": 0.0,
+            "patch_icpp(1)%Bx": 0.0,
+            "patch_icpp(1)%By": 0.0,
+            "patch_icpp(1)%Bz": 0.0,
             "patch_icpp(1)%alpha_rho(1)": 25.0 / (36.0 * math.pi),
             "patch_icpp(1)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/2D_phasechange_bubble/case.py b/examples/2D_phasechange_bubble/case.py
@@ -150,7 +150,7 @@
 # Critical time-step
 tc = 0.915 * R0 * math.sqrt(rho0wl1 / p01)
 
-# making Nt divisible B%y SF
+# making Nt divisible By SF
 # tendA = 1.5 * tc
 tend = 1.2 * tc
 
diff --git a/examples/2D_phasechange_bubble/casefile.py b/examples/2D_phasechange_bubble/casefile.py
@@ -150,7 +150,7 @@
 # Critical time-step
 tc = 0.915 * R0 * math.sqrt(rho0wl1 / p01)
 
-# making Nt divisible B%y SF
+# making Nt divisible By SF
 # tendA = 1.5 * tc
 tend = 1.2 * tc
 
diff --git a/examples/2D_shock_cloud_rmhd/case.py b/examples/2D_shock_cloud_rmhd/case.py
@@ -64,9 +64,9 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 1e-3,
-            "patch_icpp(1)%B%x": 0.0,
-            "patch_icpp(1)%B%y": 0.0,
-            "patch_icpp(1)%B%z": 0.5,
+            "patch_icpp(1)%Bx": 0.0,
+            "patch_icpp(1)%By": 0.0,
+            "patch_icpp(1)%Bz": 0.5,
             "patch_icpp(1)%alpha_rho(1)": 1.0,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 - Circular density clump (within right patch; pre-shock)
@@ -79,9 +79,9 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 1e-3,
-            "patch_icpp(2)%B%x": 0.0,
-            "patch_icpp(2)%B%y": 0.0,
-            "patch_icpp(2)%B%z": 0.5,
+            "patch_icpp(2)%Bx": 0.0,
+            "patch_icpp(2)%By": 0.0,
+            "patch_icpp(2)%Bz": 0.5,
             "patch_icpp(2)%alpha_rho(1)": 10.0,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Patch 3 - Left (post-shock)
@@ -94,9 +94,9 @@
             "patch_icpp(3)%vel(2)": 0.0,
             "patch_icpp(3)%vel(3)": 0.0,
             "patch_icpp(3)%pres": 127.9483,
-            "patch_icpp(3)%B%x": 0.0,
-            "patch_icpp(3)%B%y": 0.0,
-            "patch_icpp(3)%B%z": -2.12971,
+            "patch_icpp(3)%Bx": 0.0,
+            "patch_icpp(3)%By": 0.0,
+            "patch_icpp(3)%Bz": -2.12971,
             "patch_icpp(3)%alpha_rho(1)": 42.5942,
             "patch_icpp(3)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/2D_shocktube_phasechange/case.py b/examples/2D_shocktube_phasechange/case.py
@@ -138,7 +138,7 @@
 # save frequency = SF + 1 (because the initial state, 0.dat, is also saved)
 SF = 40
 
-# making Nt divisible B%y SF
+# making Nt divisible By SF
 tendA = (xe - xb) / ss * 5 / 24
 
 # 1 - ensure NtA is sufficient to go a little beyond tendA
diff --git a/examples/3D_brio_wu/case.py b/examples/3D_brio_wu/case.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import json
 
-# 1D Brio-Wu Problem in z; Zero B%x
+# 1D Brio-Wu Problem in z; Zero Bx
 # Case is for validation and test suites
 
 # Configuring case dictionary
@@ -65,9 +65,9 @@
             "patch_icpp(1)%vel(2)": 0.0,
             "patch_icpp(1)%vel(3)": 0.0,
             "patch_icpp(1)%pres": 1.0,
-            "patch_icpp(1)%B%x": 0.0,
-            "patch_icpp(1)%B%y": 1.0,
-            "patch_icpp(1)%B%z": 0.75,
+            "patch_icpp(1)%Bx": 0.0,
+            "patch_icpp(1)%By": 1.0,
+            "patch_icpp(1)%Bz": 0.75,
             "patch_icpp(1)%alpha_rho(1)": 1.0,
             "patch_icpp(1)%alpha(1)": 1.0,
             # Patch 2 Top
@@ -82,9 +82,9 @@
             "patch_icpp(2)%vel(2)": 0.0,
             "patch_icpp(2)%vel(3)": 0.0,
             "patch_icpp(2)%pres": 0.1,
-            "patch_icpp(2)%B%x": 0.0,
-            "patch_icpp(2)%B%y": -1.0,
-            "patch_icpp(2)%B%z": 0.75,
+            "patch_icpp(2)%Bx": 0.0,
+            "patch_icpp(2)%By": -1.0,
+            "patch_icpp(2)%Bz": 0.75,
             "patch_icpp(2)%alpha_rho(1)": 0.125,
             "patch_icpp(2)%alpha(1)": 1.0,
             # Fluids Physical Parameters
diff --git a/examples/3D_phasechange_bubble/case.py b/examples/3D_phasechange_bubble/case.py
@@ -150,7 +150,7 @@
 # Critical time-step
 tc = 0.915 * R0 * math.sqrt(rho0wl1 / p01)
 
-# making Nt divisible B%y SF
+# making Nt divisible By SF
 # tendA = 1.5 * tc
 tend = 1.2 * tc
 
diff --git a/examples/3D_shockdroplet/case.py b/examples/3D_shockdroplet/case.py
@@ -125,7 +125,7 @@
 
 # I calculating tend twice; first is an estimate, second is
 # the actual value used. This is because I am getting errors in the
-# post process part every time I approximate the actual Nt B%y an integer
+# post process part every time I approximate the actual Nt By an integer
 # number (think of a smarter way).
 
 # dimensionless time
@@ -145,7 +145,7 @@
 # Save Frequency. Note that the number of autosaves will be SF + 1, as th IC (0.dat) is also saved
 SF = 400
 
-## making Nt divisible B%y SF
+## making Nt divisible By SF
 # 1 - ensure NtA goes slightly beyond tendA
 NtA = int(tendA // dt + 1)
 
diff --git a/examples/scaling/case.py b/examples/scaling/case.py
@@ -179,7 +179,7 @@ def nxyz_from_ncells(ncells: float) -> typing.Tuple[int, int, int]:
 
 # I calculate tend twice; first is an estimate, second is
 # the actual value used. This is because I am getting errors in the
-# post process part every time I approximate the actual Nt B%y an integer
+# post process part every time I approximate the actual Nt By an integer
 # number (think of a smarter way).
 
 # dimensionless time
@@ -197,7 +197,7 @@ def nxyz_from_ncells(ncells: float) -> typing.Tuple[int, int, int]:
 # Save Frequency. Note that the number of autosaves will be SF + 1, as th IC (0.dat) is also saved
 SF = 400
 
-## making Nt divisible B%y SF
+## making Nt divisible By SF
 # 1 - ensure NtA goes slightly beyond tendA
 NtA = int(tendA // dt + 1)
 
diff --git a/src/common/m_derived_types.fpp b/src/common/m_derived_types.fpp
@@ -71,11 +71,12 @@ module m_derived_types
     end type vector_field
 
     !> Generic 3-component vector (e.g., spatial coordinates or field components)
-    type vec3
+    !! Named _dt (derived types: x,y,z) to differentiate from t_vec3 (3-component vector)
+    type vec3_dt ! dt for derived types
         real(wp) :: x
         real(wp) :: y
         real(wp) :: z
-    end type vec3
+    end type vec3_dt
 
     !> Left and right Riemann states
     type riemann_states
@@ -232,7 +233,7 @@ module m_derived_types
         !! the partial densities, density, velocity, pressure, volume fractions,
         !! specific heat ratio function and the liquid stiffness function.
 
-        type(vec3) :: B !<
+        type(vec3_dt) :: B !<
         !! Magnetic field components; B%x is not used for 1D
 
         real(wp), dimension(6) :: tau_e !<
@@ -331,7 +332,7 @@ module m_derived_types
 
     type mpi_io_airfoil_ib_var
         integer, dimension(2) :: view
-        type(vec3), allocatable, dimension(:) :: var
+        type(vec3_dt), allocatable, dimension(:) :: var
     end type mpi_io_airfoil_ib_var
 
     !> Derived type annexing integral regions
diff --git a/src/pre_process/m_global_parameters.fpp b/src/pre_process/m_global_parameters.fpp
@@ -209,7 +209,7 @@ module m_global_parameters
 
     type(ib_patch_parameters), dimension(num_patches_max) :: patch_ib
 
-    type(vec3), allocatable, dimension(:) :: airfoil_grid_u, airfoil_grid_l
+    type(vec3_dt), allocatable, dimension(:) :: airfoil_grid_u, airfoil_grid_l
     !! Database of the immersed boundary patch parameters for each of the
     !! patches employed in the configuration of the initial condition. Note that
     !! the maximum allowable number of patches, num_patches_max, may be changed
diff --git a/src/simulation/m_global_parameters.fpp b/src/simulation/m_global_parameters.fpp
@@ -324,7 +324,7 @@ module m_global_parameters
     logical :: integral_wrt
     integer :: num_probes
     integer :: num_integrals
-    type(vec3), dimension(num_probes_max) :: probe
+    type(vec3_dt), dimension(num_probes_max) :: probe
     type(integral_parameters), dimension(num_probes_max) :: integral
 
     !> @name Reference density and pressure for Tait EOS
@@ -339,7 +339,7 @@ module m_global_parameters
     integer :: num_ibs
 
     type(ib_patch_parameters), dimension(num_patches_max) :: patch_ib
-    type(vec3), allocatable, dimension(:) :: airfoil_grid_u, airfoil_grid_l
+    type(vec3_dt), allocatable, dimension(:) :: airfoil_grid_u, airfoil_grid_l
     integer :: Np
     !! Database of the immersed boundary patch parameters for each of the
     !! patches employed in the configuration of the initial condition. Note that
diff --git a/toolchain/mfc/case.py b/toolchain/mfc/case.py
@@ -10,7 +10,7 @@
 QPVF_IDX_VARS = {
     'alpha_rho': 'contxb', 'vel'  : 'momxb',         'pres': 'E_idx', 
     'alpha':     'advxb',  'tau_e': 'stress_idx%beg', 'Y':   'chemxb',
-    'cf_val': 'c_idx', 'B%x': 'B_idx%beg', 'B%y': 'B_idx%end-1', 'B%z': 'B_idx%end',
+    'cf_val': 'c_idx', 'Bx': 'B_idx%beg', 'By': 'B_idx%end-1', 'Bz': 'B_idx%end',
 }
 # "B_idx%end - 1" not "B_idx%beg + 1" must be used because 1D does not have Bx
 
diff --git a/toolchain/mfc/run/case_dicts.py b/toolchain/mfc/run/case_dicts.py
@@ -153,9 +153,9 @@ def analytic(self):
 
     PRE_PROCESS[f"patch_icpp({p_id})%pres"] = ParamType.REAL.analytic()
 
-    PRE_PROCESS[f"patch_icpp({p_id})%B%x"] = ParamType.REAL.analytic()
-    PRE_PROCESS[f"patch_icpp({p_id})%B%y"] = ParamType.REAL.analytic()
-    PRE_PROCESS[f"patch_icpp({p_id})%B%z"] = ParamType.REAL.analytic()
+    PRE_PROCESS[f"patch_icpp({p_id})%Bx"] = ParamType.REAL.analytic()
+    PRE_PROCESS[f"patch_icpp({p_id})%By"] = ParamType.REAL.analytic()
+    PRE_PROCESS[f"patch_icpp({p_id})%Bz"] = ParamType.REAL.analytic()
 
     for i in range(100):
         PRE_PROCESS[f"patch_icpp({p_id})%Y({i})"] = ParamType.REAL.analytic()
