Fix bug in Nturb multifab (#1519)

* Passing Nturb with ghost zones to fitch advance * Fix Nturb ghost zones bug * Make names consistent --------- Co-authored-by: Mahesh Natarajan <[email protected]> Co-authored-by: Ann Almgren <[email protected]>
erf-model · Mar 21, 2024 · 883c91b · 883c91b
1 parent e4ff12e
commit 883c91b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Source/ERF_make_new_level.cpp b/Source/ERF_make_new_level.cpp
@@ -699,7 +699,7 @@ void ERF::init_stuff (int lev, const BoxArray& ba, const DistributionMapping& dm
     if (solverChoice.windfarm_type == WindFarmType::Fitch){
         int ngrow_state = ComputeGhostCells(solverChoice.advChoice, solverChoice.use_NumDiff) + 1;
         vars_fitch[lev].define(ba, dm, 5, ngrow_state); // V, dVabsdt, dudt, dvdt, dTKEdt
-        Nturb[lev].define(ba, dm, 1, 0); // Number of turbines in a cell
+        Nturb[lev].define(ba, dm, 1, ngrow_state); // Number of turbines in a cell
     }
 #endif
 }

diff --git a/Source/TimeIntegration/ERF_Advance.cpp b/Source/TimeIntegration/ERF_Advance.cpp
@@ -72,7 +72,7 @@ ERF::Advance (int lev, Real time, Real dt_lev, int /*iteration*/, int /*ncycle*/
     // Update with the Fitch source terms
     if (solverChoice.windfarm_type == WindFarmType::Fitch) {
         fitch_advance(lev, Geom(lev), dt_lev, S_old,
-                      U_old, V_old, W_old, vars_fitch[lev]);
+                      U_old, V_old, W_old, vars_fitch[lev], Nturb[lev]);
     }
 #endif
 

diff --git a/Source/WindFarmParametrization/Fitch/AdvanceFitch.cpp b/Source/WindFarmParametrization/Fitch/AdvanceFitch.cpp
@@ -42,9 +42,9 @@ void fitch_advance (int lev,
                     const Real& dt_advance,
                     MultiFab& cons_in,
                     MultiFab& U_old, MultiFab& V_old, MultiFab& W_old,
-                    MultiFab& mf_vars_fitch)
+                    MultiFab& mf_vars_fitch, const amrex::MultiFab& mf_Nturb)
 {
-    fitch_source_terms_cellcentered(geom, cons_in, U_old, V_old, W_old, mf_vars_fitch);
+    fitch_source_terms_cellcentered(geom, cons_in, U_old, V_old, W_old, mf_vars_fitch, mf_Nturb);
     fitch_update(dt_advance, cons_in, U_old, V_old, mf_vars_fitch);
 }
 
@@ -85,7 +85,7 @@ void fitch_update (const Real& dt_advance,
 void fitch_source_terms_cellcentered (const Geometry& geom,
                                       const MultiFab& cons_in,
                                       const MultiFab& U_old, const MultiFab& V_old, const MultiFab& W_old,
-                                      MultiFab& mf_vars_fitch)
+                                      MultiFab& mf_vars_fitch, const amrex::MultiFab& mf_Nturb)
 {
 
   auto dx = geom.CellSizeArray();
@@ -114,6 +114,7 @@ void fitch_source_terms_cellcentered (const Geometry& geom,
         const Box& gbx = mfi.growntilebox(1);
         auto cons_array  = cons_in.array(mfi);
         auto fitch_array = mf_vars_fitch.array(mfi);
+        auto Nturb_array = mf_Nturb.array(mfi);
         auto u_vel       = U_old.array(mfi);
         auto v_vel       = V_old.array(mfi);
         auto w_vel       = W_old.array(mfi);
@@ -125,6 +126,7 @@ void fitch_source_terms_cellcentered (const Geometry& geom,
             int jj = amrex::min(amrex::max(j, domlo_y), domhi_y);
             int kk = amrex::min(amrex::max(k, domlo_z), domhi_z);
 
+
             Real x = (ii+0.5) * dx[0];
             Real y = (jj+0.5) * dx[1];
             Real z = (kk+0.5) * dx[2];

diff --git a/Source/WindFarmParametrization/Fitch/Fitch.H b/Source/WindFarmParametrization/Fitch/Fitch.H
@@ -9,12 +9,12 @@ void fitch_advance (int lev,
                     const amrex::Real& dt_advance,
                     amrex::MultiFab& cons_in,
                     amrex::MultiFab& U_old, amrex::MultiFab& V_old, amrex::MultiFab& W_old,
-                    amrex::MultiFab& mf_vars_fitch);
+                    amrex::MultiFab& mf_vars_fitch, const amrex::MultiFab& mf_Nturb);
 
 void fitch_source_terms_cellcentered (const amrex::Geometry& geom,
                                       const amrex::MultiFab& cons_in,
                                       const amrex::MultiFab& U_old, const amrex::MultiFab& V_old, const amrex::MultiFab& W_old,
-                                      amrex::MultiFab& mf_vars_fitch);
+                                      amrex::MultiFab& mf_vars_fitch, const amrex::MultiFab& mf_Nturb);
 
 void fitch_update (const amrex::Real& dt_advance,
                   amrex::MultiFab& cons_in,