Moist & MOST Ctest (#1507)

* Add MOST and moist bubble ctest. Also change cmake executable names to erf_*. * Remove perturbations for robustness across systems and change to deardorff so k_turb is finite at time 0.
erf-model · Mar 19, 2024 · b191734 · b191734
1 parent 057fe5f
commit b191734
Show file tree

Hide file tree

Showing 29 changed files with 27,282 additions and 38 deletions.
diff --git a/Exec/ABL/GNUmakefile b/Exec/ABL/GNUmakefile
@@ -25,6 +25,7 @@ TEST = TRUE
 USE_ASSERTION = TRUE
 
 #USE_POISSON_SOLVE = TRUE
+USE_EXPLICIT_MOST_STRESS = FALSE
 
 # GNU Make
 Bpack := ./Make.package

diff --git a/Exec/DevTests/LandSurfaceModel/CMakeLists.txt b/Exec/DevTests/LandSurfaceModel/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name LandSurfaceModel)
+set(erf_exe_name erf_lsm)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/DevTests/MetGrid/CMakeLists.txt b/Exec/DevTests/MetGrid/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_metgrid_dev)
+set(erf_exe_name erf_metgrid)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/DevTests/MovingTerrain/CMakeLists.txt b/Exec/DevTests/MovingTerrain/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name moving_terrain)
+set(erf_exe_name erf_moving_terrain)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/Fitch/CMakeLists.txt b/Exec/Fitch/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_abl)
+set(erf_exe_name erf_fitch)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/Make.ERF b/Exec/Make.ERF
@@ -100,8 +100,6 @@ AMReXpack             += $(foreach dir, $(AMReXdirs), $(AMREX_HOME)/Src/$(dir)/M
 
 include $(AMReXpack)
 
-DEFINES += -DERF_USE_MOISTURE
-
 ERF_MOISTURE_DIR = $(ERF_SOURCE_DIR)/Microphysics
 include $(ERF_MOISTURE_DIR)/Make.package
 VPATH_LOCATIONS   += $(ERF_MOISTURE_DIR)
@@ -151,7 +149,11 @@ ERF_LSM_MM5_DIR = $(ERF_SOURCE_DIR)/LandSurfaceModel/MM5
 include $(ERF_LSM_MM5_DIR)/Make.package
 VPATH_LOCATIONS   += $(ERF_LSM_MM5_DIR)
 INCLUDE_LOCATIONS += $(ERF_LSM_MM5_DIR)
-
+
+ifeq ($(USE_EXPLICIT_MOST_STRESS), TRUE)
+    DEFINES += -DERF_EXPLICIT_MOST_STRESS
+endif
+
 ifeq ($(COMPUTE_ERROR), TRUE)
   DEFINES += -DERF_COMPUTE_ERROR
 endif

diff --git a/Exec/Radiation/CMakeLists.txt b/Exec/Radiation/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name radiation)
+set(erf_exe_name erf_radiation)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/Bubble/CMakeLists.txt b/Exec/RegTests/Bubble/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name bubble)
+set(erf_exe_name erf_bubble)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/DensityCurrent/CMakeLists.txt b/Exec/RegTests/DensityCurrent/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name density_current)
+set(erf_exe_name erf_density_current)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/EkmanSpiral_custom/CMakeLists.txt b/Exec/RegTests/EkmanSpiral_custom/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name ekman_spiral_custom)
+set(erf_exe_name erf_ekman_spiral_custom)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/EkmanSpiral_ideal/CMakeLists.txt b/Exec/RegTests/EkmanSpiral_ideal/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name ekman_spiral_ideal)
+set(erf_exe_name erf_ekman_spiral_ideal)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/EkmanSpiral_input_sounding/CMakeLists.txt b/Exec/RegTests/EkmanSpiral_input_sounding/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name ekman_spiral_input_sounding)
+set(erf_exe_name erf_ekman_spiral_input_sounding)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt b/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name taylor_green)
+set(erf_exe_name erf_taylor_green)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt b/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_witch_of_agnesi)
+set(erf_exe_name erf_2d_cylinder)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt b/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name erf_witch_of_agnesi)
+set(erf_exe_name erf_3d_hemisphere)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/RegTests/WPS_Test/CMakeLists.txt b/Exec/RegTests/WPS_Test/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name wps_test)
+set(erf_exe_name erf_wps_test)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/SquallLine_2D/CMakeLists.txt b/Exec/SquallLine_2D/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name squallline_2d)
+set(erf_exe_name erf_squallline_2d)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Exec/SuperCell/CMakeLists.txt b/Exec/SuperCell/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(erf_exe_name super_cell)
+set(erf_exe_name erf_super_cell)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

diff --git a/Tests/CTestList.cmake b/Tests/CTestList.cmake
@@ -79,15 +79,15 @@ endfunction(add_test_0)
 if(WIN32)
 #add_test_r(Bubble_DensityCurrent             "Bubble/bubble.exe" "plt00010")
 add_test_r(CouetteFlow                       "RegTests/CouetteFlow/*/erf_couette_flow.exe" "plt00050")
-add_test_r(DensityCurrent                    "RegTests/DensityCurrent/*/density_current.exe" "plt00010")
-add_test_r(DensityCurrent_detJ2              "RegTests/DensityCurrent/*/density_current.exe" "plt00010")
-add_test_r(DensityCurrent_detJ2_nosub        "RegTests/DensityCurrent/*/density_current.exe" "plt00020")
-add_test_r(DensityCurrent_detJ2_MT           "RegTests/DensityCurrent/*/density_current.exe" "plt00010")
-add_test_r(EkmanSpiral                       "RegTests/EkmanSpiral_custom/*/ekman_spiral_custom.exe" "plt00010")
+add_test_r(DensityCurrent                    "RegTests/DensityCurrent/*/erf_density_current.exe" "plt00010")
+add_test_r(DensityCurrent_detJ2              "RegTests/DensityCurrent/*/erf_density_current.exe" "plt00010")
+add_test_r(DensityCurrent_detJ2_nosub        "RegTests/DensityCurrent/*/erf_density_current.exe" "plt00020")
+add_test_r(DensityCurrent_detJ2_MT           "RegTests/DensityCurrent/*/erf_density_current.exe" "plt00010")
+add_test_r(EkmanSpiral                       "RegTests/EkmanSpiral_custom/*/erf_ekman_spiral_custom.exe" "plt00010")
 add_test_r(IsentropicVortexStationary        "RegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010")
 add_test_r(IsentropicVortexAdvecting         "RegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010")
-add_test_r(MovingTerrain_nosub               "DevTests/MovingTerrain/*/moving_terrain.exe"   "plt00020")
-add_test_r(MovingTerrain_sub                 "DevTests/MovingTerrain/*/moving_terrain.exe"   "plt00010")
+add_test_r(MovingTerrain_nosub               "DevTests/MovingTerrain/*/erf_moving_terrain.exe"   "plt00020")
+add_test_r(MovingTerrain_sub                 "DevTests/MovingTerrain/*/erf_moving_terrain.exe"   "plt00010")
 add_test_r(PoiseuilleFlow                    "RegTests/PoiseuilleFlow/*/erf_poiseuille_flow.exe" "plt00010")
 add_test_r(RayleighDamping                   "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00100")
 add_test_r(ScalarAdvectionUniformU           "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020")
@@ -104,25 +104,27 @@ add_test_r(ScalarAdvDiff_weno5z              "RegTests/ScalarAdvDiff/*/erf_scala
 add_test_r(ScalarAdvDiff_wenomzq3            "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020")
 add_test_r(ScalarDiffusionGaussian           "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020")
 add_test_r(ScalarDiffusionSine               "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020")
-add_test_r(TaylorGreenAdvecting              "RegTests/TaylorGreenVortex/*/taylor_green.exe" "plt00010")
-add_test_r(TaylorGreenAdvectingDiffusing     "RegTests/TaylorGreenVortex/*/taylor_green.exe" "plt00010")
+add_test_r(TaylorGreenAdvecting              "RegTests/TaylorGreenVortex/*/erf_taylor_green.exe" "plt00010")
+add_test_r(TaylorGreenAdvectingDiffusing     "RegTests/TaylorGreenVortex/*/erf_taylor_green.exe" "plt00010")
 add_test_r(MSF_NoSub_IsentropicVortexAdv     "RegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010")
 add_test_r(MSF_Sub_IsentropicVortexAdv       "RegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010")
-
+add_test_r(ABL_MOST                          "ABL/*/erf_abl.exe" "plt00010")
+add_test_r(MoistBubble                       "RegTests/Bubble/*/erf_bubble.exe" "plt00010")
+
 add_test_0(Deardorff_stationary              "ABL/*/erf_abl.exe" "plt00010")
 
 else()
 #add_test_r(Bubble_DensityCurrent             "Bubble/bubble" "plt00010")
 add_test_r(CouetteFlow                       "RegTests/CouetteFlow/erf_couette_flow" "plt00050")
-add_test_r(DensityCurrent                    "RegTests/DensityCurrent/density_current" "plt00010")
-add_test_r(DensityCurrent_detJ2              "RegTests/DensityCurrent/density_current" "plt00010")
-add_test_r(DensityCurrent_detJ2_nosub        "RegTests/DensityCurrent/density_current" "plt00020")
-add_test_r(DensityCurrent_detJ2_MT           "RegTests/DensityCurrent/density_current" "plt00010")
-add_test_r(EkmanSpiral                       "RegTests/EkmanSpiral_custom/ekman_spiral_custom" "plt00010")
+add_test_r(DensityCurrent                    "RegTests/DensityCurrent/erf_density_current" "plt00010")
+add_test_r(DensityCurrent_detJ2              "RegTests/DensityCurrent/erf_density_current" "plt00010")
+add_test_r(DensityCurrent_detJ2_nosub        "RegTests/DensityCurrent/erf_density_current" "plt00020")
+add_test_r(DensityCurrent_detJ2_MT           "RegTests/DensityCurrent/erf_density_current" "plt00010")
+add_test_r(EkmanSpiral                       "RegTests/EkmanSpiral_custom/erf_ekman_spiral_custom" "plt00010")
 add_test_r(IsentropicVortexStationary        "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010")
 add_test_r(IsentropicVortexAdvecting         "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010")
-add_test_r(MovingTerrain_nosub               "DevTests/MovingTerrain/moving_terrain"   "plt00020")
-add_test_r(MovingTerrain_sub                 "DevTests/MovingTerrain/moving_terrain"   "plt00010")
+add_test_r(MovingTerrain_nosub               "DevTests/MovingTerrain/erf_moving_terrain"   "plt00020")
+add_test_r(MovingTerrain_sub                 "DevTests/MovingTerrain/erf_moving_terrain"   "plt00010")
 add_test_r(PoiseuilleFlow                    "RegTests/PoiseuilleFlow/erf_poiseuille_flow" "plt00010")
 add_test_r(RayleighDamping                   "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00100")
 add_test_r(ScalarAdvectionUniformU           "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020")
@@ -139,10 +141,12 @@ add_test_r(ScalarAdvDiff_weno5z              "RegTests/ScalarAdvDiff/erf_scalar_
 add_test_r(ScalarAdvDiff_wenomzq3            "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020")
 add_test_r(ScalarDiffusionGaussian           "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020")
 add_test_r(ScalarDiffusionSine               "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020")
-add_test_r(TaylorGreenAdvecting              "RegTests/TaylorGreenVortex/taylor_green" "plt00010")
-add_test_r(TaylorGreenAdvectingDiffusing     "RegTests/TaylorGreenVortex/taylor_green" "plt00010")
+add_test_r(TaylorGreenAdvecting              "RegTests/TaylorGreenVortex/erf_taylor_green" "plt00010")
+add_test_r(TaylorGreenAdvectingDiffusing     "RegTests/TaylorGreenVortex/erf_taylor_green" "plt00010")
 add_test_r(MSF_NoSub_IsentropicVortexAdv     "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010")
 add_test_r(MSF_Sub_IsentropicVortexAdv       "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010")
+add_test_r(ABL_MOST                          "ABL/erf_abl" "plt00010")
+add_test_r(MoistBubble                       "RegTests/Bubble/erf_bubble" "plt00010")
 
 add_test_0(InitSoundingIdeal_stationary      "ABL/erf_abl" "plt00010")
 add_test_0(Deardorff_stationary              "ABL/erf_abl" "plt00010")

diff --git a/Tests/ERFGoldFiles/ABL_MOST/Header b/Tests/ERFGoldFiles/ABL_MOST/Header
@@ -0,0 +1,27 @@
+HyperCLaw-V1.1
+8
+density
+rhoadv_0
+x_velocity
+y_velocity
+z_velocity
+temp
+theta
+pressure
+3
+0.99999999999999989
+0
+0 0 0 
+1024 1024 1024 
+
+((0,0,0) (63,63,63) (0,0,0)) 
+10 
+16 16 16 
+0
+0
+0 1 0.99999999999999989
+10
+0 1024
+0 1024
+0 1024
+Level_0/Cell
diff --git a/Tests/ERFGoldFiles/ABL_MOST/Level_0/Cell_D_00000 b/Tests/ERFGoldFiles/ABL_MOST/Level_0/Cell_D_00000
diff --git a/Tests/ERFGoldFiles/ABL_MOST/Level_0/Cell_H b/Tests/ERFGoldFiles/ABL_MOST/Level_0/Cell_H
@@ -0,0 +1,16 @@
+1
+1
+8
+0
+(1 0
+((0,0,0) (63,63,63) (0,0,0))
+)
+1
+FabOnDisk: Cell_D_00000 0
+
+1,8
+1.0000000000000000e+00,0.0000000000000000e+00,9.9456373781545651e+00,0.0000000000000000e+00,0.0000000000000000e+00,2.8256769913555877e+02,3.0000000000000000e+02,8.1096929651905361e+04,
+
+1,8
+1.0000000000000000e+00,0.0000000000000000e+00,1.0000000000000000e+01,0.0000000000000000e+00,0.0000000000000000e+00,2.8256769913555877e+02,3.0000000000000000e+02,8.1096929651905361e+04,
+