isAnyThermal as static fctn is warpx class, instead of particle bound…

…aries struct
RevathiJambunathan · Mar 20, 2024 · 93f8ae6 · 93f8ae6
1 parent 624da25
commit 93f8ae6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/Source/BoundaryConditions/WarpXFieldBoundaries.cpp b/Source/BoundaryConditions/WarpXFieldBoundaries.cpp
@@ -106,7 +106,8 @@ void WarpX::ApplyBfieldBoundary (const int lev, PatchType patch_type, DtType a_d
 void WarpX::ApplyRhofieldBoundary (const int lev, MultiFab* rho,
                                    PatchType patch_type)
 {
-    if (PEC::isAnyParticleBoundaryReflecting() || PEC::isAnyBoundaryPEC()) {
+    if (PEC::isAnyParticleBoundaryReflecting() || WarpX::isAnyParticleBoundaryThermal() || PEC::isAnyBoundaryPEC())
+    {
         PEC::ApplyReflectiveBoundarytoRhofield(rho, lev, patch_type);
     }
 }
@@ -115,7 +116,8 @@ void WarpX::ApplyJfieldBoundary (const int lev, amrex::MultiFab* Jx,
                                  amrex::MultiFab* Jy, amrex::MultiFab* Jz,
                                  PatchType patch_type)
 {
-    if (PEC::isAnyParticleBoundaryReflecting() || PEC::isAnyBoundaryPEC()) {
+    if (PEC::isAnyParticleBoundaryReflecting() || WarpX::isAnyParticleBoundaryThermal() || PEC::isAnyBoundaryPEC())
+    {
         PEC::ApplyReflectiveBoundarytoJfield(Jx, Jy, Jz, lev, patch_type);
     }
 }

diff --git a/Source/Particles/ParticleBoundaries.H b/Source/Particles/ParticleBoundaries.H
@@ -33,9 +33,6 @@ struct ParticleBoundaries
 
     void BuildReflectionModelParsers ();
 
-    /** True if any of the particle boundary condition type is Thermal */
-    bool isAnyParticleBoundaryThermal ();
-
     // reflection models for absorbing boundaries
     std::string reflection_model_xlo_str = "0.0";
     std::string reflection_model_xhi_str = "0.0";

diff --git a/Source/Particles/ParticleBoundaries.cpp b/Source/Particles/ParticleBoundaries.cpp
@@ -94,13 +94,3 @@ ParticleBoundaries::BuildReflectionModelParsers ()
         utils::parser::makeParser(reflection_model_zhi_str, {"v"}));
     data.reflection_model_zhi = reflection_model_zhi_parser->compile<1>();
 }
-
-bool
-ParticleBoundaries::isAnyParticleBoundaryThermal ()
-{
-    for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) {
-        if (WarpX::particle_boundary_lo[idim] == ParticleBoundaryType::Thermal) {return true;}
-        if (WarpX::particle_boundary_hi[idim] == ParticleBoundaryType::Thermal) {return true;}
-    }
-    return false;
-}
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp
@@ -446,10 +446,9 @@ PhysicalParticleContainer::PhysicalParticleContainer (AmrCore* amr_core, int isp
 
     // currently supports only isotropic thermal distribution
     // same distribution is applied to all boundaries
-    if (m_boundary_conditions.isAnyParticleBoundaryThermal()) {
+    if (WarpX::isAnyParticleBoundaryThermal()) {
         amrex::Real boundary_uth;
         utils::parser::getWithParser(pp_species_name,"boundary_uth",boundary_uth);
-        amrex::Print() << " thermal vel : " << boundary_uth << "\n";
         m_boundary_conditions.SetThermalVelocity(boundary_uth);
     }
 }

diff --git a/Source/WarpX.H b/Source/WarpX.H
@@ -753,6 +753,8 @@ public:
 
     void CopyJPML ();
     bool isAnyBoundaryPML();
+    /** True if any of the particle boundary condition type is Thermal */
+    static bool isAnyParticleBoundaryThermal();
 
     PML* GetPML (int lev);
 #if (defined WARPX_DIM_RZ) && (defined WARPX_USE_PSATD)

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
@@ -3281,6 +3281,16 @@ WarpX::isAnyBoundaryPML()
     return false;
 }
 
+bool
+WarpX::isAnyParticleBoundaryThermal ()
+{
+    for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) {
+        if (WarpX::particle_boundary_lo[idim] == ParticleBoundaryType::Thermal) {return true;}
+        if (WarpX::particle_boundary_hi[idim] == ParticleBoundaryType::Thermal) {return true;}
+    }
+    return false;
+}
+
 std::string
 TagWithLevelSuffix (std::string name, int const level)
 {