Bome Regtest (erf-model#1714)

* move bomex to regtests. * remove buffer file. * update readme.
AMLattanzi · Jul 30, 2024 · 7987a91 · 7987a91
1 parent 2e9a159
commit 7987a91
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 19 deletions.
diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt
@@ -30,9 +30,9 @@ else ()
   add_subdirectory(RegTests/TaylorGreenVortex)
   add_subdirectory(RegTests/WitchOfAgnesi)
   add_subdirectory(RegTests/WPS_Test)
+  add_subdirectory(RegTests/Bomex)
   add_subdirectory(DevTests/MovingTerrain)
   add_subdirectory(DevTests/MetGrid)
   add_subdirectory(DevTests/LandSurfaceModel)
   add_subdirectory(DevTests/TemperatureSource)
-  add_subdirectory(DevTests/Bomex)
 endif()
diff --git a/Exec/DevTests/Bomex/README b/Exec/DevTests/Bomex/README
diff --git a/Exec/DevTests/Bomex/CMakeLists.txt → Exec/RegTests/Bomex/CMakeLists.txt b/Exec/DevTests/Bomex/CMakeLists.txt → Exec/RegTests/Bomex/CMakeLists.txt
diff --git a/Exec/DevTests/Bomex/GNUmakefile → Exec/RegTests/Bomex/GNUmakefile b/Exec/DevTests/Bomex/GNUmakefile → Exec/RegTests/Bomex/GNUmakefile
@@ -30,5 +30,5 @@ USE_ASSERTION = TRUE
 Bpack := ./Make.package
 Blocs := .
 ERF_HOME := ../../..
-ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/DevTests/Bomex
+ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/Bomex
 include $(ERF_HOME)/Exec/Make.ERF
diff --git a/Exec/DevTests/Bomex/Make.package → Exec/RegTests/Bomex/Make.package b/Exec/DevTests/Bomex/Make.package → Exec/RegTests/Bomex/Make.package
diff --git a/Exec/RegTests/Bomex/README b/Exec/RegTests/Bomex/README
@@ -0,0 +1 @@
+This is the Barbados Oceanographic and Meteorological Experiment (BOMEX) simulation as described in Siebesma et. al (2003) https://doi.org/10.1175/1520-0469(2003)60<1201:ALESIS>2.0.CO;2
diff --git a/Exec/DevTests/Bomex/input_Kessler → Exec/RegTests/Bomex/input_Kessler b/Exec/DevTests/Bomex/input_Kessler → Exec/RegTests/Bomex/input_Kessler
diff --git a/Exec/DevTests/Bomex/input_SAM → Exec/RegTests/Bomex/input_SAM b/Exec/DevTests/Bomex/input_SAM → Exec/RegTests/Bomex/input_SAM
@@ -1,5 +1,8 @@
 # ------------------  INPUTS TO MAIN PROGRAM  -------------------
-stop_time = 43200
+#stop_time = 3600    #  1 hour
+#stop_time = 4800    #  1.5 hours
+#stop_time = 7200    #  2 hours
+stop_time = 21600   #  6 hours
 
 amrex.fpe_trap_invalid = 1
 
@@ -25,26 +28,28 @@ zhi.type = "SlipWall"
 #zhi.theta_grad = 0.00365
 
 # TIME STEP CONTROL
-erf.fixed_dt       = 0.5 # fixed time step depending on grid resolution
-
+erf.fixed_dt           = 0.3 # fixed time step depending on grid resolution
+erf.fixed_mri_dt_ratio = 4
+erf.use_mono_adv       = true
+
 # DIAGNOSTICS & VERBOSITY
 erf.sum_interval   = 1       # timesteps between computing mass
 erf.v              = 1       # verbosity in ERF.cpp
 amr.v              = 1       # verbosity in Amr.cpp
 erf.data_log       = "surf" "mean" "flux" "subgrid"
-erf.profile_int    = 120 
+erf.profile_int    = 200     # (every minute with dt = 0.075)
 
 # REFINEMENT / REGRIDDING
 amr.max_level       = 0       # maximum level number allowed
 
 # CHECKPOINT FILES
-erf.check_file      = chk        # root name of checkpoint file
-erf.check_int       = 600        # number of timesteps between checkpoints
+erf.check_file      = chk     # root name of checkpoint file
+erf.check_int       = 2000    # number of timesteps between checkpoints
 
 # PLOTFILES
-erf.plot_file_1     = plt       # prefix of plotfile name
-erf.plot_int_1      = 120        # number of timesteps between plotfiles
-erf.plot_vars_1     = density rhotheta x_velocity y_velocity z_velocity pressure temp theta qt qp qv qc qi
+erf.plot_file_1     = plt     # prefix of plotfile name
+erf.plot_int_1      = 2000    # number of timesteps between plotfiles
+erf.plot_vars_1     = density rhotheta x_velocity y_velocity z_velocity pressure temp theta qt qp qv qc qsat
 
 # SOLVER CHOICE
 erf.alpha_T = 0.0
@@ -53,12 +58,13 @@ erf.use_gravity = true
 
 erf.dycore_horiz_adv_type    = Upwind_3rd
 erf.dycore_vert_adv_type     = Upwind_3rd
-erf.dryscal_horiz_adv_type   = WENOZ5
-erf.dryscal_vert_adv_type    = WENOZ5
-erf.moistscal_horiz_adv_type = WENOZ5
-erf.moistscal_vert_adv_type  = WENOZ5
+erf.dryscal_horiz_adv_type   = Upwind_3rd
+erf.dryscal_vert_adv_type    = Upwind_3rd
+erf.moistscal_horiz_adv_type = WENO5
+erf.moistscal_vert_adv_type  = WENO5
 
 erf.moisture_model  = "SAM"
+erf.buoyancy_type   = 1
 
 erf.molec_diff_type = "None"
 
@@ -70,8 +76,8 @@ erf.Cs              = 0.17
 #erf.sigma_k  = 1.0
 #erf.Ce       = 0.1
 
-erf.Pr_t            = 0.333333
-erf.Sc_t            = 0.333333
+erf.Pr_t      = 0.33333333333333
+erf.Sc_t      = 0.33333333333333
 
 erf.init_type = "input_sounding"
 erf.init_sounding_ideal = true
@@ -80,7 +86,7 @@ erf.add_custom_rhotheta_forcing        = true
 erf.add_custom_moisture_forcing        = true
 erf.add_custom_geostrophic_profile     = true
 erf.add_custom_w_subsidence            = true
-erf.custom_forcing_uses_primitive_vars = false
+erf.custom_forcing_uses_primitive_vars = true
 
 # Higher values of perturbations lead to instability
 # Instability seems to be coming from BC

diff --git a/Exec/DevTests/Bomex/input_sounding → Exec/RegTests/Bomex/input_sounding b/Exec/DevTests/Bomex/input_sounding → Exec/RegTests/Bomex/input_sounding
diff --git a/Exec/DevTests/Bomex/prob.H → Exec/RegTests/Bomex/prob.H b/Exec/DevTests/Bomex/prob.H → Exec/RegTests/Bomex/prob.H
diff --git a/Exec/DevTests/Bomex/prob.cpp → Exec/RegTests/Bomex/prob.cpp b/Exec/DevTests/Bomex/prob.cpp → Exec/RegTests/Bomex/prob.cpp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This is the Barbados Oceanographic and Meteorological Experiment (BOMEX) simulation as described in Siebesma et. al (2003) https://doi.org/10.1175/1520-0469(2003)60<1201:ALESIS>2.0.CO;2