aboutsummaryrefslogtreecommitdiff
path: root/Source/FieldSolver/SpectralSolver
diff options
context:
space:
mode:
authorGravatar Remi Lehe <remi.lehe@normalesup.org> 2019-04-20 21:36:19 -0700
committerGravatar Remi Lehe <remi.lehe@normalesup.org> 2019-04-23 12:43:53 -0700
commit7b0571362a6eb23427ea56b1d780378c6f7730d8 (patch)
tree71a88daa573652d1d1445978599707b837364f1e /Source/FieldSolver/SpectralSolver
parent7104eee32f6f909d8a0b3abd11528b9e059a36d4 (diff)
downloadWarpX-7b0571362a6eb23427ea56b1d780378c6f7730d8.tar.gz
WarpX-7b0571362a6eb23427ea56b1d780378c6f7730d8.tar.zst
WarpX-7b0571362a6eb23427ea56b1d780378c6f7730d8.zip
Change type name
Diffstat (limited to 'Source/FieldSolver/SpectralSolver')
-rw-r--r--Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H6
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralKSpace.H8
-rw-r--r--Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp8
3 files changed, 11 insertions, 11 deletions
diff --git a/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H
index b54f5c143..2c3d8abfd 100644
--- a/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/PsatdAlgorithm.H
@@ -21,10 +21,10 @@ class PsatdAlgorithm
private:
// Modified finite-order vectors
- SpectralKVector modified_kx_vec, modified_kz_vec;
+ KVectorComponent modified_kx_vec, modified_kz_vec;
#if (AMREX_SPACEDIM==3)
- SpectralKVector modified_ky_vec;
-#endif
+ KVectorComponent modified_ky_vec;
+#endif
SpectralCoefficients C_coef, S_ck_coef, X1_coef, X2_coef, X3_coef;
};
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
index 6589c6346..366bc2a79 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.H
@@ -4,7 +4,7 @@
#include <AMReX_BoxArray.H>
#include <AMReX_LayoutData.H>
-using SpectralKVector = amrex::LayoutData< amrex::Gpu::ManagedVector <amrex::Real> >;
+using KVectorComponent = 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,14 +15,14 @@ class SpectralKSpace
SpectralKSpace( const amrex::BoxArray& realspace_ba,
const amrex::DistributionMapping& dm,
const amrex::RealVect dx );
- SpectralKVector& AllocateAndFillKVector(
+ KVectorComponent& AllocateAndFillKVector(
const amrex::DistributionMapping& dm, const int i_dim ) const;
- SpectralKVector& AllocateAndFillModifiedKVector(
+ KVectorComponent& AllocateAndFillModifiedKVector(
const amrex::DistributionMapping& dm, const int i_dim, const int order ) const;
amrex::BoxArray spectralspace_ba;
private:
- amrex::Array<SpectralKVector, AMREX_SPACEDIM> k_vec;
+ amrex::Array<KVectorComponent, AMREX_SPACEDIM> k_vec;
// 3D: array of 3 components, corresponding to kx, ky, kz
// 2D: array of 2 components, corresponding to kx, kz
amrex::RealVect dx;
diff --git a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
index 3c600221e..6e6115cec 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralKSpace.cpp
@@ -29,11 +29,11 @@ SpectralKSpace::SpectralKSpace( const BoxArray& realspace_ba,
}
}
-SpectralKVector&
+KVectorComponent&
SpectralKSpace::AllocateAndFillKVector( const DistributionMapping& dm, const int i_dim ) const
{
// Initialize an empty vector in each box
- SpectralKVector k_vec = SpectralKVector(spectralspace_ba, dm);
+ KVectorComponent k_vec = KVectorComponent(spectralspace_ba, dm);
// Loop over boxes
for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){
Box bx = spectralspace_ba[mfi];
@@ -65,12 +65,12 @@ SpectralKSpace::AllocateAndFillKVector( const DistributionMapping& dm, const int
return k_vec;
}
-SpectralKVector&
+KVectorComponent&
SpectralKSpace::AllocateAndFillModifiedKVector(
const DistributionMapping& dm, const int i_dim, const int order ) const
{
// Initialize an empty vector in each box
- SpectralKVector modified_k_vec = SpectralKVector( spectralspace_ba, dm );
+ KVectorComponent modified_k_vec = KVectorComponent( spectralspace_ba, dm );
// Loop over boxes
for ( MFIter mfi(spectralspace_ba, dm); mfi.isValid(); ++mfi ){
const ManagedVector<Real>& k = k_vec[i_dim][mfi];