Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move run directories into new locations #1926

Merged
merged 3 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Docs/sphinx_doc/Verification.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
43 changes: 21 additions & 22 deletions Exec/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Exec/DevTests/Radiation/ERF_prob.H
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public:
const int& khi);

protected:
std::string name () override { return "Supercell"; }
std::string name () override { return "SquallLine"; }

private:
ProbParm parms;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
12 changes: 0 additions & 12 deletions Exec/RegTests/DynamicRefinement/CMakeLists.txt

This file was deleted.

62 changes: 0 additions & 62 deletions Exec/RegTests/DynamicRefinement/ERF_prob.H

This file was deleted.

177 changes: 0 additions & 177 deletions Exec/RegTests/DynamicRefinement/ERF_prob.cpp

This file was deleted.

Loading
Loading