From 266f2a28b80a5aada004a24c72b9de59af15533b Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Thu, 17 Sep 2020 20:09:08 +0200 Subject: Fix few compilation warnings (shift) (#1310) * fix << declaration of galilean_shift shadows a member of WarpX >> * fix << unused mu_stag >> * fix << unused uxp, uyp, uzp >> * renamed galilean_shift (member variable of WarpX class) into m_galilean_shift * renamed v_galilean to m_v_galilean when appropriate * fixed bug introduced in latest commit * fix <> * Update Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp Co-authored-by: Axel Huebl Co-authored-by: Axel Huebl --- Source/Particles/PhysicalParticleContainer.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Source/Particles/PhysicalParticleContainer.cpp') diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 1ac048cec..36a2ea292 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -165,9 +165,9 @@ PhysicalParticleContainer::PhysicalParticleContainer (AmrCore* amr_core, int isp // Parse galilean velocity ParmParse ppsatd("psatd"); - ppsatd.query("v_galilean", v_galilean); + ppsatd.query("v_galilean", m_v_galilean); // Scale the velocity by the speed of light - for (int i=0; i<3; i++) v_galilean[i] *= PhysConst::c; + for (int i=0; i<3; i++) m_v_galilean[i] *= PhysConst::c; // build filter functors m_do_random_filter = pp.query("random_fraction", m_random_fraction); @@ -1440,7 +1440,7 @@ PhysicalParticleContainer::PushP (int lev, Real dt, const auto getExternalE = GetExternalEField(pti); const auto getExternalB = GetExternalBField(pti); - const auto& xyzmin = WarpX::GetInstance().LowerCornerWithGalilean(box,v_galilean,lev); + const auto& xyzmin = WarpX::GetInstance().LowerCornerWithGalilean(box,m_v_galilean,lev); const Dim3 lo = lbound(box); @@ -1800,7 +1800,10 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, Real cur_time = WarpX::GetInstance().gett_new(lev); const auto& time_of_last_gal_shift = WarpX::GetInstance().time_of_last_gal_shift; Real time_shift = (cur_time - time_of_last_gal_shift); - amrex::Array galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; + amrex::Array galilean_shift ={ + m_v_galilean[0]*time_shift, + m_v_galilean[1]*time_shift, + m_v_galilean[2]*time_shift }; const std::array& xyzmin = WarpX::LowerCorner(box, galilean_shift, gather_lev); const Dim3 lo = lbound(box); @@ -1988,7 +1991,7 @@ PhysicalParticleContainer::getIonizationFunc (const WarpXParIter& pti, WARPX_PROFILE("PhysicalParticleContainer::getIonizationFunc()"); return IonizationFilterFunc(pti, lev, ngE, Ex, Ey, Ez, Bx, By, Bz, - v_galilean, + m_v_galilean, ionization_energies.dataPtr(), adk_prefactor.dataPtr(), adk_exp_prefactor.dataPtr(), -- cgit v1.2.3