minor clean-ups

Signed-off-by: roelof-groenewald <[email protected]>
roelof-groenewald · Sep 12, 2024 · 81bfa54 · 81bfa54
1 parent f71dd7a
commit 81bfa54
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/Source/FieldSolver/ElectrostaticSolvers/LabFrameExplicitES.H b/Source/FieldSolver/ElectrostaticSolvers/LabFrameExplicitES.H
@@ -6,8 +6,8 @@
  *
  * License: BSD-3-Clause-LBNL
  */
-#ifndef WARPX_LABFRAME_EXPLICITES_H_
-#define WARPX_LABFRAME_EXPLICITES_H_
+#ifndef WARPX_LABFRAMEEXPLICITES_H_
+#define WARPX_LABFRAMEEXPLICITES_H_
 
 #include "ElectrostaticSolver.H"
 
@@ -41,4 +41,4 @@ public:
 
 };
 
-#endif
+#endif  // WARPX_LABFRAMEEXPLICITES_H_
diff --git a/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.H b/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.H
@@ -1,6 +1,14 @@
 
-#ifndef WARPX_RELATIVISTICEXPLICITSOLVERES_H_
-#define WARPX_RELATIVISTICEXPLICITSOLVERES_H_
+/* Copyright 2024 The WarpX Community
+ *
+ * This file is part of WarpX.
+ *
+ * Authors: Remi Lehe, Roelof Groenewald, Arianna Formenti, Revathi Jambunathan
+ *
+ * License: BSD-3-Clause-LBNL
+ */
+#ifndef WARPX_RELATIVISTICEXPLICITES_H_
+#define WARPX_RELATIVISTICEXPLICITES_H_
 
 #include "ElectrostaticSolver.H"
 #include "Particles/WarpXParticleContainer.H"
@@ -75,4 +83,4 @@ public:
     );
 };
 
-#endif // WARPX_RELATIVISTICEXPLICITSOLVERES_H_
+#endif // WARPX_RELATIVISTICEXPLICITES_H_
diff --git a/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.cpp b/Source/FieldSolver/ElectrostaticSolvers/RelativisticExplicitES.cpp
@@ -1,3 +1,11 @@
+/* Copyright 2024 The WarpX Community
+ *
+ * This file is part of WarpX.
+ *
+ * Authors: Remi Lehe, Roelof Groenewald, Arianna Formenti, Revathi Jambunathan
+ *
+ * License: BSD-3-Clause-LBNL
+ */
 #include "WarpX.H"
 
 #include "RelativisticExplicitES.H"

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
@@ -2106,10 +2106,7 @@ WarpX::ClearLevel (int lev)
         current_buf[lev][i].reset();
     }
 
-    if (WarpX::electrostatic_solver_id != ElectrostaticSolverAlgo::None)
-    {
-        m_electrostatic_solver->ClearLevel(lev);
-    }
+    m_electrostatic_solver->ClearLevel(lev);
 
     if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::HybridPIC)
     {
@@ -2377,10 +2374,7 @@ WarpX::AllocLevelMFs (int lev, const BoxArray& ba, const DistributionMapping& dm
     }
 
     // Allocate extra multifabs needed by the electrostatic algorithm.
-    if (WarpX::electrostatic_solver_id != ElectrostaticSolverAlgo::None)
-    {
-        m_electrostatic_solver->AllocateLevelMFs();
-    }
+    m_electrostatic_solver->AllocateLevelMFs();
 
     // Allocate extra multifabs needed by the kinetic-fluid hybrid algorithm.
     if (WarpX::electromagnetic_solver_id == ElectromagneticSolverAlgo::HybridPIC)