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/Utils/WarpXMovingWindow.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/Utils/WarpXMovingWindow.cpp')
| -rw-r--r-- | Source/Utils/WarpXMovingWindow.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index 01a1a9c1c..f1ee00b13 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -376,22 +376,28 @@ WarpX::ShiftGalileanBoundary () Real time_shift = (cur_time - time_of_last_gal_shift); #if (AMREX_SPACEDIM == 3) - galilean_shift = { v_galilean[0]* time_shift, v_galilean[1]*time_shift, v_galilean[2]*time_shift }; + m_galilean_shift = { + m_v_galilean[0]* time_shift, + m_v_galilean[1]*time_shift, + m_v_galilean[2]*time_shift }; #elif (AMREX_SPACEDIM == 2) - galilean_shift = { v_galilean[0]* time_shift, std::numeric_limits<Real>::quiet_NaN(), v_galilean[2]*time_shift }; + m_galilean_shift = { + m_v_galilean[0]* time_shift, + std::numeric_limits<Real>::quiet_NaN(), + m_v_galilean[2]*time_shift }; #endif #if (AMREX_SPACEDIM == 3) for (int i=0; i<AMREX_SPACEDIM; i++) { - new_lo[i] = current_lo[i] + galilean_shift[i]; - new_hi[i] = current_hi[i] + galilean_shift[i]; + new_lo[i] = current_lo[i] + m_galilean_shift[i]; + new_hi[i] = current_hi[i] + m_galilean_shift[i]; } #elif (AMREX_SPACEDIM == 2) { - new_lo[0] = current_lo[0] + galilean_shift[0]; - new_hi[0] = current_hi[0] + galilean_shift[0]; - new_lo[1] = current_lo[1] + galilean_shift[2]; - new_hi[1] = current_hi[1] + galilean_shift[2]; + new_lo[0] = current_lo[0] + m_galilean_shift[0]; + new_hi[0] = current_hi[0] + m_galilean_shift[0]; + new_lo[1] = current_lo[1] + m_galilean_shift[2]; + new_hi[1] = current_hi[1] + m_galilean_shift[2]; } #endif time_of_last_gal_shift = cur_time; |