diff options
| author |  Luca Fedeli <luca.fedeli@cea.fr>
| 2020-09-17 20:09:08 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-17 11:09:08 -0700 |
| commit | 266f2a28b80a5aada004a24c72b9de59af15533b (patch) | |
| tree | 641b39f1927e5a27944d02551f9a772e83b7c346 /Source/Particles/PhysicalParticleContainer.cpp | |
| parent | 8d9193675b3292571478803fbe55f6831afe454b (diff) | |
| download | WarpX-266f2a28b80a5aada004a24c72b9de59af15533b.tar.gz WarpX-266f2a28b80a5aada004a24c72b9de59af15533b.tar.zst WarpX-266f2a28b80a5aada004a24c72b9de59af15533b.zip | |
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 <<comparison of integer expressions of different signedness>>
* Update Source/FieldSolver/FiniteDifferenceSolver/MacroscopicEvolveE.cpp
Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
Co-authored-by: Axel Huebl <axel.huebl@plasma.ninja>
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
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<amrex::Real,3> galilean_shift = { v_galilean[0]*time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; + amrex::Array<amrex::Real,3> galilean_shift ={ + m_v_galilean[0]*time_shift, + m_v_galilean[1]*time_shift, + m_v_galilean[2]*time_shift }; const std::array<Real, 3>& 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(), |