From 110e46940a114bb7509c9008fc3aa88569f5a272 Mon Sep 17 00:00:00 2001
From: Mahesh Natarajan <mn556@cornell.edu>
Date: Sun, 31 Dec 2023 08:51:36 -0800
Subject: [PATCH 1/2] Updating type 1 buoyancy with precipitation term (#1354)

Co-authored-by: Mahesh Natarajan <mahesh@dogora.dhcp.lbl.gov>
---
 Source/TimeIntegration/ERF_make_buoyancy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/TimeIntegration/ERF_make_buoyancy.cpp b/Source/TimeIntegration/ERF_make_buoyancy.cpp
index ea1b67d03..d9db696d5 100644
--- a/Source/TimeIntegration/ERF_make_buoyancy.cpp
+++ b/Source/TimeIntegration/ERF_make_buoyancy.cpp
@@ -160,8 +160,8 @@ void make_buoyancy (Vector<MultiFab>& S_data,
 
                 amrex::ParallelFor(tbz, [=] AMREX_GPU_DEVICE (int i, int j, int k)
                 {
-                    Real rhop_hi = cell_data(i,j,k  ,Rho_comp) + cell_data(i,j,k  ,RhoQ1_comp) + cell_data(i,j,k  ,RhoQ2_comp) - r0_arr(i,j,k  );
-                    Real rhop_lo = cell_data(i,j,k-1,Rho_comp) + cell_data(i,j,k-1,RhoQ1_comp) + cell_data(i,j,k-1,RhoQ2_comp) - r0_arr(i,j,k-1);
+                    Real rhop_hi = cell_data(i,j,k  ,Rho_comp) + cell_data(i,j,k  ,RhoQ1_comp) + cell_data(i,j,k  ,RhoQ2_comp) + cell_data(i,j,k  ,RhoQ3_comp) - r0_arr(i,j,k  );
+                    Real rhop_lo = cell_data(i,j,k-1,Rho_comp) + cell_data(i,j,k-1,RhoQ1_comp) + cell_data(i,j,k-1,RhoQ2_comp) + cell_data(i,j,k-1,RhoQ3_comp)  - r0_arr(i,j,k-1);
                     buoyancy_fab(i, j, k) = grav_gpu[2] * 0.5 * ( rhop_hi + rhop_lo );
                 });
             } // mfi

From a209eb38b6a74a47151f70819ae9ec1d86433cd1 Mon Sep 17 00:00:00 2001
From: Ann Almgren <asalmgren@lbl.gov>
Date: Sun, 31 Dec 2023 09:05:25 -0800
Subject: [PATCH 2/2] fix indexing of is_read when using wrfbdy data (#1355)

---
 Source/BoundaryConditions/BoundaryConditions_wrfbdy.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Source/BoundaryConditions/BoundaryConditions_wrfbdy.cpp b/Source/BoundaryConditions/BoundaryConditions_wrfbdy.cpp
index 0153430ab..92e534efe 100644
--- 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 );