From 6166de191d0a2b468ea56bacec481e1ff27fcae1 Mon Sep 17 00:00:00 2001 From: Remi Lehe Date: Fri, 10 Jan 2020 20:57:16 -0800 Subject: Start fixing compilation errors --- .../FieldSolver/FiniteDifferenceSolver/EvolveB.cpp | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp') diff --git a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp index 33253c986..a70548817 100644 --- a/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp +++ b/Source/FieldSolver/FiniteDifferenceSolver/EvolveB.cpp @@ -1,28 +1,32 @@ +#include #include #include +#include -FiniteDifferenceSolver::EvolveB ( VectorField Bfield, - ConstVectorField Efield, - amrex::Real dt ) { +using namespace amrex; + +void FiniteDifferenceSolver::EvolveB ( VectorField& Bfield, + VectorField& Efield, + amrex::Real dt ) { // Select algorithm (The choice of algorithm is a runtime option, // but we compile code for each algorithm, using templates) - if (fdtd_algo == MaxwellSolverAlgo::Yee){ + if (m_fdtd_algo == MaxwellSolverAlgo::Yee){ EvolveBwithAlgo ( Bfield, Efield, dt ); // } else if (fdtd_algo == MaxwellSolverAlgo::CKC) { // EvolveBwithAlgo ( Bfield, Efield, dt ); } else { amrex::Abort("Unknown algorithm"); } -) +} template -FiniteDifferenceSolver::EvolveBwithAlgo ( VectorField Bfield, - ConstVectorField Efield, - amrex::Real dt ) { +void FiniteDifferenceSolver::EvolveBwithAlgo ( VectorField& Bfield, + VectorField& Efield, + amrex::Real dt ) { // Loop through the grids, and over the tiles within each grid #ifdef _OPENMP -#pragma omp parallel if (Gpu::notInLaunchRegion()) +#pragma omp parallel if (amrex::Gpu::notInLaunchRegion()) #endif for ( MFIter mfi(*Bfield[0], TilingIfNotGPU()); mfi.isValid(); ++mfi ) { @@ -66,4 +70,4 @@ FiniteDifferenceSolver::EvolveBwithAlgo ( VectorField Bfield, } -}; +} -- cgit v1.2.3