Buoyancy term and bc term for bx_xhi_face (#1356)

* Updating type 1 buoyancy with precipitation term * updating buoynacy term and switching lo(3) to hi(0) --------- Co-authored-by: Mahesh Natarajan <[email protected]>
erf-model · Jan 2, 2024 · 059c962 · 059c962
1 parent a209eb3
commit 059c962
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Source/BoundaryConditions/BoundaryConditions_xvel.cpp b/Source/BoundaryConditions/BoundaryConditions_xvel.cpp
@@ -95,7 +95,7 @@ void ERFPhysBCFunct::impose_lateral_xvel_bcs (const Array4<Real>& dest_arr,
             },
             // We only set the values on the domain faces themselves if EXT_DIR
             bx_xhi_face, ncomp, [=] AMREX_GPU_DEVICE (int i, int j, int k, int n) {
-                if (bc_ptr[n].lo(3) == ERFBCType::ext_dir)
+                if (bc_ptr[n].hi(0) == ERFBCType::ext_dir)
                     dest_arr(i,j,k) = l_bc_extdir_vals_d[n][3];
             }
         );

diff --git a/Source/TimeIntegration/ERF_make_buoyancy.cpp b/Source/TimeIntegration/ERF_make_buoyancy.cpp
@@ -160,8 +160,14 @@ 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) + 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);
+                    Real rhop_lo, rhop_hi;
+                    if(solverChoice.moisture_type == MoistureType::FastEddy){
+                        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  );
+                        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);
+                    }else{
+                        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  );
+                        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