diff options
Diffstat (limited to 'Source/FieldSolver/SpectralSolver')
4 files changed, 24 insertions, 26 deletions
diff --git a/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H index 7e94bdec6..9fbdc7073 100644 --- a/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H +++ b/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H @@ -4,20 +4,17 @@ #include <SpectralKSpace.H> #include <SpectralFieldData.H> -using namespace amrex; -using namespace Gpu; - /* TODO: Write documentation */ class PsatdAlgorithm { - using SpectralCoefficients = FabArray<BaseFab<Real>>; + using SpectralCoefficients = amrex::FabArray< amrex::BaseFab <amrex::Real> >; public: PsatdAlgorithm(const SpectralKSpace& spectral_kspace, - const DistributionMapping& dm, - const int norder_x, const int norder_y, - const int norder_z, const Real dt); + const amrex::DistributionMapping& dm, + const int norder_x, const int norder_y, + const int norder_z, const amrex::Real dt); void pushSpectralFields( SpectralFieldData& f ) const; private: diff --git a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H index 2f6274e40..9f5b85a2b 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralFieldData.H +++ b/Source/FieldSolver/SpectralSolver/SpectralFieldData.H @@ -5,10 +5,8 @@ #include <SpectralKSpace.H> #include <AMReX_MultiFab.H> -using namespace amrex; - // Declare type for spectral fields -using SpectralField = FabArray<BaseFab<Complex>>; +using SpectralField = amrex::FabArray< amrex::BaseFab <Complex> >; /* Fields that will be stored in spectral space */ struct SpectralFieldIndex{ @@ -25,16 +23,16 @@ class SpectralFieldData #ifdef AMREX_USE_GPU // Add cuFFT-specific code #else - using FFTplans = LayoutData<fftw_plan>; + using FFTplans = amrex::LayoutData<fftw_plan>; #endif public: - SpectralFieldData( const BoxArray& realspace_ba, + SpectralFieldData( const amrex::BoxArray& realspace_ba, const SpectralKSpace& k_space, - const DistributionMapping& dm ); + const amrex::DistributionMapping& dm ); ~SpectralFieldData(); - void ForwardTransform( const MultiFab& mf, const int field_index ); - void BackwardTransform( MultiFab& mf, const int field_index ); + void ForwardTransform( const amrex::MultiFab& mf, const int field_index ); + void BackwardTransform( amrex::MultiFab& mf, const int field_index ); private: SpectralField Ex, Ey, Ez, Bx, By, Bz, Jx, Jy, Jz, rho_old, rho_new; diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H index 04264e629..f61cffe14 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H @@ -4,10 +4,7 @@ #include <AMReX_BoxArray.H> #include <AMReX_LayoutData.H> -using namespace amrex; -using namespace Gpu; - -using SpectralKVector = LayoutData<ManagedVector<Real>>; +using SpectralKVector = amrex::LayoutData< amrex::Gpu::ManagedVector <amrex::Real> >; /* TODO Documentation: class represent k space, and how it is distribution * for local FFT on each MPI: k spaces are not connected. @@ -15,18 +12,21 @@ using SpectralKVector = LayoutData<ManagedVector<Real>>; class SpectralKSpace { public: - SpectralKSpace( const BoxArray& realspace_ba, const DistributionMapping& dm, const Real* dx ); - BoxArray spectralspace_ba; + SpectralKSpace( const amrex::BoxArray& realspace_ba, + const amrex::DistributionMapping& dm, const amrex::Real* dx ); + amrex::BoxArray spectralspace_ba; SpectralKVector kx_vec, ky_vec, kz_vec; - const Real* dx; + const amrex::Real* dx; }; void -AllocateAndFillKvector( ManagedVector<Real>& k, const Box& bx, const Real* dx, const int i_dim ); +AllocateAndFillKvector( amrex::Gpu::ManagedVector<amrex::Real>& k, + const amrex::Box& bx, const amrex::Real* dx, const int i_dim ); void -ComputeModifiedKVector( ManagedVector<Real>& modified_k, - const ManagedVector<Real>& k, - const Box& bx, const Real dx, const int norder ); +ComputeModifiedKVector( amrex::Gpu::ManagedVector<amrex::Real>& modified_k, + const amrex::Gpu::ManagedVector<amrex::Real>& k, + const amrex::Box& bx, const amrex::Real dx, + const int norder ); #endif diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp index 03d62892f..0bd57c7ea 100644 --- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp +++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp @@ -1,6 +1,9 @@ #include <WarpXConst.H> #include <SpectralKSpace.H> +using namespace amrex; +using namespace Gpu; + SpectralKSpace::SpectralKSpace( const BoxArray& realspace_ba, const DistributionMapping& dm, const Real* realspace_dx ) |