Resolving conflcits with buoyancy term

erf-model · Jan 2, 2024 · ba6a8bb · ba6a8bb
2 parents 0b2bfaf + a209eb3
commit ba6a8bb
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/Source/BoundaryConditions/BoundaryConditions_wrfbdy.cpp b/Source/BoundaryConditions/BoundaryConditions_wrfbdy.cpp
@@ -29,13 +29,8 @@ ERF::fill_from_wrfbdy (const Vector<MultiFab*>& mfs,
  amrex::Real oma = 1.0 - alpha;
 
  // Flags for read vars and index mapping
-#if defined(ERF_USE_MOISTURE) || defined(ERF_USE_WARM_NO_PRECIP)
- Vector<int> cons_read = {1, 1, 0, 0, 0, 1, 0};
- Vector<int> cons_map = {WRFBdyVars::R, WRFBdyVars::T, 0, 0, 0, WRFBdyVars::QV, 0};
-# else
- Vector<int> cons_read = {1, 1, 0, 0, 0}; // R, RT, RKE, RQKE, RS
- Vector<int> cons_map = {WRFBdyVars::R, WRFBdyVars::T, 0, 0, 0}; // R, RT, RKE, RQKE, RS
-#endif
+ Vector<int> cons_read = {1, 1, 0, 0, 0, 1, 0, 0, 0};
+ Vector<int> cons_map = {WRFBdyVars::R, WRFBdyVars::T, 0, 0, 0, WRFBdyVars::QV, 0, 0, 0};
 
  Vector<Vector<int>> is_read;
  is_read.push_back( cons_read );