cleaning code for spectral cufft for 3D

2 files changed, 6 insertions, 62 deletions

diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
index 36d5782e8..0a8614e54 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.H
@@ -17,19 +17,15 @@ class PsatdAlgorithm : public SpectralBaseAlgorithm
                          const amrex::DistributionMapping& dm,
                          const int norder_x, const int norder_y,
                          const int norder_z, const bool nodal, const amrex::Real dt);
-        //PsatdAlgorithm() = default; // Default constructor
-        //PsatdAlgorithm& operator=(PsatdAlgorithm&& algorithm) = default;
-        void InitializeCoefficience(const SpectralKSpace& spectral_kspace,
+
+        void InitializeSpectralCoefficients(const SpectralKSpace& spectral_kspace,
                                     const amrex::DistributionMapping& dm, 
                                     const amrex::Real dt);
+
         void pushSpectralFields(SpectralFieldData& f) const override final;
 
     private:
         // Modified finite-order vectors
-//        KVectorComponent modified_kx_vec, modified_kz_vec;
-//#if (AMREX_SPACEDIM==3)
-//        KVectorComponent modified_ky_vec;
-//#endif
         SpectralCoefficients C_coef, S_ck_coef, X1_coef, X2_coef, X3_coef;
 };
 
diff --git a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
index 3da0ef453..d45b01bda 100644
--- a/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
+++ b/Source/FieldSolver/SpectralSolver/SpectralAlgorithms/PsatdAlgorithm.cpp
@@ -22,61 +22,8 @@ PsatdAlgorithm::PsatdAlgorithm(const SpectralKSpace& spectral_kspace,
     X2_coef = SpectralCoefficients(ba, dm, 1, 0);
     X3_coef = SpectralCoefficients(ba, dm, 1, 0);
 
-    InitializeCoefficience(spectral_kspace, dm, dt);
+    InitializeSpectralCoefficients(spectral_kspace, dm, dt);
 }
-//    // Fill them with the right values:
-//    // Loop over boxes and allocate the corresponding coefficients
-//    // for each box owned by the local MPI proc
-//    for (MFIter mfi(ba, dm); mfi.isValid(); ++mfi){
-//
-//        //const Box& bx = ba[mfi];
-//        const Box bx = ba[mfi];
-//
-//        // Extract pointers for the k vectors
-//        const Real* modified_kx = modified_kx_vec[mfi].dataPtr();
-//#if (AMREX_SPACEDIM==3)
-//        const Real* modified_ky = modified_ky_vec[mfi].dataPtr();
-//#endif
-//        const Real* modified_kz = modified_kz_vec[mfi].dataPtr();
-//        // Extract arrays for the coefficients
-//        Array4<Real> C = C_coef[mfi].array();
-//        Array4<Real> S_ck = S_ck_coef[mfi].array();
-//        Array4<Real> X1 = X1_coef[mfi].array();
-//        Array4<Real> X2 = X2_coef[mfi].array();
-//        Array4<Real> X3 = X3_coef[mfi].array();
-//
-//        // Loop over indices within one box
-//        ParallelFor(bx,
-//        [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept
-//        {
-//            // Calculate norm of vector
-//            const Real k_norm = std::sqrt(
-//                std::pow(modified_kx[i], 2) +
-//#if (AMREX_SPACEDIM==3)
-//                std::pow(modified_ky[j], 2) +
-//                std::pow(modified_kz[k], 2));
-//#else
-//                std::pow(modified_kz[j], 2));
-//#endif
-//
-//            // Calculate coefficients
-//            constexpr Real c = PhysConst::c;
-//            constexpr Real ep0 = PhysConst::ep0;
-//            if (k_norm != 0){
-//                C(i,j,k) = std::cos(c*k_norm*dt);
-//                S_ck(i,j,k) = std::sin(c*k_norm*dt)/(c*k_norm);
-//                X1(i,j,k) = (1. - C(i,j,k))/(ep0 * c*c * k_norm*k_norm);
-//                X2(i,j,k) = (1. - S_ck(i,j,k)/dt)/(ep0 * k_norm*k_norm);
-//                X3(i,j,k) = (C(i,j,k) - S_ck(i,j,k)/dt)/(ep0 * k_norm*k_norm);
-//            } else { // Handle k_norm = 0, by using the analytical limit
-//                C(i,j,k) = 1.;
-//                S_ck(i,j,k) = dt;
-//                X1(i,j,k) = 0.5 * dt*dt / ep0;
-//                X2(i,j,k) = c*c * dt*dt / (6.*ep0);
-//                X3(i,j,k) = - c*c * dt*dt / (3.*ep0);
-//            }
-//        });
-//    }
 
 /* Advance the E and B field in spectral space (stored in `f`)
  * over one time step */
@@ -139,6 +86,7 @@ PsatdAlgorithm::pushSpectralFields(SpectralFieldData& f) const{
             const Real X2 = X2_arr(i,j,k);
             const Real X3 = X3_arr(i,j,k);
 
+
             // Update E (see WarpX online documentation: theory section)
             fields(i,j,k,Idx::Ex) = C*Ex_old
                         + S_ck*(c2*I*(ky*Bz_old - kz*By_old) - inv_ep0*Jx)
@@ -163,7 +111,7 @@ PsatdAlgorithm::pushSpectralFields(SpectralFieldData& f) const{
     }
 };
 
-void PsatdAlgorithm::InitializeCoefficience(const SpectralKSpace& spectral_kspace,
+void PsatdAlgorithm::InitializeSpectralCoefficients(const SpectralKSpace& spectral_kspace,
                                     const amrex::DistributionMapping& dm,
                                     const amrex::Real dt)
 {