minor changes to core code used to generate results for JFM revision one

Author: ray-chew

RKLM_Python/inputs/boundary.py

@@ -463,11 +463,13 @@ def rayleigh_damping(Sol, mpv, ud, elem, node, forcing=None):
             C = ud.Cs * ud.u_ref
             Gam = N * G / C
             Om = ud.coriolis_strength[2] / 2.0 / ud.t_ref
+            # Om = 7.292 * 1e-5 / ud.t_ref
             growth_rate = np.sqrt(Om * C * Gam)
             mfac = np.exp(growth_rate * t * ud.t_ref)
 
             # if np.all(ud.coriolis_strength) == 0.0:
-            #     mfac = 1.0
+            # if ud.trad_forcing:
+                # mfac = 1.0
         else:
             mfac = 1.0
 

RKLM_Python/inputs/lamb_wave_perturb.py

@@ -40,6 +40,7 @@ def __init__(self):
         self.gamm = self.gamma
         self.Rg_over_Rv = self.R_gas / self.R_vap
         self.Q = self.Q_vap / (self.R_gas * self.T_ref)
+        self.R_gas = self.R_gas
         self.Rg = self.R_gas / (self.h_ref**2 / self.t_ref**2 / self.T_ref)
         self.cp_gas = self.cp_gas
 
@@ -263,7 +264,7 @@ def sol_init(Sol, mpv, elem, node, th, ud, seeds=None):
 
         ud.forcing_tcy, ud.forcing_tny = get_bottom_tau_y(ud, elem, node, 0.2, cutoff=0.3)
 
-    A0 = 1.0e-3
+    A0 = 1.0e-1 / ud.u_ref
     Msq = ud.Msq
     g = ud.gravity_strength[1] * ud.Rg
 
@@ -350,4 +351,9 @@ def sol_init(Sol, mpv, elem, node, th, ud, seeds=None):
         if ud.mixed_run:
             ud.coriolis_strength[2] = 2.0 * 7.292 * 1e-5 * ud.t_ref
 
+    if hasattr(ud, 'trad_forcing'):
+        if ud.trad_forcing:
+            ud.rf_bot.F = 0.0
+            ud.rf_bot.get_T_matrix()
+
     return Sol

RKLM_Python/management/data.py

@@ -207,7 +207,7 @@ def time_update(Sol,flux,mpv,t,tout,ud,elem,node,steps,th,bld=None,writer=None,d
 
                     pi = mpv_half_new.p2_nodes
 
-                    boundary.rayleigh_damping(Sol, mpv, ud, [up, vp, Yp, pi, t+0.5*dt])
+                    boundary.rayleigh_damping(Sol, mpv, ud, elem, node, [up, vp, Yp, pi, t+0.5*dt])
 
                 elif ud.rayleigh_forcing_type == 'func':
                     # boundary.set_explicit_boundary_data(Sol, elem, ud, th, mpv)
@@ -349,7 +349,7 @@ def time_update(Sol,flux,mpv,t,tout,ud,elem,node,steps,th,bld=None,writer=None,d
                     # Yp = 0.0
                     pi = mpv_half_new.p2_nodes
 
-                    boundary.rayleigh_damping(Sol, mpv, ud, [up, vp, Yp, pi, t+dt])
+                    boundary.rayleigh_damping(Sol, mpv, ud, elem, node, [up, vp, Yp, pi, t+dt])
 
                 elif ud.rayleigh_forcing_type == 'func':