Clean up

ECP-WarpX · Nov 4, 2024 · 4405e2c · 4405e2c
1 parent 2d78c27
commit 4405e2c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Source/FieldSolver/ImplicitSolvers/StrangImplicitSpectralEM.cpp b/Source/FieldSolver/ImplicitSolvers/StrangImplicitSpectralEM.cpp
@@ -26,8 +26,8 @@ void StrangImplicitSpectralEM::Define ( WarpX* const a_WarpX )
 
 
     // Parse nonlinear solver parameters
-    const amrex::ParmParse pp("implicit_evolve");
-    parseNonlinearSolverParams( pp );
+    const amrex::ParmParse pp_implicit_evolve("implicit_evolve");
+    parseNonlinearSolverParams( pp_implicit_evolve );
 
     // Define the nonlinear solver
     m_nlsolver->Define(m_E, this);
@@ -101,8 +101,8 @@ void StrangImplicitSpectralEM::ComputeRHS ( WarpXSolverVec& a_RHS,
                                             int a_nl_iter,
                                             bool a_from_jacobian )
 {
-    // update WarpX-owned Efield_fp and Bfield_fp using current state of E from
-    // the nonlinear solver at time n+1/2
+    // Update WarpX-owned Efield_fp and Bfield_fp using current state of
+    // E from the nonlinear solver at time n+1/2
     UpdateWarpXFields( a_E, a_time, a_dt );
 
     // Self consistently update particle positions and velocities using the

diff --git a/Source/FieldSolver/ImplicitSolvers/WarpXImplicitOps.cpp b/Source/FieldSolver/ImplicitSolvers/WarpXImplicitOps.cpp
@@ -119,7 +119,7 @@ WarpX::ApplyMagneticFieldBCs()
 }
 
 void
-WarpX::SpectralSourceFreeFieldAdvance()
+WarpX::SpectralSourceFreeFieldAdvance ()
 {
     using namespace amrex::literals;
     using warpx::fields::FieldType;
@@ -151,9 +151,9 @@ WarpX::SpectralSourceFreeFieldAdvance()
 
     // Restore the current_fp MultiFab. Note that this is only needed for diagnostics when
     // J is being written out (since current_fp is not otherwise used).
-    amrex::MultiFab::Copy(*(current_fp[0]), j0, 0, 0, 1, current_fp[0]->nGrowVect());
-    amrex::MultiFab::Copy(*(current_fp[1]), j1, 0, 0, 1, current_fp[1]->nGrowVect());
-    amrex::MultiFab::Copy(*(current_fp[2]), j2, 0, 0, 1, current_fp[2]->nGrowVect());
+    amrex::MultiFab::Copy(*(current_fp[0]), j0, 0, 0, current_fp[0]->nComp(), current_fp[0]->nGrowVect());
+    amrex::MultiFab::Copy(*(current_fp[1]), j1, 0, 0, current_fp[1]->nComp(), current_fp[1]->nGrowVect());
+    amrex::MultiFab::Copy(*(current_fp[2]), j2, 0, 0, current_fp[2]->nComp(), current_fp[2]->nGrowVect());
 }
 
 void

diff --git a/Source/WarpX.H b/Source/WarpX.H
@@ -135,7 +135,7 @@ public:
     void UpdateMagneticFieldAndApplyBCs ( ablastr::fields::MultiLevelVectorField const&  a_Bn,
                                           amrex::Real  a_thetadt );
     void ApplyMagneticFieldBCs ();
-    void SpectralSourceFreeFieldAdvance();
+    void SpectralSourceFreeFieldAdvance ();
     void FinishMagneticFieldAndApplyBCs ( ablastr::fields::MultiLevelVectorField const&  a_Bn,
                                           amrex::Real  a_theta );
     void FinishImplicitField ( const ablastr::fields::MultiLevelVectorField&  Field_fp,