From ee92c606a133b4db8f6f7d9d70f340915127ce2c Mon Sep 17 00:00:00 2001 From: Mukul Dave Date: Fri, 9 Feb 2024 11:20:11 -0800 Subject: [PATCH] use new compile time ifndef to comment out code when coupling with an external class --- Source/ERF.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/ERF.cpp b/Source/ERF.cpp index 22efc8ece..86e622f3c 100644 --- a/Source/ERF.cpp +++ b/Source/ERF.cpp @@ -494,15 +494,17 @@ ERF::InitData () const Real time = start_time; 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) { if (init_type == "ideal") { amrex::Abort("We do not currently support init_type = ideal with terrain"); @@ -1684,14 +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];