diff options
| author |  Andrew Myers <atmyers2@gmail.com>
| 2018-11-27 14:32:48 -0800 |
|---|---|---|
| committer | Andrew Myers <atmyers2@gmail.com>
| 2018-11-27 14:32:48 -0800 |
| commit | cfe96495e5aff13291ecf92a0a57c9623cd9ba1b (patch) | |
| tree | a9f2774780a01aff0b37151ecba2ea31be2c816e /Source/PhysicalParticleContainer.cpp | |
| parent | 2b6139b265a69b7855712d9c8124e7b1a823aef9 (diff) | |
| download | WarpX-cfe96495e5aff13291ecf92a0a57c9623cd9ba1b.tar.gz WarpX-cfe96495e5aff13291ecf92a0a57c9623cd9ba1b.tar.zst WarpX-cfe96495e5aff13291ecf92a0a57c9623cd9ba1b.zip | |
reorganize code not to use the wrapper functions internally
Diffstat (limited to 'Source/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/PhysicalParticleContainer.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/PhysicalParticleContainer.cpp b/Source/PhysicalParticleContainer.cpp index cac67e6d6..ccb269343 100644 --- a/Source/PhysicalParticleContainer.cpp +++ b/Source/PhysicalParticleContainer.cpp @@ -955,7 +955,6 @@ PhysicalParticleContainer::FieldGather (int lev, // Field Gather // const int ll4symtry = false; - const int l_lower_order_in_v = warpx_l_lower_order_in_v(); long lvect_fieldgathe = 64; warpx_geteb_energy_conserving( &np, @@ -974,7 +973,7 @@ PhysicalParticleContainer::FieldGather (int lev, BL_TO_FORTRAN_ANYD(bxfab), BL_TO_FORTRAN_ANYD(byfab), BL_TO_FORTRAN_ANYD(bzfab), - &ll4symtry, &l_lower_order_in_v, + &ll4symtry, &WarpX::l_lower_order_in_v, &lvect_fieldgathe, &WarpX::field_gathering_algo); if (cost) { @@ -1069,7 +1068,7 @@ PhysicalParticleContainer::Evolve (int lev, FArrayBox const* byfab = &(By[pti]); FArrayBox const* bzfab = &(Bz[pti]); - if (warpx_use_fdtd_nci_corr()) + if (WarpX::use_fdtd_nci_corr) { #if (AMREX_SPACEDIM == 2) const Box& tbox = amrex::grow(pti.tilebox(),{static_cast<int>(WarpX::nox), @@ -1249,7 +1248,6 @@ PhysicalParticleContainer::Evolve (int lev, // Field Gather of Aux Data (i.e., the full solution) // const int ll4symtry = false; - const int l_lower_order_in_v = warpx_l_lower_order_in_v(); long lvect_fieldgathe = 64; const std::array<Real,3>& xyzmin_grid = WarpX::LowerCorner(box, lev); @@ -1276,7 +1274,7 @@ PhysicalParticleContainer::Evolve (int lev, BL_TO_FORTRAN_ANYD(*bxfab), BL_TO_FORTRAN_ANYD(*byfab), BL_TO_FORTRAN_ANYD(*bzfab), - &ll4symtry, &l_lower_order_in_v, + &ll4symtry, &WarpX::l_lower_order_in_v, &lvect_fieldgathe, &WarpX::field_gathering_algo); if (np_gather < np) @@ -1293,7 +1291,7 @@ PhysicalParticleContainer::Evolve (int lev, const FArrayBox* cbyfab = &(*cBy)[pti]; const FArrayBox* cbzfab = &(*cBz)[pti]; - if (warpx_use_fdtd_nci_corr()) + if (WarpX::use_fdtd_nci_corr) { #if (AMREX_SPACEDIM == 2) const Box& tbox = amrex::grow(cbox,{static_cast<int>(WarpX::nox), @@ -1373,7 +1371,7 @@ PhysicalParticleContainer::Evolve (int lev, BL_TO_FORTRAN_ANYD(*cbxfab), BL_TO_FORTRAN_ANYD(*cbyfab), BL_TO_FORTRAN_ANYD(*cbzfab), - &ll4symtry, &l_lower_order_in_v, + &ll4symtry, &WarpX::l_lower_order_in_v, &lvect_fieldgathe, &WarpX::field_gathering_algo); } @@ -1526,7 +1524,6 @@ PhysicalParticleContainer::PushP (int lev, Real dt, const int* ixyzmin_grid = box.loVect(); const int ll4symtry = false; - const int l_lower_order_in_v = true; long lvect_fieldgathe = 64; warpx_geteb_energy_conserving( &np, @@ -1545,7 +1542,7 @@ PhysicalParticleContainer::PushP (int lev, Real dt, BL_TO_FORTRAN_ANYD(bxfab), BL_TO_FORTRAN_ANYD(byfab), BL_TO_FORTRAN_ANYD(bzfab), - &ll4symtry, &l_lower_order_in_v, + &ll4symtry, &WarpX::l_lower_order_in_v, &lvect_fieldgathe, &WarpX::field_gathering_algo); warpx_particle_pusher_momenta(&np, |