remove print statement

erf-model · Dec 10, 2023 · a3782a7 · a3782a7
1 parent 9256cda
commit a3782a7
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ option(ERF_ENABLE_HDF5 "Enable HDF5 IO" ${ERF_ENABLE_NETCDF})
 option(ERF_ENABLE_FCOMPARE "Enable building fcompare when not testing" OFF)
 set(ERF_PRECISION "DOUBLE" CACHE STRING "Floating point precision SINGLE or DOUBLE")
 
-option(ERF_ENABLE_MOISTURE "Enable Full Moisture" OFF)
+option(ERF_ENABLE_MOISTURE "Enable Full Moisture" ON)
 option(ERF_ENABLE_WARM_NO_PRECIP "Enable Warm Moisture" OFF)
 option(ERF_ENABLE_RRTMGP "Enable RTE-RRTMGP Radiation" OFF)
 

diff --git a/Docs/sphinx_doc/Inputs.rst b/Docs/sphinx_doc/Inputs.rst
@@ -883,14 +883,8 @@ Examples of Usage
 Moisture
 ========
 
-ERF has two different moisture models -- one that includes only water vapor and cloud water,
-and a more complete model that includes water vapor, cloud water, cloud ice, rain, snow and graupel.
-
-If ERF is compiled with ERF_USE_WARM_NO_PRECIP defined, then the first model is used and no
-further inputs are required.
-
-If ERF is compiled with ERF_USE_MOISTURE defined, then the following run-time options control how
-the full moisture model is used.
+ERF has several different moisture models.
+The following run-time options control how the full moisture model is used.
 
 List of Parameters
 ------------------

diff --git a/Docs/sphinx_doc/RegressionTests.rst b/Docs/sphinx_doc/RegressionTests.rst
@@ -24,7 +24,7 @@ The following problems are currently tested in the CI:
 +-------------------------------+----------+----------+----------+------------+-------+-----------------------+
 | Test                          | nx ny nz | xbc      | ybc      | zbc        | Ext   | Other                 |
 +===============================+==========+==========+==========+============+=======+=======================+
-| Bubble_Density_Current        | 256 4 64 | Symmetry | Periodic | SlipWall   | None  | USE_MOISTURE=TRUE     |
+| Bubble_Density_Current        | 256 4 64 | Symmetry | Periodic | SlipWall   | None  | moist bubble          |
 |                               |          | Outflow  |          | SlipWall   |       |                       |
 +-------------------------------+----------+----------+----------+------------+-------+-----------------------+
 | CouetteFlow                   | 32 4  16 | Periodic | Periodic | SlipWall   | None  | inhomogeneous         |

diff --git a/Docs/sphinx_doc/building.rst b/Docs/sphinx_doc/building.rst
@@ -85,8 +85,6 @@ or if using tcsh,
    +--------------------+------------------------------+------------------+-------------+
    | USE_HDF5           | Whether to enable HDF5       | TRUE / FALSE     | FALSE       |
    +--------------------+------------------------------+------------------+-------------+
-   | USE_MOISTURE       | Whether to enable moisture   | TRUE / FALSE     | FALSE       |
-   +--------------------+------------------------------+------------------+-------------+
    | USE_WARM_NO_PRECIP | Whether to use warm moisture | TRUE / FALSE     | FALSE       |
    +--------------------+------------------------------+------------------+-------------+
    | USE_MULTIBLOCK     | Whether to enable multiblock | TRUE / FALSE     | FALSE       |
@@ -176,8 +174,6 @@ Analogous to GNU Make, the list of cmake directives is as follows:
    +---------------------------+------------------------------+------------------+-------------+
    | ERF_ENABLE_HDF5           | Whether to enable HDF5       | TRUE / FALSE     | FALSE       |
    +---------------------------+------------------------------+------------------+-------------+
-   | ERF_ENABLE_MOISTURE       | Whether to enable moisture   | TRUE / FALSE     | FALSE       |
-   +---------------------------+------------------------------+------------------+-------------+
    | ERF_ENABLE_WARM_NO_PRECIP | Whether to use warm moisture | TRUE / FALSE     | FALSE       |
    +---------------------------+------------------------------+------------------+-------------+
    | ERF_ENABLE_MULTIBLOCK     | Whether to enable multiblock | TRUE / FALSE     | FALSE       |

diff --git a/Exec/DevTests/MultiBlock/prob.H b/Exec/DevTests/MultiBlock/prob.H
@@ -40,14 +40,9 @@ public:
         amrex::Array4<amrex::Real      > const& p_hse,
         amrex::Array4<amrex::Real const> const& z_nd,
         amrex::Array4<amrex::Real const> const& z_cc,
-#if defined(ERF_USE_MOISTURE)
         amrex::Array4<amrex::Real      > const& qv,
         amrex::Array4<amrex::Real      > const& qc,
         amrex::Array4<amrex::Real      > const& qi,
-#elif defined(ERF_USE_WARM_NO_PRECIP)
-        amrex::Array4<amrex::Real      > const& qv,
-        amrex::Array4<amrex::Real      > const& qc,
-#endif
         amrex::GeometryData const& geomdata,
         amrex::Array4<amrex::Real const> const& mf_m,
         amrex::Array4<amrex::Real const> const& mf_u,

diff --git a/Exec/DevTests/MultiBlock/prob.cpp b/Exec/DevTests/MultiBlock/prob.cpp
@@ -40,14 +40,9 @@ Problem::init_custom_pert(
     Array4<Real      > const& p_hse,
     Array4<Real const> const&,
     Array4<Real const> const&,
-#if defined(ERF_USE_MOISTURE)
     Array4<Real      > const&,
     Array4<Real      > const&,
     Array4<Real      > const&,
-#elif defined(ERF_USE_WARM_NO_PRECIP)
-    Array4<Real      > const&,
-    Array4<Real      > const&,
-#endif
     GeometryData const& geomdata,
     Array4<Real const> const& /*mf_m*/,
     Array4<Real const> const& /*mf_u*/,
@@ -91,13 +86,8 @@ Problem::init_custom_pert(
     // Set scalar = 0 everywhere
     state(i, j, k, RhoScalar_comp) = 0.0;
 
-#if defined(ERF_USE_MOISTURE)
     state(i, j, k, RhoQ1_comp) = 0.0;
-    state(i, j, k, RhoQp_comp) = 0.0;
-#elif defined(ERF_USE_WARM_NO_PRECIP)
-    state(i, j, k, RhoQv_comp) = 0.0;
-    state(i, j, k, RhoQc_comp) = 0.0;
-#endif
+    state(i, j, k, RhoQ2_comp) = 0.0;
   });
 
   // Set the x-velocity

diff --git a/Source/IO/Plotfile.cpp b/Source/IO/Plotfile.cpp
@@ -212,7 +212,6 @@ ERF::WritePlotFile (int which, Vector<std::string> plot_var_names)
                     Real qv_for_p = qv_arr(i,j,k);
                     const Real rhotheta = S_arr(i,j,k,RhoTheta_comp);
                     derdat(i, j, k, mf_comp) = getPgivenRTh(rhotheta,qv_for_p);
-                    if (i == 30 and j == 30 and k == 2) amrex::Print() <<" MAKING PRESSURE " << rhotheta << " " << derdat(i,j,k,mf_comp) << std::endl;
                 });
             }
             mf_comp += 1;