Merge pull request #150 from jrood-nrel/jrood/cxx_standard

Change ifs to ifdefs to avoids standards errors
AMReX-Combustion · Feb 2, 2021 · b24c68e · b24c68e
2 parents 77f894f + 0784c33
commit b24c68e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Source/ArrayViewEXT.H b/Source/ArrayViewEXT.H
@@ -8,7 +8,7 @@
 
 #include <AMReX_MultiFab.H>
 
-#if (BL_USE_FLOAT)
+#ifdef (BL_USE_FLOAT)
 #  define FP_CLASS fp_classf
 #else
 #  define FP_CLASS fp_class

diff --git a/Source/PeleLM.cpp b/Source/PeleLM.cpp
@@ -3728,7 +3728,7 @@ PeleLM::compute_enthalpy_fluxes (MultiFab* const*       flux,
   FArrayBox fab_tmp;
   for (MFIter mfi(TT,TilingIfNotGPU()); mfi.isValid(); ++mfi)
   {
-#if AMREX_USE_EB
+#ifdef AMREX_USE_EB
     const Box &bx = mfi.tilebox();  
     // this is to check efficiently if this tile contains any eb stuff
     const EBFArrayBox& in_fab = static_cast<EBFArrayBox const&>(TT[mfi]);
@@ -3770,7 +3770,7 @@ PeleLM::compute_enthalpy_fluxes (MultiFab* const*       flux,
               }
           });
       }
-#if AMREX_USE_EB
+#ifdef AMREX_USE_EB
     }
 #endif
   }
@@ -5378,7 +5378,7 @@ PeleLM::getFuncCountDM (const BoxArray& bxba, int ngrow)
 
   fctmpnew.clear();
 
-#if AMREX_USE_MPI
+#ifdef AMREX_USE_MPI
   const int IOProc = ParallelDescriptor::IOProcessorNumber();
 
   Vector<int> nmtags(ParallelDescriptor::NProcs(),0);
@@ -8952,7 +8952,7 @@ PeleLM::initActiveControl()
       bcnormal(x, s_ext_d, ctrl_flameDir_l, 1, time_l, geomdata, *lprobparm, *lacparm, lpmfdata);
    });
    amrex::Real s_ext[DEF_NUM_STATE];
-#if AMREX_USE_GPU
+#ifdef AMREX_USE_GPU
    amrex::Gpu::dtoh_memcpy(s_ext,s_ext_d,sizeof(amrex::Real)*DEF_NUM_STATE);
 #else
    std::memcpy(s_ext,s_ext_d,sizeof(amrex::Real)*DEF_NUM_STATE);