fix oops from previous PR (erf-model#1909)

AMLattanzi · Oct 24, 2024 · cee2934 · cee2934
1 parent d151417
commit cee2934
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/ERF.cpp b/Source/ERF.cpp
@@ -943,7 +943,7 @@ ERF::InitData_post ()
         base_state[lev].FillBoundary(geom[lev].periodicity());
 
         // For moving terrain only
-        if (solverChoice.terrain_type != TerrainType::Static) {
+        if (solverChoice.terrain_type == TerrainType::Moving) {
             MultiFab::Copy(base_state_new[lev],base_state[lev],0,0,BaseState::num_comps,base_state[lev].nGrowVect());
             base_state_new[lev].FillBoundary(geom[lev].periodicity());
         }

diff --git a/Source/ERF_make_new_arrays.cpp b/Source/ERF_make_new_arrays.cpp
@@ -31,7 +31,7 @@ ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm,
     tmp_base_state.define(ba,dm,BaseState::num_comps,3);
     tmp_base_state.setVal(0.);
 
-    if (solverChoice.use_terrain && solverChoice.terrain_type != TerrainType::Static) {
+    if (solverChoice.use_terrain && solverChoice.terrain_type == TerrainType::Moving) {
         base_state_new[lev].define(ba,dm,BaseState::num_comps,3);
         base_state_new[lev].setVal(0.);
     }
@@ -42,7 +42,7 @@ ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm,
     if (solverChoice.use_terrain) {
         z_phys_cc[lev] = std::make_unique<MultiFab>(ba,dm,1,1);
 
-        if (solverChoice.terrain_type != TerrainType::Static)
+        if (solverChoice.terrain_type == TerrainType::Moving)
         {
             detJ_cc_new[lev] = std::make_unique<MultiFab>(ba,dm,1,1);
             detJ_cc_src[lev] = std::make_unique<MultiFab>(ba,dm,1,1);
@@ -65,7 +65,7 @@ ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm,
         int ngrow = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff) + 2;
         tmp_zphys_nd = std::make_unique<MultiFab>(ba_nd,dm,1,IntVect(ngrow,ngrow,ngrow));
 
-        if (solverChoice.terrain_type != TerrainType::Static) {
+        if (solverChoice.terrain_type == TerrainType::Moving) {
             z_phys_nd_new[lev] = std::make_unique<MultiFab>(ba_nd,dm,1,IntVect(ngrow,ngrow,ngrow));
             z_phys_nd_src[lev] = std::make_unique<MultiFab>(ba_nd,dm,1,IntVect(ngrow,ngrow,ngrow));
         }

diff --git a/Source/Utils/ERF_PoissonSolve.cpp b/Source/Utils/ERF_PoissonSolve.cpp
@@ -72,7 +72,7 @@ void ERF::project_velocities (int lev, Real l_dt, Vector<MultiFab>& mom_mf, Mult
 
     MLPoisson mlpoisson(geom_tmp, ba_tmp, dm_tmp, info);
 
-    MultiFab r_hse(base_state[lev], make_alias, Basestate::r0_comp, 1);
+    MultiFab r_hse(base_state[lev], make_alias, BaseState::r0_comp, 1);
 
     auto bclo = get_projection_bc(Orientation::low);
     auto bchi = get_projection_bc(Orientation::high);