WIP merging and fixing merge errors from recent commits from developm…

…ent.
wiersema1 · Oct 13, 2023 · bd57c15 · bd57c15
1 parent 2640976
commit bd57c15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Exec/DevTests/MetGrid/GNUmakefile b/Exec/DevTests/MetGrid/GNUmakefile
@@ -27,10 +27,10 @@ USE_ASSERTION = TRUE
 
 USE_NETCDF = TRUE
 
-USE_MOISTURE = FALSE
-#USE_MOISTURE = TRUE
+#USE_MOISTURE = FALSE
+USE_MOISTURE = TRUE
 
-USE_WARM_NO_PRECIP = TRUE
+#USE_WARM_NO_PRECIP = TRUE
 
 # GNU Make
 Bpack := ./Make.package

diff --git a/Exec/DevTests/MetGrid/inputs b/Exec/DevTests/MetGrid/inputs
@@ -40,7 +40,7 @@ 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     = RhoQv density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse pert_pres KE QKE
+erf.plot_vars_1     = qv Rhoqv density dens_hse rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta z_phys mapfac pres_hse pert_pres KE QKE
 
 # SOLVER CHOICE
 erf.alpha_T = 1.0

diff --git a/Source/Utils/Utils.H b/Source/Utils/Utils.H
@@ -68,7 +68,8 @@ void compute_interior_ghost_bxs_xy (const amrex::Box& bx,
 /*
  * Compute relaxation region RHS with wrfbdy
  */
-void wrfbdy_compute_interior_ghost_rhs (const amrex::Real& bdy_time_interval,
+void wrfbdy_compute_interior_ghost_rhs (const std::string& init_type,
+                                        const amrex::Real& bdy_time_interval,
                                         const amrex::Real& start_bdy_time,
                                         const amrex::Real& time,
                                         const amrex::Real& delta_t,