Merge branch 'dev' into add_harmonic_beam

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/FieldSolver/WarpXPushFieldsEM.cpp b/Source/FieldSolver/WarpXPushFieldsEM.cpp
index 9807665c6..4848b051e 100644
--- a/Source/FieldSolver/WarpXPushFieldsEM.cpp
+++ b/Source/FieldSolver/WarpXPushFieldsEM.cpp
@@ -90,7 +90,7 @@ WarpX::PushPSATD_localFFT (int lev, amrex::Real /* dt */)
 #endif
 
 void
-WarpX::EvolveB (Real a_dt)
+WarpX::EvolveB (amrex::Real a_dt)
 {
     for (int lev = 0; lev <= finest_level; ++lev) {
         EvolveB(lev, a_dt);
@@ -98,7 +98,7 @@ WarpX::EvolveB (Real a_dt)
 }
 
 void
-WarpX::EvolveB (int lev, Real a_dt)
+WarpX::EvolveB (int lev, amrex::Real a_dt)
 {
     BL_PROFILE("WarpX::EvolveB()");
     EvolveB(lev, PatchType::fine, a_dt);
@@ -303,7 +303,7 @@ WarpX::EvolveB (int lev, PatchType patch_type, amrex::Real a_dt)
 }
 
 void
-WarpX::EvolveE (Real a_dt)
+WarpX::EvolveE (amrex::Real a_dt)
 {
     for (int lev = 0; lev <= finest_level; ++lev)
     {
@@ -312,7 +312,7 @@ WarpX::EvolveE (Real a_dt)
 }
 
 void
-WarpX::EvolveE (int lev, Real a_dt)
+WarpX::EvolveE (int lev, amrex::Real a_dt)
 {
     BL_PROFILE("WarpX::EvolveE()");
     EvolveE(lev, PatchType::fine, a_dt);
@@ -611,7 +611,7 @@ WarpX::EvolveE (int lev, PatchType patch_type, amrex::Real a_dt)
 }
 
 void
-WarpX::EvolveF (Real a_dt, DtType a_dt_type)
+WarpX::EvolveF (amrex::Real a_dt, DtType a_dt_type)
 {
     if (!do_dive_cleaning) return;
 
@@ -622,7 +622,7 @@ WarpX::EvolveF (Real a_dt, DtType a_dt_type)
 }
 
 void
-WarpX::EvolveF (int lev, Real a_dt, DtType a_dt_type)
+WarpX::EvolveF (int lev, amrex::Real a_dt, DtType a_dt_type)
 {
     if (!do_dive_cleaning) return;
 
@@ -631,7 +631,7 @@ WarpX::EvolveF (int lev, Real a_dt, DtType a_dt_type)
 }
 
 void
-WarpX::EvolveF (int lev, PatchType patch_type, Real a_dt, DtType a_dt_type)
+WarpX::EvolveF (int lev, PatchType patch_type, amrex::Real a_dt, DtType a_dt_type)
 {
     if (!do_dive_cleaning) return;