Changes required for coupling with AMR-Wind (#1431)

* changes to set up coupling with AMR-Wind * fix to read BCs for multiblock * commented out extraneous plotting of plot/check files * use new compile time ifndef to comment out code when coupling with an external class * remove plot/checkfile writing at the end of Evolve_MB that creates extraneous files --------- Co-authored-by: Ann Almgren <[email protected]>
erf-model · Feb 10, 2024 · 285409c · 285409c
1 parent a054824
commit 285409c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/Source/ERF.H b/Source/ERF.H
@@ -288,6 +288,10 @@ public:
     // Advance a block specified number of time steps
     void Evolve_MB (int MBstep, int max_block_step);
 
+    // get the current time values
+    amrex::Real get_t_old() {return t_old[0];}
+    amrex::Real get_t_new() {return t_new[0];}
+
     // Set parmparse prefix for MultiBlock
     void SetParmParsePrefix (std::string name) { pp_prefix = name; }
 

diff --git a/Source/ERF.cpp b/Source/ERF.cpp
@@ -496,11 +496,13 @@ ERF::InitData ()
         InitFromScratch(time);
 
 #ifdef ERF_USE_MULTIBLOCK
+#ifndef ERF_MB_EXTERN       // enter only if multiblock does not involve an external class
         // Multiblock: hook to set BL & comms once ba/dm are known
         if(domain_p[0].bigEnd(0) < 500 ) {
             m_mbc->SetBoxLists();
             m_mbc->SetBlockCommMetaData();
         }
+#endif
 #endif
 
         if (solverChoice.use_terrain) {
@@ -1684,12 +1686,14 @@ ERF::Evolve_MB (int MBstep, int max_block_step)
         int iteration = 1;
         timeStep(lev, cur_time, iteration);
 
+#ifndef ERF_MB_EXTERN
         // DEBUG
         // Multiblock: hook for erf2 to fill from erf1
         if(domain_p[0].bigEnd(0) < 500) {
             for (int var_idx = 0; var_idx < Vars::NumTypes; ++var_idx)
                 m_mbc->FillPatchBlocks(var_idx,var_idx);
         }
+#endif
 
         cur_time  += dt[0];
 
@@ -1730,23 +1734,5 @@ ERF::Evolve_MB (int MBstep, int max_block_step)
         if (cur_time >= stop_time - 1.e-6*dt[0]) break;
     }
 
-    if (plot_int_1 > 0 && istep[0] > last_plot_file_step_1) {
-        WritePlotFile(1,plot_var_names_1);
-    }
-    if (plot_int_2 > 0 && istep[0] > last_plot_file_step_2) {
-        WritePlotFile(2,plot_var_names_2);
-    }
-
-    if (check_int > 0 && istep[0] > last_check_file_step) {
-#ifdef ERF_USE_NETCDF
-        if (check_type == "netcdf") {
-           WriteNCCheckpointFile();
-        }
-#endif
-        if (check_type == "native") {
-           WriteCheckpointFile();
-        }
-    }
-
 }
 #endif
diff --git a/Source/Initialization/ERF_init_bcs.cpp b/Source/Initialization/ERF_init_bcs.cpp
@@ -48,7 +48,13 @@ void ERF::init_bcs ()
         m_bc_neumann_vals[BCVars::yvel_bc][ori] = 0.0;
         m_bc_neumann_vals[BCVars::zvel_bc][ori] = 0.0;
 
-        ParmParse pp(bcid);
+        std::string pp_text;
+        if (pp_prefix == "erf") {
+          pp_text = bcid;
+        } else {
+          pp_text = pp_prefix + "." + bcid;
+        }
+        ParmParse pp(pp_text);
         std::string bc_type_in = "null";
         pp.query("type", bc_type_in);
         //if (pp.query("type", bc_type_in))