diff --git a/Docs/sphinx_doc/Verification.rst b/Docs/sphinx_doc/Verification.rst index 1e995be4b..c0f5b89fe 100644 --- a/Docs/sphinx_doc/Verification.rst +++ b/Docs/sphinx_doc/Verification.rst @@ -159,7 +159,7 @@ Dry bubble and moist bubble rise simulations Benchmark simulations of dry and moist bubble rises in `Bryan and Fritsch`_ are reproduced. The test case consists of a warm bubble rising in dry and moist conditions. The potential temperature perturbation and the vertical velocity are compared as shown in the figures below. Excellent quantitative comparisons are obtained. The dry and moist bubble cases are -in ``Exec/RegTests/Bubble`` with the corresponding input files ``inputs_BF02_dry_bubble`` and ``inputs_BF02_moist_bubble``. +in ``Exec/DryRegTests/Bubble`` with the corresponding input files ``inputs_BF02_dry_bubble`` and ``inputs_BF02_moist_bubble``. .. _`Bryan and Fritsch`: https://journals.ametsoc.org/view/journals/mwre/130/12/1520-0493_2002_130_2917_absfmn_2.0.co_2.xml diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt index 046865f20..16e72968c 100644 --- a/Exec/CMakeLists.txt +++ b/Exec/CMakeLists.txt @@ -8,31 +8,30 @@ build_erf_lib(${erf_lib_name}) if (ERF_ENABLE_MULTIBLOCK) add_subdirectory(DevTests/MultiBlock) elseif (ERF_ENABLE_REGRESSION_TESTS_ONLY) -# add_subdirectory(RegTests/Bubble) - add_subdirectory(RegTests/Couette_Poiseuille) - add_subdirectory(RegTests/DensityCurrent) - add_subdirectory(RegTests/DynamicRefinement) - add_subdirectory(RegTests/EkmanSpiral) - add_subdirectory(RegTests/IsentropicVortex) - add_subdirectory(RegTests/ScalarAdvDiff) - add_subdirectory(RegTests/TaylorGreenVortex) + add_subdirectory(DryRegTests/Couette_Poiseuille) + add_subdirectory(DryRegTests/DensityCurrent) + add_subdirectory(DryRegTests/EkmanSpiral) + add_subdirectory(DryRegTests/IsentropicVortex) + add_subdirectory(DryRegTests/ScalarAdvDiff) + add_subdirectory(DryRegTests/TaylorGreenVortex) + add_subdirectory(DryRegTests/TurbulentInflow) add_subdirectory(DevTests/MovingTerrain) else () add_subdirectory(ABL) - add_subdirectory(SquallLine_2D) - add_subdirectory(RegTests/Bubble) - add_subdirectory(RegTests/Couette_Poiseuille) - add_subdirectory(RegTests/DensityCurrent) - add_subdirectory(RegTests/DynamicRefinement) - add_subdirectory(RegTests/EkmanSpiral) - add_subdirectory(RegTests/IsentropicVortex) - add_subdirectory(RegTests/ParticlesOverWoA) - add_subdirectory(RegTests/ScalarAdvDiff) - add_subdirectory(RegTests/TaylorGreenVortex) - add_subdirectory(RegTests/WitchOfAgnesi) - add_subdirectory(RegTests/WPS_Test) - add_subdirectory(RegTests/Bomex) - add_subdirectory(RegTests/TurbulentInflow) + add_subdirectory(MoistRegTests/Bomex) + add_subdirectory(MoistRegTests/Bubble) + add_subdirectory(MoistRegTests/SquallLine_2D) + add_subdirectory(MoistRegTests/SuperCell_3D) + add_subdirectory(DryRegTests/Couette_Poiseuille) + add_subdirectory(DryRegTests/DensityCurrent) + add_subdirectory(DryRegTests/EkmanSpiral) + add_subdirectory(DryRegTests/IsentropicVortex) + add_subdirectory(DryRegTests/ParticlesOverWoA) + add_subdirectory(DryRegTests/ScalarAdvDiff) + add_subdirectory(DryRegTests/TaylorGreenVortex) + add_subdirectory(DryRegTests/TurbulentInflow) + add_subdirectory(DryRegTests/WitchOfAgnesi) + add_subdirectory(DryRegTests/WPS_Test) add_subdirectory(DevTests/LandSurfaceModel) add_subdirectory(DevTests/MetGrid) add_subdirectory(DevTests/MovingTerrain) diff --git a/Exec/DevTests/Radiation/ERF_prob.H b/Exec/DevTests/Radiation/ERF_prob.H index 94f58ed36..6e5afd46c 100644 --- a/Exec/DevTests/Radiation/ERF_prob.H +++ b/Exec/DevTests/Radiation/ERF_prob.H @@ -54,7 +54,7 @@ public: amrex::Real zdamp) override; protected: - std::string name() override { return "Supercell"; } + std::string name() override { return "Radiation"; } private: ProbParm parms; diff --git a/Exec/RegTests/Couette_Poiseuille/CMakeLists.txt b/Exec/DryRegTests/Couette_Poiseuille/CMakeLists.txt similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/CMakeLists.txt rename to Exec/DryRegTests/Couette_Poiseuille/CMakeLists.txt diff --git a/Exec/RegTests/Couette_Poiseuille/ERF_prob.H b/Exec/DryRegTests/Couette_Poiseuille/ERF_prob.H similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/ERF_prob.H rename to Exec/DryRegTests/Couette_Poiseuille/ERF_prob.H diff --git a/Exec/RegTests/Couette_Poiseuille/ERF_prob.cpp b/Exec/DryRegTests/Couette_Poiseuille/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/ERF_prob.cpp rename to Exec/DryRegTests/Couette_Poiseuille/ERF_prob.cpp diff --git a/Exec/RegTests/Couette_Poiseuille/GNUmakefile b/Exec/DryRegTests/Couette_Poiseuille/GNUmakefile similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/GNUmakefile rename to Exec/DryRegTests/Couette_Poiseuille/GNUmakefile diff --git a/Exec/RegTests/Bomex/Make.package b/Exec/DryRegTests/Couette_Poiseuille/Make.package similarity index 100% rename from Exec/RegTests/Bomex/Make.package rename to Exec/DryRegTests/Couette_Poiseuille/Make.package diff --git a/Exec/RegTests/Couette_Poiseuille/README b/Exec/DryRegTests/Couette_Poiseuille/README similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/README rename to Exec/DryRegTests/Couette_Poiseuille/README diff --git a/Exec/RegTests/Couette_Poiseuille/couette_helpers.py b/Exec/DryRegTests/Couette_Poiseuille/couette_helpers.py similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/couette_helpers.py rename to Exec/DryRegTests/Couette_Poiseuille/couette_helpers.py diff --git a/Exec/RegTests/Couette_Poiseuille/inputs_couette_x b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/inputs_couette_x rename to Exec/DryRegTests/Couette_Poiseuille/inputs_couette_x diff --git a/Exec/RegTests/Couette_Poiseuille/inputs_couette_y b/Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/inputs_couette_y rename to Exec/DryRegTests/Couette_Poiseuille/inputs_couette_y diff --git a/Exec/RegTests/Couette_Poiseuille/inputs_poiseuille_x b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/inputs_poiseuille_x rename to Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_x diff --git a/Exec/RegTests/Couette_Poiseuille/inputs_poiseuille_y b/Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/inputs_poiseuille_y rename to Exec/DryRegTests/Couette_Poiseuille/inputs_poiseuille_y diff --git a/Exec/RegTests/Couette_Poiseuille/plot_couette_flow_evolution.py b/Exec/DryRegTests/Couette_Poiseuille/plot_couette_flow_evolution.py similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/plot_couette_flow_evolution.py rename to Exec/DryRegTests/Couette_Poiseuille/plot_couette_flow_evolution.py diff --git a/Exec/RegTests/DensityCurrent/CMakeLists.txt b/Exec/DryRegTests/DensityCurrent/CMakeLists.txt similarity index 100% rename from Exec/RegTests/DensityCurrent/CMakeLists.txt rename to Exec/DryRegTests/DensityCurrent/CMakeLists.txt diff --git a/Exec/RegTests/DensityCurrent/ERF_prob.H b/Exec/DryRegTests/DensityCurrent/ERF_prob.H similarity index 100% rename from Exec/RegTests/DensityCurrent/ERF_prob.H rename to Exec/DryRegTests/DensityCurrent/ERF_prob.H diff --git a/Exec/RegTests/DensityCurrent/ERF_prob.cpp b/Exec/DryRegTests/DensityCurrent/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/DensityCurrent/ERF_prob.cpp rename to Exec/DryRegTests/DensityCurrent/ERF_prob.cpp diff --git a/Exec/RegTests/DensityCurrent/GNUmakefile b/Exec/DryRegTests/DensityCurrent/GNUmakefile similarity index 100% rename from Exec/RegTests/DensityCurrent/GNUmakefile rename to Exec/DryRegTests/DensityCurrent/GNUmakefile diff --git a/Exec/RegTests/Bubble/Make.package b/Exec/DryRegTests/DensityCurrent/Make.package similarity index 100% rename from Exec/RegTests/Bubble/Make.package rename to Exec/DryRegTests/DensityCurrent/Make.package diff --git a/Exec/RegTests/DensityCurrent/README b/Exec/DryRegTests/DensityCurrent/README similarity index 100% rename from Exec/RegTests/DensityCurrent/README rename to Exec/DryRegTests/DensityCurrent/README diff --git a/Exec/RegTests/DensityCurrent/inputs_amr b/Exec/DryRegTests/DensityCurrent/inputs_amr similarity index 100% rename from Exec/RegTests/DensityCurrent/inputs_amr rename to Exec/DryRegTests/DensityCurrent/inputs_amr diff --git a/Exec/RegTests/DensityCurrent/inputs_crse_halfdomain b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain similarity index 100% rename from Exec/RegTests/DensityCurrent/inputs_crse_halfdomain rename to Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain diff --git a/Exec/RegTests/DensityCurrent/inputs_crse_halfdomain_zlev b/Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev similarity index 100% rename from Exec/RegTests/DensityCurrent/inputs_crse_halfdomain_zlev rename to Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain_zlev diff --git a/Exec/RegTests/DensityCurrent/inputs_refsoln b/Exec/DryRegTests/DensityCurrent/inputs_refsoln similarity index 100% rename from Exec/RegTests/DensityCurrent/inputs_refsoln rename to Exec/DryRegTests/DensityCurrent/inputs_refsoln diff --git a/Exec/RegTests/DensityCurrent/inputs_wrf_baseline b/Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline similarity index 100% rename from Exec/RegTests/DensityCurrent/inputs_wrf_baseline rename to Exec/DryRegTests/DensityCurrent/inputs_wrf_baseline diff --git a/Exec/RegTests/DensityCurrent/runscript_baseline b/Exec/DryRegTests/DensityCurrent/runscript_baseline similarity index 100% rename from Exec/RegTests/DensityCurrent/runscript_baseline rename to Exec/DryRegTests/DensityCurrent/runscript_baseline diff --git a/Exec/RegTests/DensityCurrent/runscript_refsoln b/Exec/DryRegTests/DensityCurrent/runscript_refsoln similarity index 100% rename from Exec/RegTests/DensityCurrent/runscript_refsoln rename to Exec/DryRegTests/DensityCurrent/runscript_refsoln diff --git a/Exec/RegTests/EkmanSpiral/CMakeLists.txt b/Exec/DryRegTests/EkmanSpiral/CMakeLists.txt similarity index 100% rename from Exec/RegTests/EkmanSpiral/CMakeLists.txt rename to Exec/DryRegTests/EkmanSpiral/CMakeLists.txt diff --git a/Exec/RegTests/EkmanSpiral/ERF_prob.H b/Exec/DryRegTests/EkmanSpiral/ERF_prob.H similarity index 100% rename from Exec/RegTests/EkmanSpiral/ERF_prob.H rename to Exec/DryRegTests/EkmanSpiral/ERF_prob.H diff --git a/Exec/RegTests/EkmanSpiral/ERF_prob.cpp b/Exec/DryRegTests/EkmanSpiral/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/EkmanSpiral/ERF_prob.cpp rename to Exec/DryRegTests/EkmanSpiral/ERF_prob.cpp diff --git a/Exec/RegTests/EkmanSpiral/GNUmakefile b/Exec/DryRegTests/EkmanSpiral/GNUmakefile similarity index 100% rename from Exec/RegTests/EkmanSpiral/GNUmakefile rename to Exec/DryRegTests/EkmanSpiral/GNUmakefile diff --git a/Exec/RegTests/Couette_Poiseuille/Make.package b/Exec/DryRegTests/EkmanSpiral/Make.package similarity index 100% rename from Exec/RegTests/Couette_Poiseuille/Make.package rename to Exec/DryRegTests/EkmanSpiral/Make.package diff --git a/Exec/RegTests/EkmanSpiral/README b/Exec/DryRegTests/EkmanSpiral/README similarity index 100% rename from Exec/RegTests/EkmanSpiral/README rename to Exec/DryRegTests/EkmanSpiral/README diff --git a/Exec/RegTests/EkmanSpiral/check_convergence.py b/Exec/DryRegTests/EkmanSpiral/check_convergence.py similarity index 100% rename from Exec/RegTests/EkmanSpiral/check_convergence.py rename to Exec/DryRegTests/EkmanSpiral/check_convergence.py diff --git a/Exec/RegTests/EkmanSpiral/input_sounding_file b/Exec/DryRegTests/EkmanSpiral/input_sounding_file similarity index 100% rename from Exec/RegTests/EkmanSpiral/input_sounding_file rename to Exec/DryRegTests/EkmanSpiral/input_sounding_file diff --git a/Exec/RegTests/EkmanSpiral/inputs_custom b/Exec/DryRegTests/EkmanSpiral/inputs_custom similarity index 100% rename from Exec/RegTests/EkmanSpiral/inputs_custom rename to Exec/DryRegTests/EkmanSpiral/inputs_custom diff --git a/Exec/RegTests/EkmanSpiral/inputs_ideal b/Exec/DryRegTests/EkmanSpiral/inputs_ideal similarity index 100% rename from Exec/RegTests/EkmanSpiral/inputs_ideal rename to Exec/DryRegTests/EkmanSpiral/inputs_ideal diff --git a/Exec/RegTests/EkmanSpiral/inputs_input_sounding b/Exec/DryRegTests/EkmanSpiral/inputs_input_sounding similarity index 100% rename from Exec/RegTests/EkmanSpiral/inputs_input_sounding rename to Exec/DryRegTests/EkmanSpiral/inputs_input_sounding diff --git a/Exec/RegTests/EkmanSpiral/run_convergence_study.sh b/Exec/DryRegTests/EkmanSpiral/run_convergence_study.sh similarity index 100% rename from Exec/RegTests/EkmanSpiral/run_convergence_study.sh rename to Exec/DryRegTests/EkmanSpiral/run_convergence_study.sh diff --git a/Exec/RegTests/EkmanSpiral/wrfinput_ekman_d01 b/Exec/DryRegTests/EkmanSpiral/wrfinput_ekman_d01 similarity index 100% rename from Exec/RegTests/EkmanSpiral/wrfinput_ekman_d01 rename to Exec/DryRegTests/EkmanSpiral/wrfinput_ekman_d01 diff --git a/Exec/RegTests/IsentropicVortex/CMakeLists.txt b/Exec/DryRegTests/IsentropicVortex/CMakeLists.txt similarity index 100% rename from Exec/RegTests/IsentropicVortex/CMakeLists.txt rename to Exec/DryRegTests/IsentropicVortex/CMakeLists.txt diff --git a/Exec/RegTests/IsentropicVortex/ERF_prob.H b/Exec/DryRegTests/IsentropicVortex/ERF_prob.H similarity index 100% rename from Exec/RegTests/IsentropicVortex/ERF_prob.H rename to Exec/DryRegTests/IsentropicVortex/ERF_prob.H diff --git a/Exec/RegTests/IsentropicVortex/ERF_prob.cpp b/Exec/DryRegTests/IsentropicVortex/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/IsentropicVortex/ERF_prob.cpp rename to Exec/DryRegTests/IsentropicVortex/ERF_prob.cpp diff --git a/Exec/RegTests/IsentropicVortex/GNUmakefile b/Exec/DryRegTests/IsentropicVortex/GNUmakefile similarity index 100% rename from Exec/RegTests/IsentropicVortex/GNUmakefile rename to Exec/DryRegTests/IsentropicVortex/GNUmakefile diff --git a/Exec/RegTests/DensityCurrent/Make.package b/Exec/DryRegTests/IsentropicVortex/Make.package similarity index 100% rename from Exec/RegTests/DensityCurrent/Make.package rename to Exec/DryRegTests/IsentropicVortex/Make.package diff --git a/Exec/RegTests/IsentropicVortex/animate.py b/Exec/DryRegTests/IsentropicVortex/animate.py similarity index 100% rename from Exec/RegTests/IsentropicVortex/animate.py rename to Exec/DryRegTests/IsentropicVortex/animate.py diff --git a/Exec/RegTests/IsentropicVortex/check_initial_solution.py b/Exec/DryRegTests/IsentropicVortex/check_initial_solution.py similarity index 100% rename from Exec/RegTests/IsentropicVortex/check_initial_solution.py rename to Exec/DryRegTests/IsentropicVortex/check_initial_solution.py diff --git a/Exec/RegTests/IsentropicVortex/check_stationary_vortex_rmse.py b/Exec/DryRegTests/IsentropicVortex/check_stationary_vortex_rmse.py similarity index 100% rename from Exec/RegTests/IsentropicVortex/check_stationary_vortex_rmse.py rename to Exec/DryRegTests/IsentropicVortex/check_stationary_vortex_rmse.py diff --git a/Exec/RegTests/IsentropicVortex/check_vortex_rmse.py b/Exec/DryRegTests/IsentropicVortex/check_vortex_rmse.py similarity index 100% rename from Exec/RegTests/IsentropicVortex/check_vortex_rmse.py rename to Exec/DryRegTests/IsentropicVortex/check_vortex_rmse.py diff --git a/Exec/RegTests/IsentropicVortex/inputs_advecting b/Exec/DryRegTests/IsentropicVortex/inputs_advecting similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_advecting rename to Exec/DryRegTests/IsentropicVortex/inputs_advecting diff --git a/Exec/RegTests/IsentropicVortex/inputs_advecting_ml b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_advecting_ml rename to Exec/DryRegTests/IsentropicVortex/inputs_advecting_ml diff --git a/Exec/RegTests/IsentropicVortex/inputs_advecting_msf b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_advecting_msf rename to Exec/DryRegTests/IsentropicVortex/inputs_advecting_msf diff --git a/Exec/RegTests/IsentropicVortex/inputs_advecting_no_msf b/Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_advecting_no_msf rename to Exec/DryRegTests/IsentropicVortex/inputs_advecting_no_msf diff --git a/Exec/RegTests/IsentropicVortex/inputs_stationary b/Exec/DryRegTests/IsentropicVortex/inputs_stationary similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_stationary rename to Exec/DryRegTests/IsentropicVortex/inputs_stationary diff --git a/Exec/RegTests/IsentropicVortex/inputs_stationary_msf b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_stationary_msf rename to Exec/DryRegTests/IsentropicVortex/inputs_stationary_msf diff --git a/Exec/RegTests/IsentropicVortex/inputs_stationary_no_msf b/Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf similarity index 100% rename from Exec/RegTests/IsentropicVortex/inputs_stationary_no_msf rename to Exec/DryRegTests/IsentropicVortex/inputs_stationary_no_msf diff --git a/Exec/RegTests/IsentropicVortex/isentropic_vortex_helpers.py b/Exec/DryRegTests/IsentropicVortex/isentropic_vortex_helpers.py similarity index 100% rename from Exec/RegTests/IsentropicVortex/isentropic_vortex_helpers.py rename to Exec/DryRegTests/IsentropicVortex/isentropic_vortex_helpers.py diff --git a/Exec/RegTests/ParticlesOverWoA/CMakeLists.txt b/Exec/DryRegTests/ParticlesOverWoA/CMakeLists.txt similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/CMakeLists.txt rename to Exec/DryRegTests/ParticlesOverWoA/CMakeLists.txt diff --git a/Exec/RegTests/ParticlesOverWoA/ERF_prob.H b/Exec/DryRegTests/ParticlesOverWoA/ERF_prob.H similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/ERF_prob.H rename to Exec/DryRegTests/ParticlesOverWoA/ERF_prob.H diff --git a/Exec/RegTests/ParticlesOverWoA/ERF_prob.cpp b/Exec/DryRegTests/ParticlesOverWoA/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/ERF_prob.cpp rename to Exec/DryRegTests/ParticlesOverWoA/ERF_prob.cpp diff --git a/Exec/RegTests/ParticlesOverWoA/GNUmakefile b/Exec/DryRegTests/ParticlesOverWoA/GNUmakefile similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/GNUmakefile rename to Exec/DryRegTests/ParticlesOverWoA/GNUmakefile diff --git a/Exec/RegTests/DynamicRefinement/Make.package b/Exec/DryRegTests/ParticlesOverWoA/Make.package similarity index 100% rename from Exec/RegTests/DynamicRefinement/Make.package rename to Exec/DryRegTests/ParticlesOverWoA/Make.package diff --git a/Exec/RegTests/ParticlesOverWoA/README b/Exec/DryRegTests/ParticlesOverWoA/README similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/README rename to Exec/DryRegTests/ParticlesOverWoA/README diff --git a/Exec/RegTests/ParticlesOverWoA/inputs b/Exec/DryRegTests/ParticlesOverWoA/inputs similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/inputs rename to Exec/DryRegTests/ParticlesOverWoA/inputs diff --git a/Exec/RegTests/ScalarAdvDiff/CMakeLists.txt b/Exec/DryRegTests/ScalarAdvDiff/CMakeLists.txt similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/CMakeLists.txt rename to Exec/DryRegTests/ScalarAdvDiff/CMakeLists.txt diff --git a/Exec/RegTests/ScalarAdvDiff/ERF_prob.H b/Exec/DryRegTests/ScalarAdvDiff/ERF_prob.H similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/ERF_prob.H rename to Exec/DryRegTests/ScalarAdvDiff/ERF_prob.H diff --git a/Exec/RegTests/ScalarAdvDiff/ERF_prob.cpp b/Exec/DryRegTests/ScalarAdvDiff/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/ERF_prob.cpp rename to Exec/DryRegTests/ScalarAdvDiff/ERF_prob.cpp diff --git a/Exec/RegTests/ScalarAdvDiff/GNUmakefile b/Exec/DryRegTests/ScalarAdvDiff/GNUmakefile similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/GNUmakefile rename to Exec/DryRegTests/ScalarAdvDiff/GNUmakefile diff --git a/Exec/RegTests/EkmanSpiral/Make.package b/Exec/DryRegTests/ScalarAdvDiff/Make.package similarity index 100% rename from Exec/RegTests/EkmanSpiral/Make.package rename to Exec/DryRegTests/ScalarAdvDiff/Make.package diff --git a/Exec/RegTests/ScalarAdvDiff/README b/Exec/DryRegTests/ScalarAdvDiff/README similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/README rename to Exec/DryRegTests/ScalarAdvDiff/README diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_WENO b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_WENO rename to Exec/DryRegTests/ScalarAdvDiff/inputs_WENO diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_WENO_Z b/Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_WENO_Z rename to Exec/DryRegTests/ScalarAdvDiff/inputs_WENO_Z diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_adv_diff_uniformU b/Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_adv_diff_uniformU rename to Exec/DryRegTests/ScalarAdvDiff/inputs_adv_diff_uniformU diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow b/Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_shearU_no_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_advect_uniformU_no_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_diffuse_gaussian b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_diffuse_gaussian rename to Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_gaussian diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_diffuse_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_diffuse_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_diffuse_no_msf b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_diffuse_no_msf rename to Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_no_msf diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_diffuse_sine b/Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_diffuse_sine rename to Exec/DryRegTests/ScalarAdvDiff/inputs_diffuse_sine diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_ml b/Exec/DryRegTests/ScalarAdvDiff/inputs_ml similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_ml rename to Exec/DryRegTests/ScalarAdvDiff/inputs_ml diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_test_rayleigh b/Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/inputs_test_rayleigh rename to Exec/DryRegTests/ScalarAdvDiff/inputs_test_rayleigh diff --git a/Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence b/Exec/DryRegTests/ScalarAdvDiff/prob.cpp.convergence similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/prob.cpp.convergence rename to Exec/DryRegTests/ScalarAdvDiff/prob.cpp.convergence diff --git a/Exec/RegTests/StokesSecondProblem/CMakeLists.txt b/Exec/DryRegTests/StokesSecondProblem/CMakeLists.txt similarity index 100% rename from Exec/RegTests/StokesSecondProblem/CMakeLists.txt rename to Exec/DryRegTests/StokesSecondProblem/CMakeLists.txt diff --git a/Exec/RegTests/StokesSecondProblem/ERF_prob.H b/Exec/DryRegTests/StokesSecondProblem/ERF_prob.H similarity index 100% rename from Exec/RegTests/StokesSecondProblem/ERF_prob.H rename to Exec/DryRegTests/StokesSecondProblem/ERF_prob.H diff --git a/Exec/RegTests/StokesSecondProblem/ERF_prob.cpp b/Exec/DryRegTests/StokesSecondProblem/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/StokesSecondProblem/ERF_prob.cpp rename to Exec/DryRegTests/StokesSecondProblem/ERF_prob.cpp diff --git a/Exec/RegTests/StokesSecondProblem/GNUmakefile b/Exec/DryRegTests/StokesSecondProblem/GNUmakefile similarity index 100% rename from Exec/RegTests/StokesSecondProblem/GNUmakefile rename to Exec/DryRegTests/StokesSecondProblem/GNUmakefile diff --git a/Exec/RegTests/StokesSecondProblem/Make.package b/Exec/DryRegTests/StokesSecondProblem/Make.package similarity index 100% rename from Exec/RegTests/StokesSecondProblem/Make.package rename to Exec/DryRegTests/StokesSecondProblem/Make.package diff --git a/Exec/RegTests/StokesSecondProblem/inputs b/Exec/DryRegTests/StokesSecondProblem/inputs similarity index 100% rename from Exec/RegTests/StokesSecondProblem/inputs rename to Exec/DryRegTests/StokesSecondProblem/inputs diff --git a/Exec/RegTests/StokesSecondProblem/inputs_stretched_z_levels b/Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels similarity index 100% rename from Exec/RegTests/StokesSecondProblem/inputs_stretched_z_levels rename to Exec/DryRegTests/StokesSecondProblem/inputs_stretched_z_levels diff --git a/Exec/RegTests/TaylorGreenVortex/CMakeLists.txt b/Exec/DryRegTests/TaylorGreenVortex/CMakeLists.txt similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/CMakeLists.txt rename to Exec/DryRegTests/TaylorGreenVortex/CMakeLists.txt diff --git a/Exec/RegTests/TaylorGreenVortex/ERF_prob.H b/Exec/DryRegTests/TaylorGreenVortex/ERF_prob.H similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/ERF_prob.H rename to Exec/DryRegTests/TaylorGreenVortex/ERF_prob.H diff --git a/Exec/RegTests/TaylorGreenVortex/ERF_prob.cpp b/Exec/DryRegTests/TaylorGreenVortex/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/ERF_prob.cpp rename to Exec/DryRegTests/TaylorGreenVortex/ERF_prob.cpp diff --git a/Exec/RegTests/TaylorGreenVortex/GNUmakefile b/Exec/DryRegTests/TaylorGreenVortex/GNUmakefile similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/GNUmakefile rename to Exec/DryRegTests/TaylorGreenVortex/GNUmakefile diff --git a/Exec/RegTests/IsentropicVortex/Make.package b/Exec/DryRegTests/TaylorGreenVortex/Make.package similarity index 100% rename from Exec/RegTests/IsentropicVortex/Make.package rename to Exec/DryRegTests/TaylorGreenVortex/Make.package diff --git a/Exec/RegTests/TaylorGreenVortex/README b/Exec/DryRegTests/TaylorGreenVortex/README similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/README rename to Exec/DryRegTests/TaylorGreenVortex/README diff --git a/Exec/RegTests/TaylorGreenVortex/inputs_advdiff b/Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/inputs_advdiff rename to Exec/DryRegTests/TaylorGreenVortex/inputs_advdiff diff --git a/Exec/RegTests/TaylorGreenVortex/inputs_advonly b/Exec/DryRegTests/TaylorGreenVortex/inputs_advonly similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/inputs_advonly rename to Exec/DryRegTests/TaylorGreenVortex/inputs_advonly diff --git a/Exec/RegTests/TaylorGreenVortex/inputs_multilevel b/Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/inputs_multilevel rename to Exec/DryRegTests/TaylorGreenVortex/inputs_multilevel diff --git a/Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt b/Exec/DryRegTests/Terrain2d_Cylinder/CMakeLists.txt similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/CMakeLists.txt rename to Exec/DryRegTests/Terrain2d_Cylinder/CMakeLists.txt diff --git a/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.H b/Exec/DryRegTests/Terrain2d_Cylinder/ERF_prob.H similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/ERF_prob.H rename to Exec/DryRegTests/Terrain2d_Cylinder/ERF_prob.H diff --git a/Exec/RegTests/Terrain2d_Cylinder/ERF_prob.cpp b/Exec/DryRegTests/Terrain2d_Cylinder/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/ERF_prob.cpp rename to Exec/DryRegTests/Terrain2d_Cylinder/ERF_prob.cpp diff --git a/Exec/RegTests/Terrain2d_Cylinder/GNUmakefile b/Exec/DryRegTests/Terrain2d_Cylinder/GNUmakefile similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/GNUmakefile rename to Exec/DryRegTests/Terrain2d_Cylinder/GNUmakefile diff --git a/Exec/RegTests/ParticlesOverWoA/Make.package b/Exec/DryRegTests/Terrain2d_Cylinder/Make.package similarity index 100% rename from Exec/RegTests/ParticlesOverWoA/Make.package rename to Exec/DryRegTests/Terrain2d_Cylinder/Make.package diff --git a/Exec/RegTests/Terrain2d_Cylinder/inputs b/Exec/DryRegTests/Terrain2d_Cylinder/inputs similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/inputs rename to Exec/DryRegTests/Terrain2d_Cylinder/inputs diff --git a/Exec/RegTests/Terrain2d_Cylinder/inputs.amr b/Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/inputs.amr rename to Exec/DryRegTests/Terrain2d_Cylinder/inputs.amr diff --git a/Exec/RegTests/Terrain2d_Cylinder/inputs_most_test b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/inputs_most_test rename to Exec/DryRegTests/Terrain2d_Cylinder/inputs_most_test diff --git a/Exec/RegTests/Terrain2d_Cylinder/inputs_stretched_z_levels b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/inputs_stretched_z_levels rename to Exec/DryRegTests/Terrain2d_Cylinder/inputs_stretched_z_levels diff --git a/Exec/RegTests/Terrain2d_Cylinder/inputs_verification_final b/Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/inputs_verification_final rename to Exec/DryRegTests/Terrain2d_Cylinder/inputs_verification_final diff --git a/Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt b/Exec/DryRegTests/Terrain3d_Hemisphere/CMakeLists.txt similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/CMakeLists.txt rename to Exec/DryRegTests/Terrain3d_Hemisphere/CMakeLists.txt diff --git a/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.H b/Exec/DryRegTests/Terrain3d_Hemisphere/ERF_prob.H similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.H rename to Exec/DryRegTests/Terrain3d_Hemisphere/ERF_prob.H diff --git a/Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.cpp b/Exec/DryRegTests/Terrain3d_Hemisphere/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/ERF_prob.cpp rename to Exec/DryRegTests/Terrain3d_Hemisphere/ERF_prob.cpp diff --git a/Exec/RegTests/Terrain3d_Hemisphere/GNUmakefile b/Exec/DryRegTests/Terrain3d_Hemisphere/GNUmakefile similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/GNUmakefile rename to Exec/DryRegTests/Terrain3d_Hemisphere/GNUmakefile diff --git a/Exec/RegTests/ScalarAdvDiff/Make.package b/Exec/DryRegTests/Terrain3d_Hemisphere/Make.package similarity index 100% rename from Exec/RegTests/ScalarAdvDiff/Make.package rename to Exec/DryRegTests/Terrain3d_Hemisphere/Make.package diff --git a/Exec/RegTests/Terrain3d_Hemisphere/inputs b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/inputs rename to Exec/DryRegTests/Terrain3d_Hemisphere/inputs diff --git a/Exec/RegTests/Terrain3d_Hemisphere/inputs.amr b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/inputs.amr rename to Exec/DryRegTests/Terrain3d_Hemisphere/inputs.amr diff --git a/Exec/RegTests/Terrain3d_Hemisphere/inputs_most_test b/Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/inputs_most_test rename to Exec/DryRegTests/Terrain3d_Hemisphere/inputs_most_test diff --git a/Exec/RegTests/Terrain3d_Hemisphere/run_3d.sh b/Exec/DryRegTests/Terrain3d_Hemisphere/run_3d.sh similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/run_3d.sh rename to Exec/DryRegTests/Terrain3d_Hemisphere/run_3d.sh diff --git a/Exec/RegTests/TurbulentInflow/CMakeLists.txt b/Exec/DryRegTests/TurbulentInflow/CMakeLists.txt similarity index 100% rename from Exec/RegTests/TurbulentInflow/CMakeLists.txt rename to Exec/DryRegTests/TurbulentInflow/CMakeLists.txt diff --git a/Exec/RegTests/TurbulentInflow/ERF_prob.H b/Exec/DryRegTests/TurbulentInflow/ERF_prob.H similarity index 100% rename from Exec/RegTests/TurbulentInflow/ERF_prob.H rename to Exec/DryRegTests/TurbulentInflow/ERF_prob.H diff --git a/Exec/RegTests/TurbulentInflow/ERF_prob.cpp b/Exec/DryRegTests/TurbulentInflow/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/TurbulentInflow/ERF_prob.cpp rename to Exec/DryRegTests/TurbulentInflow/ERF_prob.cpp diff --git a/Exec/RegTests/TurbulentInflow/GNUmakefile b/Exec/DryRegTests/TurbulentInflow/GNUmakefile similarity index 100% rename from Exec/RegTests/TurbulentInflow/GNUmakefile rename to Exec/DryRegTests/TurbulentInflow/GNUmakefile diff --git a/Exec/RegTests/TurbulentInflow/InflowPerturbationGeneration_HowTo.pdf b/Exec/DryRegTests/TurbulentInflow/InflowPerturbationGeneration_HowTo.pdf similarity index 100% rename from Exec/RegTests/TurbulentInflow/InflowPerturbationGeneration_HowTo.pdf rename to Exec/DryRegTests/TurbulentInflow/InflowPerturbationGeneration_HowTo.pdf diff --git a/Exec/RegTests/TaylorGreenVortex/Make.package b/Exec/DryRegTests/TurbulentInflow/Make.package similarity index 100% rename from Exec/RegTests/TaylorGreenVortex/Make.package rename to Exec/DryRegTests/TurbulentInflow/Make.package diff --git a/Exec/RegTests/TurbulentInflow/README b/Exec/DryRegTests/TurbulentInflow/README similarity index 100% rename from Exec/RegTests/TurbulentInflow/README rename to Exec/DryRegTests/TurbulentInflow/README diff --git a/Exec/RegTests/TurbulentInflow/compressible_direct_inputs b/Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs similarity index 100% rename from Exec/RegTests/TurbulentInflow/compressible_direct_inputs rename to Exec/DryRegTests/TurbulentInflow/compressible_direct_inputs diff --git a/Exec/RegTests/TurbulentInflow/compressible_source_inputs b/Exec/DryRegTests/TurbulentInflow/compressible_source_inputs similarity index 100% rename from Exec/RegTests/TurbulentInflow/compressible_source_inputs rename to Exec/DryRegTests/TurbulentInflow/compressible_source_inputs diff --git a/Exec/RegTests/TurbulentInflow/generateLogLawProfile.py b/Exec/DryRegTests/TurbulentInflow/generateLogLawProfile.py similarity index 100% rename from Exec/RegTests/TurbulentInflow/generateLogLawProfile.py rename to Exec/DryRegTests/TurbulentInflow/generateLogLawProfile.py diff --git a/Exec/RegTests/TurbulentInflow/incompressible_direct_inputs b/Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs similarity index 100% rename from Exec/RegTests/TurbulentInflow/incompressible_direct_inputs rename to Exec/DryRegTests/TurbulentInflow/incompressible_direct_inputs diff --git a/Exec/RegTests/TurbulentInflow/incompressible_source_inputs b/Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs similarity index 100% rename from Exec/RegTests/TurbulentInflow/incompressible_source_inputs rename to Exec/DryRegTests/TurbulentInflow/incompressible_source_inputs diff --git a/Exec/RegTests/TurbulentInflow/sourceRun.sh b/Exec/DryRegTests/TurbulentInflow/sourceRun.sh similarity index 100% rename from Exec/RegTests/TurbulentInflow/sourceRun.sh rename to Exec/DryRegTests/TurbulentInflow/sourceRun.sh diff --git a/Exec/RegTests/WPS_Test/CMakeLists.txt b/Exec/DryRegTests/WPS_Test/CMakeLists.txt similarity index 100% rename from Exec/RegTests/WPS_Test/CMakeLists.txt rename to Exec/DryRegTests/WPS_Test/CMakeLists.txt diff --git a/Exec/RegTests/WPS_Test/ERF_prob.H b/Exec/DryRegTests/WPS_Test/ERF_prob.H similarity index 100% rename from Exec/RegTests/WPS_Test/ERF_prob.H rename to Exec/DryRegTests/WPS_Test/ERF_prob.H diff --git a/Exec/RegTests/WPS_Test/ERF_prob.cpp b/Exec/DryRegTests/WPS_Test/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/WPS_Test/ERF_prob.cpp rename to Exec/DryRegTests/WPS_Test/ERF_prob.cpp diff --git a/Exec/RegTests/WPS_Test/GNUmakefile b/Exec/DryRegTests/WPS_Test/GNUmakefile similarity index 100% rename from Exec/RegTests/WPS_Test/GNUmakefile rename to Exec/DryRegTests/WPS_Test/GNUmakefile diff --git a/Exec/RegTests/Terrain2d_Cylinder/Make.package b/Exec/DryRegTests/WPS_Test/Make.package similarity index 100% rename from Exec/RegTests/Terrain2d_Cylinder/Make.package rename to Exec/DryRegTests/WPS_Test/Make.package diff --git a/Exec/RegTests/WPS_Test/README b/Exec/DryRegTests/WPS_Test/README similarity index 100% rename from Exec/RegTests/WPS_Test/README rename to Exec/DryRegTests/WPS_Test/README diff --git a/Exec/RegTests/WPS_Test/inputs_real_ChisholmView b/Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView similarity index 100% rename from Exec/RegTests/WPS_Test/inputs_real_ChisholmView rename to Exec/DryRegTests/WPS_Test/inputs_real_ChisholmView diff --git a/Exec/RegTests/WitchOfAgnesi/CMakeLists.txt b/Exec/DryRegTests/WitchOfAgnesi/CMakeLists.txt similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/CMakeLists.txt rename to Exec/DryRegTests/WitchOfAgnesi/CMakeLists.txt diff --git a/Exec/RegTests/WitchOfAgnesi/ERF_prob.H b/Exec/DryRegTests/WitchOfAgnesi/ERF_prob.H similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/ERF_prob.H rename to Exec/DryRegTests/WitchOfAgnesi/ERF_prob.H diff --git a/Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp b/Exec/DryRegTests/WitchOfAgnesi/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp rename to Exec/DryRegTests/WitchOfAgnesi/ERF_prob.cpp diff --git a/Exec/RegTests/WitchOfAgnesi/GNUmakefile b/Exec/DryRegTests/WitchOfAgnesi/GNUmakefile similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/GNUmakefile rename to Exec/DryRegTests/WitchOfAgnesi/GNUmakefile diff --git a/Exec/RegTests/Terrain3d_Hemisphere/Make.package b/Exec/DryRegTests/WitchOfAgnesi/Make.package similarity index 100% rename from Exec/RegTests/Terrain3d_Hemisphere/Make.package rename to Exec/DryRegTests/WitchOfAgnesi/Make.package diff --git a/Exec/RegTests/WitchOfAgnesi/README b/Exec/DryRegTests/WitchOfAgnesi/README similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/README rename to Exec/DryRegTests/WitchOfAgnesi/README diff --git a/Exec/RegTests/WitchOfAgnesi/input_sounding b/Exec/DryRegTests/WitchOfAgnesi/input_sounding similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/input_sounding rename to Exec/DryRegTests/WitchOfAgnesi/input_sounding diff --git a/Exec/RegTests/WitchOfAgnesi/inputs b/Exec/DryRegTests/WitchOfAgnesi/inputs similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/inputs rename to Exec/DryRegTests/WitchOfAgnesi/inputs diff --git a/Exec/RegTests/WitchOfAgnesi/inputs_most_test b/Exec/DryRegTests/WitchOfAgnesi/inputs_most_test similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/inputs_most_test rename to Exec/DryRegTests/WitchOfAgnesi/inputs_most_test diff --git a/Exec/RegTests/WitchOfAgnesi/inputs_static_twolevel b/Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/inputs_static_twolevel rename to Exec/DryRegTests/WitchOfAgnesi/inputs_static_twolevel diff --git a/Exec/RegTests/WitchOfAgnesi/inputs_zlevels b/Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/inputs_zlevels rename to Exec/DryRegTests/WitchOfAgnesi/inputs_zlevels diff --git a/Exec/RegTests/Bomex/CMakeLists.txt b/Exec/MoistRegTests/Bomex/CMakeLists.txt similarity index 100% rename from Exec/RegTests/Bomex/CMakeLists.txt rename to Exec/MoistRegTests/Bomex/CMakeLists.txt diff --git a/Exec/RegTests/Bomex/ERF_prob.H b/Exec/MoistRegTests/Bomex/ERF_prob.H similarity index 100% rename from Exec/RegTests/Bomex/ERF_prob.H rename to Exec/MoistRegTests/Bomex/ERF_prob.H diff --git a/Exec/RegTests/Bomex/ERF_prob.cpp b/Exec/MoistRegTests/Bomex/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/Bomex/ERF_prob.cpp rename to Exec/MoistRegTests/Bomex/ERF_prob.cpp diff --git a/Exec/RegTests/Bomex/GNUmakefile b/Exec/MoistRegTests/Bomex/GNUmakefile similarity index 89% rename from Exec/RegTests/Bomex/GNUmakefile rename to Exec/MoistRegTests/Bomex/GNUmakefile index d94c15c2d..23a7b5683 100644 --- a/Exec/RegTests/Bomex/GNUmakefile +++ b/Exec/MoistRegTests/Bomex/GNUmakefile @@ -30,5 +30,5 @@ USE_ASSERTION = TRUE Bpack := ./Make.package Blocs := . ERF_HOME := ../../.. -ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/Bomex +ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/MoistRegTests/Bomex include $(ERF_HOME)/Exec/Make.ERF diff --git a/Exec/RegTests/TurbulentInflow/Make.package b/Exec/MoistRegTests/Bomex/Make.package similarity index 100% rename from Exec/RegTests/TurbulentInflow/Make.package rename to Exec/MoistRegTests/Bomex/Make.package diff --git a/Exec/RegTests/Bomex/README b/Exec/MoistRegTests/Bomex/README similarity index 100% rename from Exec/RegTests/Bomex/README rename to Exec/MoistRegTests/Bomex/README diff --git a/Exec/RegTests/Bomex/input_Kessler b/Exec/MoistRegTests/Bomex/input_Kessler similarity index 100% rename from Exec/RegTests/Bomex/input_Kessler rename to Exec/MoistRegTests/Bomex/input_Kessler diff --git a/Exec/RegTests/Bomex/input_SAM b/Exec/MoistRegTests/Bomex/input_SAM similarity index 100% rename from Exec/RegTests/Bomex/input_SAM rename to Exec/MoistRegTests/Bomex/input_SAM diff --git a/Exec/RegTests/Bomex/input_sounding b/Exec/MoistRegTests/Bomex/input_sounding similarity index 100% rename from Exec/RegTests/Bomex/input_sounding rename to Exec/MoistRegTests/Bomex/input_sounding diff --git a/Exec/RegTests/Bubble/CMakeLists.txt b/Exec/MoistRegTests/Bubble/CMakeLists.txt similarity index 100% rename from Exec/RegTests/Bubble/CMakeLists.txt rename to Exec/MoistRegTests/Bubble/CMakeLists.txt diff --git a/Exec/RegTests/Bubble/ERF_prob.H b/Exec/MoistRegTests/Bubble/ERF_prob.H similarity index 100% rename from Exec/RegTests/Bubble/ERF_prob.H rename to Exec/MoistRegTests/Bubble/ERF_prob.H diff --git a/Exec/RegTests/Bubble/ERF_prob.cpp b/Exec/MoistRegTests/Bubble/ERF_prob.cpp similarity index 100% rename from Exec/RegTests/Bubble/ERF_prob.cpp rename to Exec/MoistRegTests/Bubble/ERF_prob.cpp diff --git a/Exec/RegTests/Bubble/GNUmakefile b/Exec/MoistRegTests/Bubble/GNUmakefile similarity index 88% rename from Exec/RegTests/Bubble/GNUmakefile rename to Exec/MoistRegTests/Bubble/GNUmakefile index fef156b43..6f61e4185 100644 --- a/Exec/RegTests/Bubble/GNUmakefile +++ b/Exec/MoistRegTests/Bubble/GNUmakefile @@ -28,5 +28,5 @@ Bpack := ./Make.package Blocs := . ERF_HOME := ../../.. -ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/Bubble +ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/MoistRegTests/Bubble include $(ERF_HOME)/Exec/Make.ERF diff --git a/Exec/RegTests/WPS_Test/Make.package b/Exec/MoistRegTests/Bubble/Make.package similarity index 100% rename from Exec/RegTests/WPS_Test/Make.package rename to Exec/MoistRegTests/Bubble/Make.package diff --git a/Exec/RegTests/Bubble/input_sounding_squall2d b/Exec/MoistRegTests/Bubble/input_sounding_squall2d similarity index 100% rename from Exec/RegTests/Bubble/input_sounding_squall2d rename to Exec/MoistRegTests/Bubble/input_sounding_squall2d diff --git a/Exec/RegTests/Bubble/inputs_BF02_dry_bubble b/Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_dry_bubble rename to Exec/MoistRegTests/Bubble/inputs_BF02_dry_bubble diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble_Kessler b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble_Kessler rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_Kessler diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble_OpenBC b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble_OpenBC rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_OpenBC diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoIce diff --git a/Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce b/Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce similarity index 100% rename from Exec/RegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce rename to Exec/MoistRegTests/Bubble/inputs_BF02_moist_bubble_SAM_NoPrecip_NoIce diff --git a/Exec/RegTests/Bubble/inputs_grav2d_x b/Exec/MoistRegTests/Bubble/inputs_grav2d_x similarity index 100% rename from Exec/RegTests/Bubble/inputs_grav2d_x rename to Exec/MoistRegTests/Bubble/inputs_grav2d_x diff --git a/Exec/RegTests/Bubble/inputs_squall2d_x b/Exec/MoistRegTests/Bubble/inputs_squall2d_x similarity index 100% rename from Exec/RegTests/Bubble/inputs_squall2d_x rename to Exec/MoistRegTests/Bubble/inputs_squall2d_x diff --git a/Exec/RegTests/Bubble/inputs_test_outflow b/Exec/MoistRegTests/Bubble/inputs_test_outflow similarity index 100% rename from Exec/RegTests/Bubble/inputs_test_outflow rename to Exec/MoistRegTests/Bubble/inputs_test_outflow diff --git a/Exec/SquallLine_2D/CMakeLists.txt b/Exec/MoistRegTests/SquallLine_2D/CMakeLists.txt similarity index 100% rename from Exec/SquallLine_2D/CMakeLists.txt rename to Exec/MoistRegTests/SquallLine_2D/CMakeLists.txt diff --git a/Exec/SquallLine_2D/ERF_prob.H b/Exec/MoistRegTests/SquallLine_2D/ERF_prob.H similarity index 98% rename from Exec/SquallLine_2D/ERF_prob.H rename to Exec/MoistRegTests/SquallLine_2D/ERF_prob.H index 4cdc03bdb..7fd584299 100644 --- a/Exec/SquallLine_2D/ERF_prob.H +++ b/Exec/MoistRegTests/SquallLine_2D/ERF_prob.H @@ -109,7 +109,7 @@ public: const int& khi); protected: - std::string name () override { return "Supercell"; } + std::string name () override { return "SquallLine"; } private: ProbParm parms; diff --git a/Exec/SquallLine_2D/ERF_prob.cpp b/Exec/MoistRegTests/SquallLine_2D/ERF_prob.cpp similarity index 100% rename from Exec/SquallLine_2D/ERF_prob.cpp rename to Exec/MoistRegTests/SquallLine_2D/ERF_prob.cpp diff --git a/Exec/SquallLine_2D/GNUmakefile b/Exec/MoistRegTests/SquallLine_2D/GNUmakefile similarity index 83% rename from Exec/SquallLine_2D/GNUmakefile rename to Exec/MoistRegTests/SquallLine_2D/GNUmakefile index 5705fc951..f664f464a 100644 --- a/Exec/SquallLine_2D/GNUmakefile +++ b/Exec/MoistRegTests/SquallLine_2D/GNUmakefile @@ -27,6 +27,6 @@ USE_ASSERTION = TRUE # GNU Make Bpack := ./Make.package Blocs := . -ERF_HOME := ../.. -ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/SquallLine_2D +ERF_HOME := ../../.. +ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/MoistRegTests/SquallLine_2D include $(ERF_HOME)/Exec/Make.ERF diff --git a/Exec/RegTests/WitchOfAgnesi/Make.package b/Exec/MoistRegTests/SquallLine_2D/Make.package similarity index 100% rename from Exec/RegTests/WitchOfAgnesi/Make.package rename to Exec/MoistRegTests/SquallLine_2D/Make.package diff --git a/Exec/SquallLine_2D/README b/Exec/MoistRegTests/SquallLine_2D/README similarity index 100% rename from Exec/SquallLine_2D/README rename to Exec/MoistRegTests/SquallLine_2D/README diff --git a/Exec/SquallLine_2D/inputs_ml b/Exec/MoistRegTests/SquallLine_2D/inputs_ml similarity index 100% rename from Exec/SquallLine_2D/inputs_ml rename to Exec/MoistRegTests/SquallLine_2D/inputs_ml diff --git a/Exec/SquallLine_2D/inputs_moisture_Gabersek b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek similarity index 100% rename from Exec/SquallLine_2D/inputs_moisture_Gabersek rename to Exec/MoistRegTests/SquallLine_2D/inputs_moisture_Gabersek diff --git a/Exec/SquallLine_2D/inputs_moisture_SAM b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM similarity index 100% rename from Exec/SquallLine_2D/inputs_moisture_SAM rename to Exec/MoistRegTests/SquallLine_2D/inputs_moisture_SAM diff --git a/Exec/SquallLine_2D/inputs_moisture_WRF b/Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF similarity index 100% rename from Exec/SquallLine_2D/inputs_moisture_WRF rename to Exec/MoistRegTests/SquallLine_2D/inputs_moisture_WRF diff --git a/Exec/SuperCell_3D/CMakeLists.txt b/Exec/MoistRegTests/SuperCell_3D/CMakeLists.txt similarity index 100% rename from Exec/SuperCell_3D/CMakeLists.txt rename to Exec/MoistRegTests/SuperCell_3D/CMakeLists.txt diff --git a/Exec/SuperCell_3D/ERF_prob.H b/Exec/MoistRegTests/SuperCell_3D/ERF_prob.H similarity index 100% rename from Exec/SuperCell_3D/ERF_prob.H rename to Exec/MoistRegTests/SuperCell_3D/ERF_prob.H diff --git a/Exec/SuperCell_3D/ERF_prob.cpp b/Exec/MoistRegTests/SuperCell_3D/ERF_prob.cpp similarity index 99% rename from Exec/SuperCell_3D/ERF_prob.cpp rename to Exec/MoistRegTests/SuperCell_3D/ERF_prob.cpp index 164026bcd..1b596b69a 100644 --- a/Exec/SuperCell_3D/ERF_prob.cpp +++ b/Exec/MoistRegTests/SuperCell_3D/ERF_prob.cpp @@ -328,9 +328,6 @@ Problem::init_custom_pert ( const Real x_c = parms.x_c, y_c = parms.y_c, z_c = parms.z_c, x_r = parms.x_r, y_r = parms.y_r, z_r = parms.z_r, theta_c = parms.theta_c, r_c = 1.0; //const Real x_c = 0.0, z_c = 2.0e3, x_r = 10.0e3, z_r = 1.5e3, r_c = 1.0, theta_c = 3.0; - Real Rd_by_Cp = sc.rdOcp; - Rd_by_Cp = Rd_by_Cp; - Real height = parms.height; Real z_tr = parms.z_tr; diff --git a/Exec/SuperCell_3D/GNUmakefile b/Exec/MoistRegTests/SuperCell_3D/GNUmakefile similarity index 83% rename from Exec/SuperCell_3D/GNUmakefile rename to Exec/MoistRegTests/SuperCell_3D/GNUmakefile index c13672992..8a260c0f3 100644 --- a/Exec/SuperCell_3D/GNUmakefile +++ b/Exec/MoistRegTests/SuperCell_3D/GNUmakefile @@ -27,6 +27,6 @@ USE_ASSERTION = TRUE # GNU Make Bpack := ./Make.package Blocs := . -ERF_HOME := ../.. -ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/SuperCell_3D +ERF_HOME := ../../.. +ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/MoistRegTests/SuperCell_3D include $(ERF_HOME)/Exec/Make.ERF diff --git a/Exec/SquallLine_2D/Make.package b/Exec/MoistRegTests/SuperCell_3D/Make.package similarity index 100% rename from Exec/SquallLine_2D/Make.package rename to Exec/MoistRegTests/SuperCell_3D/Make.package diff --git a/Exec/SuperCell_3D/README b/Exec/MoistRegTests/SuperCell_3D/README similarity index 100% rename from Exec/SuperCell_3D/README rename to Exec/MoistRegTests/SuperCell_3D/README diff --git a/Exec/SuperCell_3D/inputs_Supercell_3D b/Exec/MoistRegTests/SuperCell_3D/inputs_Supercell_3D similarity index 100% rename from Exec/SuperCell_3D/inputs_Supercell_3D rename to Exec/MoistRegTests/SuperCell_3D/inputs_Supercell_3D diff --git a/Exec/RegTests/DynamicRefinement/CMakeLists.txt b/Exec/RegTests/DynamicRefinement/CMakeLists.txt deleted file mode 100644 index f5e544b89..000000000 --- a/Exec/RegTests/DynamicRefinement/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -set(erf_exe_name erf_dynamic_refinement) - -add_executable(${erf_exe_name} "") -target_sources(${erf_exe_name} - PRIVATE - ERF_prob.cpp -) - -target_include_directories(${erf_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - -include(${CMAKE_SOURCE_DIR}/CMake/BuildERFExe.cmake) -build_erf_exe(${erf_exe_name}) diff --git a/Exec/RegTests/DynamicRefinement/ERF_prob.H b/Exec/RegTests/DynamicRefinement/ERF_prob.H deleted file mode 100644 index c759964b8..000000000 --- a/Exec/RegTests/DynamicRefinement/ERF_prob.H +++ /dev/null @@ -1,62 +0,0 @@ -#ifndef ERF_PROB_H_ -#define ERF_PROB_H_ - -#include - -#include "AMReX_REAL.H" - -#include "ERF_prob_common.H" -#include "ERF_Constants.H" - -struct ProbParm : ProbParmDefaults { - amrex::Real p_inf = p_0; //freestream pressure [Pa] - amrex::Real T_inf = 300.0; //freestream temperature [K] - amrex::Real M_inf = 0.2; //freestream Mach number [-] - amrex::Real alpha = 0.0; //inflow angle, 0 --> x-aligned [rad] - amrex::Real gamma = Gamma; //specific heat ratio [-] - amrex::Real beta = 0.01; //non-dimensional max perturbation strength [-] - amrex::Real sigma = 1.0; //Gaussian standard deviation, i.e., spreading parameter [-] - amrex::Real R = 2.0; //characteristic length scale for grid [m] - amrex::Real xc = 0.5; //normalized x-location of vortex center [-] - amrex::Real yc = 0.5; //normalized y-location of vortex center [-] - // calculated quantiites - amrex::Real rho_0; //characteristic density [m/s] - amrex::Real a_inf; //speed of sound [m/s] - amrex::Real inv_gm1; //1/(gamma - 1) [-] -}; // namespace ProbParm - -class Problem : public ProblemBase -{ -public: - Problem(const amrex_real* problo, const amrex_real* probhi); - -#include "Prob/ERF_init_constant_density_hse.H" - - void init_custom_pert ( - const amrex::Box& bx, - const amrex::Box& xbx, - const amrex::Box& ybx, - const amrex::Box& zbx, - amrex::Array4 const& state, - amrex::Array4 const& state_pert, - amrex::Array4 const& x_vel_pert, - amrex::Array4 const& y_vel_pert, - amrex::Array4 const& z_vel_pert, - amrex::Array4 const& r_hse, - amrex::Array4 const& p_hse, - amrex::Array4 const& z_nd, - amrex::Array4 const& z_cc, - amrex::GeometryData const& geomdata, - amrex::Array4 const& mf_m, - amrex::Array4 const& mf_u, - amrex::Array4 const& mf_v, - const SolverChoice& sc) override; - -protected: - std::string name() override { return "Dynamic Refinement"; } - -private: - ProbParm parms; -}; - -#endif diff --git a/Exec/RegTests/DynamicRefinement/ERF_prob.cpp b/Exec/RegTests/DynamicRefinement/ERF_prob.cpp deleted file mode 100644 index 3f6bbd304..000000000 --- a/Exec/RegTests/DynamicRefinement/ERF_prob.cpp +++ /dev/null @@ -1,177 +0,0 @@ -#include "ERF_prob.H" - -using namespace amrex; - -std::unique_ptr -amrex_probinit(const amrex_real* problo, const amrex_real* probhi) -{ - return std::make_unique(problo, probhi); -} - -Problem::Problem(const amrex_real* problo, const amrex_real* probhi) -{ - // Parse params - ParmParse pp("prob"); - pp.query("p_inf", parms.p_inf); - pp.query("T_inf", parms.T_inf); - pp.query("M_inf", parms.M_inf); - pp.query("alpha", parms.alpha); - pp.query("gamma", parms.gamma); - pp.query("beta", parms.beta); - pp.query("sigma", parms.sigma); - pp.query("R", parms.R); - pp.query("xc", parms.xc); - pp.query("yc", parms.yc); - - parms.xc = problo[0] + parms.xc * (probhi[0] - problo[0]); - parms.yc = problo[1] + parms.yc * (probhi[1] - problo[1]); - amrex::Print() << " vortex initialized at (" - << parms.xc << ", " - << parms.yc << ")" - << std::endl; - - parms.inv_gm1 = 1.0 / (parms.gamma - 1.0); - - amrex::Print() << " reference pressure = " << parms.p_inf << " Pa" << std::endl; - amrex::Print() << " reference temperature = " << parms.T_inf << " K" << std::endl; - amrex::Print() << " reference potential temperature (not used) = " << parms.T_0 << " K" << std::endl; - - parms.rho_0 = parms.p_inf / (R_d * parms.T_inf); - amrex::Print() << " calculated freestream air density = " - << parms.rho_0 << " kg/m^3" - << std::endl; - - parms.a_inf = std::sqrt(parms.gamma * R_d * parms.T_inf); - amrex::Print() << " calculated speed of sound, a = " - << parms.a_inf << " m/s" - << std::endl; - - amrex::Print() << " freestream u/a = " - << parms.M_inf * std::cos(parms.alpha) - << std::endl; - amrex::Print() << " freestream v/a = " - << parms.M_inf * std::sin(parms.alpha) - << std::endl; - - init_base_parms(parms.rho_0, parms.T_0); -} - -AMREX_GPU_DEVICE -static -Real -erf_vortex_Gaussian( - Real x, Real y, - Real xc, Real yc, - Real R, Real beta, - Real sigma) -{ - // Evaluate Gaussian function - const Real r2 = ((x-xc)*(x-xc) + (y-yc)*(y-yc)) / (R*R); - return beta * std::exp(-r2/(2.*sigma*sigma)); -} - -void -Problem::init_custom_pert( - const Box& bx, - const Box& xbx, - const Box& ybx, - const Box& zbx, - Array4 const& /*state*/, - Array4 const& state_pert, - Array4 const& x_vel_pert, - Array4 const& y_vel_pert, - Array4 const& z_vel_pert, - Array4 const& /*r_hse*/, - Array4 const& /*p_hse*/, - Array4 const& /*z_nd*/, - Array4 const& /*z_cc*/, - amrex::GeometryData const& geomdata, - Array4 const& /*mf_m*/, - Array4 const& /*mf_u*/, - Array4 const& /*mf_v*/, - const SolverChoice& sc) -{ - const bool use_moisture = (sc.moisture_type != MoistureType::None); - - Real xc = parms.xc; Real yc = parms.yc; - Real R = parms.R ; Real beta = parms.beta; - Real sigma = parms.sigma; - - const Real rdOcp = sc.rdOcp; - - ParallelFor(bx, [=, parms_d=parms] AMREX_GPU_DEVICE(int i, int j, int k) noexcept - { - const Real* prob_lo = geomdata.ProbLo(); - const Real* dx = geomdata.CellSize(); - const Real x = prob_lo[0] + (i + 0.5) * dx[0]; // cell center - const Real y = prob_lo[1] + (j + 0.5) * dx[1]; // cell center - - // Calculate perturbation temperature - const Real Omg = erf_vortex_Gaussian(x,y,xc,yc,R,beta,sigma); - const Real deltaT = -(parms_d.gamma - 1.0)/(2.0*sigma*sigma) * Omg*Omg; - - // Set the perturbation density - const Real rho_norm = std::pow(1.0 + deltaT, parms_d.inv_gm1); - state_pert(i, j, k, Rho_comp) = (rho_norm - 1.0) * parms_d.rho_0; - - // Initial _potential_ temperature - const Real T = (1.0 + deltaT) * parms_d.T_inf; - const Real p = std::pow(rho_norm, Gamma) / Gamma // isentropic relation - * parms_d.rho_0*parms_d.a_inf*parms_d.a_inf; - const Real rho_theta = parms_d.rho_0 * rho_norm * (T * std::pow(p_0 / p, rdOcp)); // T --> theta - state_pert(i, j, k, RhoTheta_comp) = rho_theta - parms_d.rho_0 * parms_d.T_0; // Set the perturbation rho*theta - - // Set scalar = 0 -- unused - state_pert(i, j, k, RhoScalar_comp) = 1.0 + Omg; - - if (use_moisture) { - state_pert(i, j, k, RhoQ1_comp) = 0.0; - state_pert(i, j, k, RhoQ2_comp) = 0.0; - } - }); - - // Set the x-velocity - ParallelFor(xbx, [=, parms_d=parms] AMREX_GPU_DEVICE(int i, int j, int k) noexcept - { - const Real* prob_lo = geomdata.ProbLo(); - const Real* dx = geomdata.CellSize(); - - const Real x = prob_lo[0] + i * dx[0]; // face center - const Real y = prob_lo[1] + (j + 0.5) * dx[1]; // cell center - const Real Omg = erf_vortex_Gaussian(x,y,xc,yc,R,beta,sigma); - - x_vel_pert(i, j, k) = (parms_d.M_inf * std::cos(parms_d.alpha) - - (y - parms_d.yc)/parms_d.R * Omg) * parms_d.a_inf; - }); - - // Set the y-velocity - ParallelFor(ybx, [=, parms_d=parms] AMREX_GPU_DEVICE(int i, int j, int k) noexcept - { - const Real* prob_lo = geomdata.ProbLo(); - const Real* dx = geomdata.CellSize(); - - const Real x = prob_lo[0] + (i + 0.5) * dx[0]; // cell center - const Real y = prob_lo[1] + j * dx[1]; // face center - const Real Omg = erf_vortex_Gaussian(x,y,xc,yc,R,beta,sigma); - - y_vel_pert(i, j, k) = (parms_d.M_inf * std::sin(parms_d.alpha) - + (x - parms_d.xc)/parms_d.R * Omg) * parms_d.a_inf; - }); - - // Set the z-velocity - ParallelFor(zbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept - { - z_vel_pert(i, j, k) = 0.0; - }); -} - -#if 0 -AMREX_GPU_DEVICE -Real -dhdt(int /*i*/, int /*j*/, - const GpuArray /*dx*/, - const Real /*time_mt*/, const Real /*delta_t*/) -{ - return 0.; -} -#endif diff --git a/Exec/RegTests/DynamicRefinement/GNUmakefile b/Exec/RegTests/DynamicRefinement/GNUmakefile deleted file mode 100644 index 329e9d444..000000000 --- a/Exec/RegTests/DynamicRefinement/GNUmakefile +++ /dev/null @@ -1,33 +0,0 @@ -# AMReX -COMP = gnu -PRECISION = DOUBLE - -# Profiling -PROFILE = FALSE -TINY_PROFILE = FALSE -COMM_PROFILE = FALSE -TRACE_PROFILE = FALSE -MEM_PROFILE = FALSE -USE_GPROF = FALSE - -# Performance -USE_MPI = TRUE -USE_OMP = FALSE - -USE_CUDA = FALSE -USE_HIP = FALSE -USE_SYCL = FALSE - -# Debugging -DEBUG = FALSE - -TEST = TRUE -USE_ASSERTION = TRUE - -# GNU Make -Bpack := ./Make.package -Blocs := . - -ERF_HOME := ../../.. -ERF_PROBLEM_DIR = $(ERF_HOME)/Exec/RegTests/DynamicRefinement -include $(ERF_HOME)/Exec/Make.ERF diff --git a/Exec/RegTests/DynamicRefinement/inputs_threelevel b/Exec/RegTests/DynamicRefinement/inputs_threelevel deleted file mode 100644 index b5dc591e5..000000000 --- a/Exec/RegTests/DynamicRefinement/inputs_threelevel +++ /dev/null @@ -1,83 +0,0 @@ -# ------------------ INPUTS TO MAIN PROGRAM ------------------- -max_step = 2000 - -amrex.fpe_trap_invalid = 1 - -fabarray.mfiter_tile_size = 1024 1024 1024 - -# PROBLEM SIZE & GEOMETRY -geometry.prob_lo = -6 -6 -1 -geometry.prob_hi = 6 6 1 -amr.n_cell = 96 96 4 - -amr.blocking_factor_x = 16 16 16 -amr.blocking_factor_y = 16 16 16 -amr.blocking_factor_z = 1 1 1 - -geometry.is_periodic = 1 1 0 - -zlo.type = "SlipWall" -zhi.type = "SlipWall" - -# TIME STEP CONTROL -erf.substepping_type = Implicit -erf.fixed_dt = 0.000015 - -# 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 = 2 # maximum level number allowed -amr.ref_ratio_vect = 2 2 1 4 4 1 -erf.refinement_indicators = hi_scal1 hi_scal2 -erf.hi_scal1.max_level = 1 -erf.hi_scal1.field_name = scalar -erf.hi_scal1.value_greater = 1. -erf.hi_scal2.max_level = 2 -erf.hi_scal2.field_name = scalar -erf.hi_scal2.value_greater = 2. -amr.n_error_buf = 4 -erf.regrid_int = 2 -erf.cf_width = 4 # Internal relaxation (not ready w/ multiple boxes at a level) -erf.cf_set_width = 1 # Internal Dirichlet (not ready w/ multiple boxes at a level) -amr.iterate_grids = true # Prevents level 1 BA decomposition (use true to decompose) - -# CHECKPOINT FILES -erf.check_file = chk # root name of checkpoint file -erf.check_int = -100 # number of timesteps between checkpoints - -# PLOTFILES -erf.plot_file_1 = plt # prefix of plotfile name -erf.plot_int_1 = 1 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhotheta x_velocity y_velocity z_velocity pressure theta temp scalar pres_hse dens_hse pert_pres pert_dens mapfac - -# SOLVER CHOICE -erf.alpha_T = 0.0 -erf.alpha_C = 0.0 -erf.use_gravity = false - -erf.les_type = "None" -erf.molec_diff_type = "None" -erf.dynamicViscosity = 0.0 - -erf.init_type = "uniform" - -# PROBLEM PARAMETERS -prob.p_inf = 1e5 # reference pressure [Pa] -prob.T_inf = 300. # reference temperature [K] -prob.M_inf = 1.1952286093343936 # freestream Mach number [-] -prob.alpha = 0.7853981633974483 # inflow angle, 0 --> x-aligned [rad] -prob.beta = 1.1088514254079065 # non-dimensional max perturbation strength [-] -prob.R = 1.0 # characteristic length scale for grid [m] -prob.sigma = 1.0 # Gaussian standard deviation [-] - -# PROBLEM PARAMETERS - STATIONARY -#prob.M_inf = 0.0 # freestream Mach number [-] -#prob.alpha = 0.0 # inflow angle, 0 --> x-aligned [rad] -#prob.gamma = 1.4 # specific heat ratio [-] -#prob.beta = 0.05 # non-dimensional max perturbation strength [-] - - - diff --git a/Exec/RegTests/DynamicRefinement/inputs_twolevel b/Exec/RegTests/DynamicRefinement/inputs_twolevel deleted file mode 100644 index ab3fe43d2..000000000 --- a/Exec/RegTests/DynamicRefinement/inputs_twolevel +++ /dev/null @@ -1,87 +0,0 @@ -# ------------------ INPUTS TO MAIN PROGRAM ------------------- -max_step = 2000 - -erf.coupling_type = TwoWay -erf.cf_width = 0 # Internal relaxation -erf.cf_set_width = 0 # Internal Dirichlet - -amrex.fpe_trap_invalid = 1 - -fabarray.mfiter_tile_size = 1024 1024 1024 - -# PROBLEM SIZE & GEOMETRY -geometry.prob_lo = -6 -6 -1 -geometry.prob_hi = 6 6 1 -amr.n_cell = 96 96 4 - -amr.max_grid_size_x = 128 128 -amr.max_grid_size_y = 128 128 - -amr.max_grid_size_x = 128 128 -amr.max_grid_size_y = 128 32 - -amr.blocking_factor_z = 1 1 - -geometry.is_periodic = 1 1 0 - -zlo.type = "SlipWall" -zhi.type = "SlipWall" - -# TIME STEP CONTROL -erf.substepping_type = None -erf.fixed_dt = 0.000015 -erf.fixed_fast_dt = 0.000005 - -# 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 = 1 # maximum level number allowed -amr.ref_ratio_vect = 3 3 1 -amr.ref_ratio_vect = 2 2 1 -erf.refinement_indicators = hi_scal1 -erf.hi_scal1.max_level = 1 -erf.hi_scal1.field_name = scalar -erf.hi_scal1.value_greater = 1. -amr.n_error_buf = 4 -erf.regrid_int = 2 - -# CHECKPOINT FILES -erf.check_file = chk # root name of checkpoint file -erf.check_int = 200 # number of timesteps between checkpoints - -# PLOTFILES -erf.plot_file_1 = plt # prefix of plotfile name -erf.plot_int_1 = 50 # number of timesteps between plotfiles -erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta temp scalar pres_hse dens_hse pert_pres pert_dens - -# SOLVER CHOICE -erf.alpha_T = 0.0 -erf.alpha_C = 0.0 -erf.use_gravity = false - -erf.les_type = "None" -erf.molec_diff_type = "None" -erf.dynamicViscosity = 0.0 - -erf.init_type = "uniform" - -# PROBLEM PARAMETERS -prob.p_inf = 1e5 # reference pressure [Pa] -prob.T_inf = 300. # reference temperature [K] -prob.M_inf = 1.1952286093343936 # freestream Mach number [-] -prob.alpha = 0.7853981633974483 # inflow angle, 0 --> x-aligned [rad] -prob.beta = 1.1088514254079065 # non-dimensional max perturbation strength [-] -prob.R = 1.0 # characteristic length scale for grid [m] -prob.sigma = 1.0 # Gaussian standard deviation [-] - -# PROBLEM PARAMETERS - STATIONARY -#prob.M_inf = 0.0 # freestream Mach number [-] -#prob.alpha = 0.0 # inflow angle, 0 --> x-aligned [rad] -#prob.gamma = 1.4 # specific heat ratio [-] -#prob.beta = 0.05 # non-dimensional max perturbation strength [-] - - - diff --git a/Exec/SuperCell_3D/Make.package b/Exec/SuperCell_3D/Make.package deleted file mode 100644 index 5fc21f61c..000000000 --- a/Exec/SuperCell_3D/Make.package +++ /dev/null @@ -1,2 +0,0 @@ -CEXE_headers += ERF_prob.H -CEXE_sources += ERF_prob.cpp diff --git a/Tests/CTestList.cmake b/Tests/CTestList.cmake index 231bdf855..e4eb44dd8 100644 --- a/Tests/CTestList.cmake +++ b/Tests/CTestList.cmake @@ -102,86 +102,84 @@ endfunction(add_test_0) # Regression tests #============================================================================= if(WIN32) -#add_test_r(Bubble_DensityCurrent "Bubble/bubble.exe" "plt00010") -add_test_r(CouetteFlow_x "RegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00050") -add_test_r(CouetteFlow_y "RegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00050") -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/*/erf_ekman_spiral.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(IVA_NumDiff "RegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010") +add_test_r(CouetteFlow_x "DryRegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00050") +add_test_r(CouetteFlow_y "DryRegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00050") +add_test_r(DensityCurrent "DryRegTests/DensityCurrent/*/erf_density_current.exe" "plt00010") +add_test_r(DensityCurrent_detJ2 "DryRegTests/DensityCurrent/*/erf_density_current.exe" "plt00010") +add_test_r(DensityCurrent_detJ2_nosub "DryRegTests/DensityCurrent/*/erf_density_current.exe" "plt00020") +add_test_r(DensityCurrent_detJ2_MT "DryRegTests/DensityCurrent/*/erf_density_current.exe" "plt00010") +add_test_r(EkmanSpiral "DryRegTests/EkmanSpiral/*/erf_ekman_spiral.exe" "plt00010") +add_test_r(IsentropicVortexStationary "DryRegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010") +add_test_r(IsentropicVortexAdvecting "DryRegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010") +add_test_r(IVA_NumDiff "DryRegTests/IsentropicVortex/*/erf_isentropic_vortex.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_x "RegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00010") -add_test_r(PoiseuilleFlow_y "RegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00010") -add_test_r(RayleighDamping "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00100") -add_test_r(ScalarAdvectionUniformU "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvectionShearedU "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00080") -add_test_r(ScalarAdvDiff_order2 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_order3 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_order4 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_order5 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_order6 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_weno3 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_d(ScalarAdvDiff_weno3z "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_r(ScalarAdvDiff_weno5 "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -add_test_d(ScalarAdvDiff_weno5z "RegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") -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/*/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(PoiseuilleFlow_x "DryRegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00010") +add_test_r(PoiseuilleFlow_y "DryRegTests/Couette_Poiseuille/*/erf_couette_poiseuille.exe" "plt00010") +add_test_r(RayleighDamping "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00100") +add_test_r(ScalarAdvectionUniformU "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvectionShearedU "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00080") +add_test_r(ScalarAdvDiff_order2 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_order3 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_order4 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_order5 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_order6 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_weno3 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_d(ScalarAdvDiff_weno3z "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_weno5 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_d(ScalarAdvDiff_weno5z "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarAdvDiff_wenomzq3 "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarDiffusionGaussian "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(ScalarDiffusionSine "DryRegTests/ScalarAdvDiff/*/erf_scalar_advdiff.exe" "plt00020") +add_test_r(TaylorGreenAdvecting "DryRegTests/TaylorGreenVortex/*/erf_taylor_green.exe" "plt00010") +add_test_r(TaylorGreenAdvectingDiffusing "DryRegTests/TaylorGreenVortex/*/erf_taylor_green.exe" "plt00010") +add_test_r(MSF_NoSub_IsentropicVortexAdv "DryRegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010") +add_test_r(MSF_Sub_IsentropicVortexAdv "DryRegTests/IsentropicVortex/*/erf_isentropic_vortex.exe" "plt00010") 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 "RegTests/Bubble/*/erf_bubble.exe" "plt00010") +add_test_r(MoistBubble "MoistRegTests/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_x "RegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00050") -add_test_r(CouetteFlow_y "RegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00050") -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/erf_ekman_spiral" "plt00010") -add_test_r(IsentropicVortexStationary "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") -add_test_r(IsentropicVortexAdvecting "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") -add_test_r(IVA_NumDiff "RegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") +add_test_r(CouetteFlow_x "DryRegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00050") +add_test_r(CouetteFlow_y "DryRegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00050") +add_test_r(DensityCurrent "DryRegTests/DensityCurrent/erf_density_current" "plt00010") +add_test_r(DensityCurrent_detJ2 "DryRegTests/DensityCurrent/erf_density_current" "plt00010") +add_test_r(DensityCurrent_detJ2_nosub "DryRegTests/DensityCurrent/erf_density_current" "plt00020") +add_test_r(DensityCurrent_detJ2_MT "DryRegTests/DensityCurrent/erf_density_current" "plt00010") +add_test_r(EkmanSpiral "DryRegTests/EkmanSpiral/erf_ekman_spiral" "plt00010") +add_test_r(IsentropicVortexStationary "DryRegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") +add_test_r(IsentropicVortexAdvecting "DryRegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") +add_test_r(IVA_NumDiff "DryRegTests/IsentropicVortex/erf_isentropic_vortex" "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_x "RegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00010") -add_test_r(PoiseuilleFlow_y "RegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00010") -add_test_r(RayleighDamping "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00100") -add_test_r(ScalarAdvectionUniformU "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvectionShearedU "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00080") -add_test_r(ScalarAdvDiff_order2 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_order3 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_order4 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_order5 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_order6 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_weno3 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_d(ScalarAdvDiff_weno3z "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_r(ScalarAdvDiff_weno5 "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -add_test_d(ScalarAdvDiff_weno5z "RegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") -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/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(PoiseuilleFlow_x "DryRegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00010") +add_test_r(PoiseuilleFlow_y "DryRegTests/Couette_Poiseuille/erf_couette_poiseuille" "plt00010") +add_test_r(RayleighDamping "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00100") +add_test_r(ScalarAdvectionUniformU "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvectionShearedU "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00080") +add_test_r(ScalarAdvDiff_order2 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_order3 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_order4 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_order5 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_order6 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_weno3 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_d(ScalarAdvDiff_weno3z "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_weno5 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_d(ScalarAdvDiff_weno5z "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarAdvDiff_wenomzq3 "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarDiffusionGaussian "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(ScalarDiffusionSine "DryRegTests/ScalarAdvDiff/erf_scalar_advdiff" "plt00020") +add_test_r(TaylorGreenAdvecting "DryRegTests/TaylorGreenVortex/erf_taylor_green" "plt00010") +add_test_r(TaylorGreenAdvectingDiffusing "DryRegTests/TaylorGreenVortex/erf_taylor_green" "plt00010") +add_test_r(MSF_NoSub_IsentropicVortexAdv "DryRegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") +add_test_r(MSF_Sub_IsentropicVortexAdv "DryRegTests/IsentropicVortex/erf_isentropic_vortex" "plt00010") 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 "RegTests/Bubble/erf_bubble" "plt00010") +add_test_r(MoistBubble "MoistRegTests/Bubble/erf_bubble" "plt00010") add_test_0(InitSoundingIdeal_stationary "ABL/erf_abl" "plt00010") add_test_0(Deardorff_stationary "ABL/erf_abl" "plt00010")