Merge branch 'development' into explicit_MOST

ewquon · Mar 12, 2024 · c5e461f · c5e461f
2 parents 5137d4e + 78370fd
commit c5e461f
Show file tree

Hide file tree

Showing 17 changed files with 502 additions and 218 deletions.
diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt
@@ -40,4 +40,5 @@ else ()
   add_subdirectory(DevTests/MetGrid)
   add_subdirectory(DevTests/LandSurfaceModel)
   add_subdirectory(DevTests/TemperatureSource)
+  add_subdirectory(DevTests/Bomex)
 endif()
diff --git a/Exec/DevTests/Bomex/CMakeLists.txt b/Exec/DevTests/Bomex/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_abl_with_temperature_source)
+set(erf_exe_name erf_bomex)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/DevTests/Bomex/input_SAM b/Exec/DevTests/Bomex/input_SAM
@@ -43,7 +43,7 @@ erf.plot_vars_1     = density rhotheta x_velocity y_velocity z_velocity pressure
 # SOLVER CHOICE
 erf.alpha_T = 0.0
 erf.alpha_C = 1.0
-erf.use_gravity = false
+erf.use_gravity = true
 
 erf.moisture_model  = "SAM"
 
@@ -56,6 +56,7 @@ erf.init_sounding_ideal = true
 
 erf.add_custom_rhotheta_forcing = true
 erf.add_custom_moisture_forcing = true
+erf.add_custom_w_subsidence     = true
 erf.custom_forcing_uses_primitive_vars = false
 
 # Higher values of perturbations lead to instability
@@ -75,3 +76,7 @@ prob.source_cutoff_transition = 3000.0
 prob.advection_moisture_rate   		    = -1.2E-8
 prob.moisture_source_cutoff            	= 300.0
 prob.moisture_source_cutoff_transition 	= 500.0
+
+prob.wbar_sub_max    = -0.65
+prob.wbar_cutoff_max = 1500.0
+prob.wbar_cutoff_min = 2100.0   
diff --git a/Exec/DevTests/Bomex/prob.H b/Exec/DevTests/Bomex/prob.H
@@ -8,50 +8,54 @@
 #include "prob_common.H"
 
 struct ProbParm : ProbParmDefaults {
-  amrex::Real rho_0 = 0.0;
-  amrex::Real T_0   = 0.0;
-  amrex::Real A_0   = 1.0;
-  amrex::Real QKE_0 = 0.1;
-
-  amrex::Real U_0 = 0.0;
-  amrex::Real V_0 = 0.0;
-  amrex::Real W_0 = 0.0;
-
-  // random initial perturbations (legacy code)
-  amrex::Real U_0_Pert_Mag = 0.0;
-  amrex::Real V_0_Pert_Mag = 0.0;
-  amrex::Real W_0_Pert_Mag = 0.0;
-  amrex::Real T_0_Pert_Mag = 0.0; // perturbation to rho*Theta
-
-  // divergence-free initial perturbations
-  amrex::Real pert_deltaU = 0.0;
-  amrex::Real pert_deltaV = 0.0;
-  amrex::Real pert_periods_U = 5.0;
-  amrex::Real pert_periods_V = 5.0;
-  amrex::Real pert_ref_height = 100.0;
-
-  // rayleigh damping
-  amrex::Real dampcoef = 0.2; // inverse time scale [1/s]
-  amrex::Real zdamp = 500.0; // damping depth [m] from model top
-
-  //==============================================
-  // USER-DEFINED INPUTS
-  // source terms
-  amrex::Real advection_heating_rate = 0.0;
-  amrex::Real restart_time = 9e9;
-  amrex::Real cutoff = 500.0;
-  amrex::Real cutoff_transition = 50.0;
-
-  amrex::Real advection_moisture_rate = 0.0;
-  amrex::Real moisture_cutoff = 500.0;
-  amrex::Real moisture_cutoff_transition = 50.0;
-  //==============================================
-
-  // helper vars
-  amrex::Real aval;
-  amrex::Real bval;
-  amrex::Real ufac;
-  amrex::Real vfac;
+    amrex::Real rho_0 = 0.0;
+    amrex::Real T_0   = 0.0;
+    amrex::Real A_0   = 1.0;
+    amrex::Real QKE_0 = 0.1;
+
+    amrex::Real U_0 = 0.0;
+    amrex::Real V_0 = 0.0;
+    amrex::Real W_0 = 0.0;
+
+    // random initial perturbations (legacy code)
+    amrex::Real U_0_Pert_Mag = 0.0;
+    amrex::Real V_0_Pert_Mag = 0.0;
+    amrex::Real W_0_Pert_Mag = 0.0;
+    amrex::Real T_0_Pert_Mag = 0.0; // perturbation to rho*Theta
+
+    // divergence-free initial perturbations
+    amrex::Real pert_deltaU = 0.0;
+    amrex::Real pert_deltaV = 0.0;
+    amrex::Real pert_periods_U = 5.0;
+    amrex::Real pert_periods_V = 5.0;
+    amrex::Real pert_ref_height = 100.0;
+
+    // rayleigh damping
+    amrex::Real dampcoef = 0.2; // inverse time scale [1/s]
+    amrex::Real zdamp = 500.0; // damping depth [m] from model top
+
+    //==============================================
+    // USER-DEFINED INPUTS
+    // source terms
+    amrex::Real advection_heating_rate = 0.0;
+    amrex::Real restart_time = 9e9;
+    amrex::Real cutoff = 500.0;
+    amrex::Real cutoff_transition = 50.0;
+
+    amrex::Real advection_moisture_rate = 0.0;
+    amrex::Real moisture_cutoff = 500.0;
+    amrex::Real moisture_cutoff_transition = 50.0;
+
+    amrex::Real wbar_sub_max    = -0.65;
+    amrex::Real wbar_cutoff_max = 1500.0;
+    amrex::Real wbar_cutoff_min = 2100.0;
+    //==============================================
+
+    // helper vars
+    amrex::Real aval;
+    amrex::Real bval;
+    amrex::Real ufac;
+    amrex::Real vfac;
 }; // namespace ProbParm
 
 class Problem : public ProblemBase
@@ -95,6 +99,13 @@ public:
         const amrex::Geometry& geom,
         std::unique_ptr<amrex::MultiFab>& z_phys_cc) override;
 
+    void update_w_subsidence (
+        const amrex::Real& /*time*/,
+        amrex::Vector<amrex::Real>& wbar,
+        amrex::Gpu::DeviceVector<amrex::Real>& d_wbar,
+        const amrex::Geometry& geom,
+        std::unique_ptr<amrex::MultiFab>& z_phys_cc) override;
+
 protected:
     std::string name () override { return "BOMEX"; }