adding squallline and supercell CI tests (#1935)

Build/cmake_with_poisson.sh → Build/cmake_with_eb.sh

@@ -8,11 +8,12 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=./install \
       -DCMAKE_Fortran_COMPILER:STRING=mpifort \
       -DMPIEXEC_PREFLAGS:STRING=--oversubscribe \
       -DCMAKE_BUILD_TYPE:STRING=Release \
+      -DAMREX_EB:BOOL=ON \
       -DERF_DIM:STRING=3 \
       -DERF_ENABLE_MPI:BOOL=ON \
       -DERF_ENABLE_TESTS:BOOL=ON \
       -DERF_ENABLE_FCOMPARE:BOOL=ON \
       -DERF_ENABLE_DOCUMENTATION:BOOL=OFF \
-      -DERF_ENABLE_POISSON_SOLVE:BOOL=ON \
+      -DERF_ENABLE_EB:BOOL=ON \
       -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
       .. && make -j8

Exec/MoistRegTests/SquallLine_2D/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(erf_exe_name erf_squallline_2d)
+set(erf_exe_name erf_squallline)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

Exec/MoistRegTests/SuperCell_3D/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(erf_exe_name erf_supercell_3d)
+set(erf_exe_name erf_supercell)
 
 add_executable(${erf_exe_name} "")
 target_sources(${erf_exe_name}

Tests/CTestList.cmake

@@ -139,6 +139,8 @@ add_test_r(ABL_MOST                          "ABL/*/erf_abl.exe" "plt00010")
 add_test_r(ABL_MYNN_PBL                      "ABL/*/erf_abl.exe" "plt00100" INPUT_SOUNDING "input_sounding_GABLS1")
 add_test_r(ABL_InflowFile                    "ABL/*/erf_abl.exe" "plt00010")
 add_test_r(MoistBubble                       "MoistRegTests/Bubble/*/erf_bubble.exe" "plt00010")
+add_test_r(SquallLine_2D                     "MoistRegTests/SquallLine_2D/*/erf_squallline.exe" "plt00010")
+add_test_r(SuperCell_3D                      "MoistRegTests/SuperCell_3D/*/erf_supercell.exe"   "plt00010")
 
 add_test_0(Deardorff_stationary              "ABL/*/erf_abl.exe" "plt00010")
 
@@ -180,6 +182,8 @@ add_test_r(ABL_MOST                          "ABL/erf_abl" "plt00010")
 add_test_r(ABL_MYNN_PBL                      "ABL/erf_abl" "plt00100" INPUT_SOUNDING "input_sounding_GABLS1")
 add_test_r(ABL_InflowFile                    "ABL/erf_abl" "plt00010")
 add_test_r(MoistBubble                       "MoistRegTests/Bubble/erf_bubble" "plt00010")
+add_test_r(SquallLine_2D                     "MoistRegTests/SquallLine_2D/erf_squallline" "plt00010")
+add_test_r(SuperCell_3D                      "MoistRegTests/SuperCell_3D/erf_supercell"   "plt00010")
 
 add_test_0(InitSoundingIdeal_stationary      "ABL/erf_abl" "plt00010")
 add_test_0(Deardorff_stationary              "ABL/erf_abl" "plt00010")

Tests/ERFGoldFiles/SquallLine_2D/Header

@@ -0,0 +1,44 @@
+HyperCLaw-V1.1
+16
+density
+rhotheta
+rhoQ1
+rhoQ2
+rhoQ3
+x_velocity
+y_velocity
+z_velocity
+temp
+theta
+pressure
+pert_dens
+qv
+qc
+qrain
+rain_accum
+3
+2.5
+0
+-15000 0 0 
+15000 100 24000 
+
+((0,0,0) (299,0,239) (0,0,0)) 
+10 
+100 100 100 
+0
+0
+0 4 2.5
+10
+-15000 -7500
+0 100
+0 24000
+-7500 0
+0 100
+0 24000
+0 7500
+0 100
+0 24000
+7500 15000
+0 100
+0 24000
+Level_0/Cell

Tests/ERFGoldFiles/SquallLine_2D/Level_0/Cell_H

@@ -0,0 +1,28 @@
+1
+1
+16
+0
+(4 0
+((0,0,0) (74,0,239) (0,0,0))
+((75,0,0) (149,0,239) (0,0,0))
+((150,0,0) (224,0,239) (0,0,0))
+((225,0,0) (299,0,239) (0,0,0))
+)
+4
+FabOnDisk: Cell_D_00000 0
+FabOnDisk: Cell_D_00001 0
+FabOnDisk: Cell_D_00002 0
+FabOnDisk: Cell_D_00003 0
+
+4,16
+4.92694503063104555e-02,2.92298611520111535e+01,8.22230499252474404e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.17368012873490422e+01,0.00000000000000000e+00,-3.28409414381157852e-03,2.17180833581330887e+02,3.00052069975470999e+02,3.11473102627773596e+03,-1.58560279539863291e-02,2.55980508589586304e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.92694503109519510e-02,2.92298611527531378e+01,8.22230499303941651e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.17366923763450153e+01,0.00000000000000000e+00,-3.28409073994147130e-03,2.17180837289911437e+02,3.00052069662320321e+02,3.11473102638808496e+03,-2.00903842909362362e-02,2.55980662396689974e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.92694503109519510e-02,2.92298611527531378e+01,8.22230499303941651e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.17367816191299834e+01,0.00000000000000000e+00,-3.28409073994147130e-03,2.17180837289911437e+02,3.00052069662531665e+02,3.11473102638808496e+03,-2.00899541245173063e-02,2.55980662396689974e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.92694503063104555e-02,2.92298611520111535e+01,8.22230499252474404e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.17368198709340952e+01,0.00000000000000000e+00,-3.28409414381157852e-03,2.17180833581330859e+02,3.00052069803161089e+02,3.11473102627773596e+03,-1.58559109652200991e-02,2.55980508589585897e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+
+4,16
+1.13110914158124531e+00,3.39391639595954075e+02,1.58355279821374151e-02,0.00000000000000000e+00,0.00000000000000000e+00,1.14943547974653017e-07,0.00000000000000000e+00,1.99450518773355776e-02,2.99569284555392187e+02,5.93265420464156819e+02,9.94379795158264460e+04,-4.11036763048322484e-06,1.40000000000000020e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.13110914173475963e+00,3.39391639642011057e+02,1.58355279842866195e-02,0.00000000000000000e+00,0.00000000000000000e+00,1.66837369469930663e-14,0.00000000000000000e+00,1.84911448863533862e-01,2.99569284571648495e+02,5.93265420423327214e+02,9.94379795347182662e+04,-4.11039078007657821e-06,1.40000000000000038e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.13110914234545401e+00,3.39391639825272478e+02,1.58355279928363325e-02,0.00000000000000000e+00,0.00000000000000000e+00,4.02286039176742369e-03,0.00000000000000000e+00,1.84905706034122985e-01,2.99569284636370867e+02,5.93265420423327214e+02,9.94379796098892839e+04,-4.11039078007657821e-06,1.40000000000000020e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.13110925273073804e+00,3.39391672455364812e+02,1.58355295382303154e-02,0.00000000000000000e+00,0.00000000000000000e+00,3.18448609153651214e-03,0.00000000000000000e+00,1.97296928338940233e-02,2.99569295723351843e+02,5.93265420464156819e+02,9.94379929942458548e+04,-4.11036763048322484e-06,1.40000000000000038e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+

Tests/ERFGoldFiles/SuperCell_3D/Header

@@ -0,0 +1,44 @@
+HyperCLaw-V1.1
+16
+density
+rhotheta
+rhoQ1
+rhoQ2
+rhoQ3
+x_velocity
+y_velocity
+z_velocity
+temp
+theta
+pressure
+pert_dens
+qv
+qc
+qrain
+rain_accum
+3
+5
+0
+-7500 -12500 0 
+7500 12500 24000 
+
+((0,0,0) (59,99,95) (0,0,0)) 
+10 
+250 250 250 
+0
+0
+0 4 5
+10
+-7500 0
+-12500 0
+0 24000
+0 7500
+-12500 0
+0 24000
+-7500 0
+0 12500
+0 24000
+0 7500
+0 12500
+0 24000
+Level_0/Cell

Tests/ERFGoldFiles/SuperCell_3D/Level_0/Cell_H

@@ -0,0 +1,28 @@
+1
+1
+16
+0
+(4 0
+((0,0,0) (29,49,95) (0,0,0))
+((30,0,0) (59,49,95) (0,0,0))
+((0,50,0) (29,99,95) (0,0,0))
+((30,50,0) (59,99,95) (0,0,0))
+)
+4
+FabOnDisk: Cell_D_00000 0
+FabOnDisk: Cell_D_00001 0
+FabOnDisk: Cell_D_00002 0
+FabOnDisk: Cell_D_00003 0
+
+4,16
+4.98465601216382392e-02,2.94706514568256033e+01,8.22394936490458552e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.13968411584119291e+01,-1.98651616362150625e-02,-2.58802987231661341e-03,2.17183595618644688e+02,3.00144185515562469e+02,3.15068664420778396e+03,-2.12516830226170406e-02,2.58922261665458478e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.98465601216382392e-02,2.94706514568256033e+01,8.22394936490458552e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.14134717495684050e+01,-1.98646147636538130e-02,-2.69066029694914246e-03,2.17183595618644688e+02,3.00144185347060386e+02,3.15068664420778396e+03,-2.12489980110168730e-02,2.58922261665458478e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.98465601216382392e-02,2.94706514568256033e+01,8.22394936490458383e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.13968411584119291e+01,-1.87384343859621737e-02,-2.58802987231661341e-03,2.17183595618644688e+02,3.00144185515562469e+02,3.15068664420778396e+03,-2.12516830226170406e-02,2.58922261665458410e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+4.98465601216382392e-02,2.94706514568256033e+01,8.22394936490458383e-06,0.00000000000000000e+00,0.00000000000000000e+00,-1.14134717495684050e+01,-1.87318478226280172e-02,-2.69066029694914246e-03,2.17183595618644688e+02,3.00144185347060386e+02,3.15068664420778396e+03,-2.12489980110168730e-02,2.58922261665458410e-05,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+
+4,16
+1.12396705615183823e+00,3.37352201290478490e+02,1.57355387861257169e-02,0.00000000000000000e+00,0.00000000000000000e+00,3.47229842840208476e-12,1.87384343859621737e-02,2.83535579207985666e-01,2.98939693321110894e+02,5.91227386301276283e+02,9.86024402351571043e+04,-7.50351966249951374e-06,1.39999999999999986e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.12396705615183823e+00,3.37352201290478490e+02,1.57355387861257169e-02,0.00000000000000000e+00,0.00000000000000000e+00,1.98641369779629304e-02,1.87318478226280172e-02,2.83475336556183732e-01,2.98939693321111747e+02,5.91227386301276283e+02,9.86024402351571043e+04,-7.50351966249951374e-06,1.40000000000000003e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.12396705615183823e+00,3.37352201290478490e+02,1.57355387861257169e-02,0.00000000000000000e+00,0.00000000000000000e+00,3.47229842840208476e-12,1.98651616362150625e-02,2.83535579207985666e-01,2.98939693321110894e+02,5.91227386301276283e+02,9.86024402351571043e+04,-7.50351966249951374e-06,1.39999999999999986e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+1.12396705615183823e+00,3.37352201290478490e+02,1.57355387861257169e-02,0.00000000000000000e+00,0.00000000000000000e+00,1.98641369779629304e-02,1.98646147636538130e-02,2.83475336556183732e-01,2.98939693321111747e+02,5.91227386301276283e+02,9.86024402351571043e+04,-7.50351966249951374e-06,1.40000000000000003e-02,0.00000000000000000e+00,0.00000000000000000e+00,0.00000000000000000e+00,
+

Tests/test_files/SquallLine_2D/SquallLine_2D.i

@@ -0,0 +1,74 @@
+# ------------------  INPUTS TO MAIN PROGRAM  -------------------
+max_step = 10
+
+amrex.fpe_trap_invalid = 1
+
+fabarray.mfiter_tile_size = 2048 1024 2048
+
+# PROBLEM SIZE & GEOMETRY
+geometry.prob_lo     = -15000.   0.    0.
+geometry.prob_hi     =  15000. 100. 24000.
+amr.n_cell           =    300    1    240    # dx=dy=dz=100 m
+
+geometry.is_periodic = 0 1 0
+
+xlo.type = "Open"
+xhi.type = "Open"
+zlo.type = "SlipWall"
+zhi.type = "HO_Outflow"
+
+# TIME STEP CONTROL
+erf.fixed_dt       = 0.25      # fixed time step [s] -- Straka et al 1993
+erf.fixed_fast_dt  = 0.125     # fixed time step [s] -- Straka et al 1993
+
+# DIAGNOSTICS & VERBOSITY
+erf.sum_interval   = 1       # timesteps between computing mass
+erf.v              = 1       # verbosity in ERF.cpp
+amr.v              = 1       # verbosity in Amr.cpp
+
+# REFINEMENT / REGRIDDING
+amr.max_level       = 0       # maximum level number allowed
+
+# CHECKPOINT FILES
+amr.check_file      = chk        # root name of checkpoint file
+amr.check_int       = 1000       # number of timesteps between checkpoints
+#amr.restart         = chk09000
+
+# PLOTFILES
+erf.plot_file_1         = plt        # root name of plotfile
+erf.plot_int_1          = 100         # number of timesteps between plotfiles
+erf.plot_vars_1         = density rhotheta rhoQ1 rhoQ2 rhoQ3 x_velocity y_velocity z_velocity pressure theta temp qv qc qrain rain_accum pert_dens
+
+# SOLVER CHOICE
+erf.use_gravity = true
+erf.buoyancy_type = 1
+erf.use_coriolis = false
+
+#erf.les_type = "Smagorinsky"
+erf.Cs              = 0.25
+erf.les_type = "None"
+
+#
+# diffusion coefficient from Straka, K = 75 m^2/s
+#
+erf.molec_diff_type = "ConstantAlpha"
+#erf.molec_diff_type = "Constant"
+erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
+erf.dynamicViscosity = 200.0 # [kg/(m-s)] ==> nu = 75.0 m^2/s
+erf.alpha_T = 200.0 # [m^2/s]
+erf.alpha_C = 200.0
+
+erf.moisture_model = "Kessler"
+erf.use_moist_background = true
+
+# PROBLEM PARAMETERS (optional)
+prob.z_tr = 12000.0
+prob.height = 1200.0
+prob.theta_0 = 300.0
+prob.theta_tr = 343.0
+prob.T_tr = 213.0
+prob.x_c = 0.0
+prob.z_c = 2000.0
+prob.x_r = 10000.0
+prob.z_r = 1500.0
+prob.theta_c = 3.0

Tests/test_files/SuperCell_3D/SuperCell_3D.i

@@ -0,0 +1,80 @@
+# ------------------  INPUTS TO MAIN PROGRAM  -------------------
+max_step = 10
+
+amrex.fpe_trap_invalid = 1
+
+fabarray.mfiter_tile_size = 2048 1024 2048
+
+# PROBLEM SIZE & GEOMETRY
+geometry.prob_lo     = -7500. -12500.    0.
+geometry.prob_hi     =  7500.  12500. 24000.
+amr.n_cell           =    60     100     96    # dx=dy=dz=250 m
+
+# periodic in x to match WRF setup
+# - as an alternative, could use symmetry at x=0 and outflow at x=25600
+geometry.is_periodic = 1 0 0
+
+ylo.type = "Open"
+yhi.type = "Open"
+
+zlo.type = "SlipWall"
+zhi.type = "HO_Outflow"
+
+# TIME STEP CONTROL
+erf.fixed_dt       = 0.5      # fixed time step [s] -- Straka et al 1993
+erf.fixed_fast_dt  = 0.25     # fixed time step [s] -- Straka et al 1993
+
+# DIAGNOSTICS & VERBOSITY
+erf.sum_interval   = 1       # timesteps between computing mass
+erf.v              = 1       # verbosity in ERF.cpp
+amr.v              = 1       # verbosity in Amr.cpp
+
+# REFINEMENT / REGRIDDING
+amr.max_level       = 0       # maximum level number allowed
+
+# CHECKPOINT FILES
+amr.check_file      = chk        # root name of checkpoint file
+amr.check_int       = 1000       # number of timesteps between checkpoints
+#amr.restart         = chk15000
+
+# PLOTFILES
+erf.plot_file_1         = plt        # root name of plotfile
+erf.plot_int_1          = 120         # number of timesteps between plotfiles
+erf.plot_vars_1         = density rhotheta rhoQ1 rhoQ2 rhoQ3 x_velocity y_velocity z_velocity pressure theta temp qv qc qrain rain_accum pert_dens
+
+# SOLVER CHOICE
+erf.use_gravity = true
+erf.buoyancy_type = 1
+erf.use_coriolis = false
+erf.use_rayleigh_damping = false
+
+#erf.les_type = "Smagorinsky"
+erf.Cs              = 0.25
+erf.les_type = "None"
+
+#
+# diffusion coefficient from Straka, K = 75 m^2/s
+#
+erf.molec_diff_type = "ConstantAlpha"
+#erf.molec_diff_type = "Constant"
+erf.rho0_trans = 1.0 # [kg/m^3], used to convert input diffusivities
+erf.dynamicViscosity = 33.33 # [kg/(m-s)] ==> nu = 75.0 m^2/s
+erf.alpha_T = 33.33 # [m^2/s]
+erf.alpha_C = 33.33
+
+erf.moisture_model = "Kessler"
+erf.use_moist_background = true
+
+# PROBLEM PARAMETERS (optional)
+prob.z_tr = 12000.0
+prob.height = 1200.0
+prob.theta_0 = 300.0
+prob.theta_tr = 343.0
+prob.T_tr = 213.0
+prob.x_c = 0.0
+prob.y_c = 0.0
+prob.z_c = 2000.0
+prob.x_r = 10000.0
+prob.y_r = 10000.0
+prob.z_r = 2000.0
+prob.theta_c = 3.0