Field Boundary refactor

amr-wind/CFDSim.H

@@ -6,10 +6,11 @@
 #include "amr-wind/core/FieldRepo.H"
 #include "amr-wind/equation_systems/PDEBase.H"
 #include "amr-wind/core/Physics.H"
+#include "amr-wind/boundary_conditions/field_boundary_fill/FieldBoundary.H"
 #include "amr-wind/core/MeshMap.H"
 #include "amr-wind/helics.H"
 
-#include "amr-wind/wind_energy/ABLReadERFFunction.H"
+#include "amr-wind/boundary_conditions/field_boundary_fill/ReadERFFunction.H"
 class MultiBlockContainer;
 
 /** AMR-Wind
@@ -87,6 +88,21 @@ public:
         return m_physics_mgr.objects();
     }
 
+    FieldBoundaryMgr& field_boundary_manager() { return m_field_boundary_mgr; }
+    const FieldBoundaryMgr& field_boundary_manager() const
+    {
+        return m_field_boundary_mgr;
+    }
+
+    FieldBoundaryMgr::TypeVector& field_boundaries()
+    {
+        return m_field_boundary_mgr.objects();
+    }
+    const FieldBoundaryMgr::TypeVector& field_boundaries() const
+    {
+        return m_field_boundary_mgr.objects();
+    }
+
     transport::TransportModel& transport_model() { return *m_transport; }
     const transport::TransportModel& transport_model() const
     {
@@ -131,6 +147,9 @@ public:
     //! Instantiate all physics instances based on user inputs
     void init_physics();
 
+    //! Instantiate all field boundaries based on user inputs
+    void init_field_boundaries();
+
     //! Activate overset connectivity
     void activate_overset();
 
@@ -159,6 +178,8 @@ private:
 
     PhysicsMgr m_physics_mgr;
 
+    FieldBoundaryMgr m_field_boundary_mgr;
+
     std::unique_ptr<transport::TransportModel> m_transport;
 
     std::unique_ptr<turbulence::TurbulenceModel> m_turbulence;

amr-wind/CFDSim.cpp

@@ -64,6 +64,17 @@ void CFDSim::init_physics()
     }
 }
 
+void CFDSim::init_field_boundaries()
+{
+    amrex::ParmParse pp("incflo");
+    amrex::Vector<std::string> fb_names;
+    pp.queryarr("field_boundaries", fb_names);
+
+    for (const auto& fb : fb_names) {
+        m_field_boundary_mgr.create(fb, *this);
+    }
+}
+
 void CFDSim::activate_overset()
 {
     amrex::ParmParse pp("overset");

amr-wind/boundary_conditions/CMakeLists.txt

@@ -8,3 +8,4 @@ target_sources(${amr_wind_lib_name}
    )
 
 add_subdirectory(wall_models)
+add_subdirectory(field_boundary_fill)

amr-wind/wind_energy/ABLBoundaryPlane.H → amr-wind/boundary_conditions/field_boundary_fill/BoundaryPlane.H

@@ -1,12 +1,12 @@
-#ifndef ABLBOUNDARYPLANE_H
-#define ABLBOUNDARYPLANE_H
+#ifndef BOUNDARYPLANE_H
+#define BOUNDARYPLANE_H
 
 #include <cstdint>
 #include "amr-wind/core/Field.H"
 #include "amr-wind/CFDSim.H"
 #include "amr-wind/utilities/ncutils/nc_interface.H"
 #include "amr-wind/utilities/io_utils.H"
-#include "amr-wind/wind_energy/ABLReadERFFunction.H"
+#include "amr-wind/boundary_conditions/field_boundary_fill/ReadERFFunction.H"
 #include "AMReX_Gpu.H"
 #include "AMReX_BndryRegister.H"
 #include "AMReX_REAL.H"
@@ -111,23 +111,36 @@ private:
  *  This class performs the necessary file operations to read and
  *  write boundary planes.
  *
- *  \sa ABLFillInflow
+ *  \sa PlaneFillInflow
  */
-class ABLBoundaryPlane
+class BoundaryPlane : public amr_wind::FieldBoundary::Register<BoundaryPlane>
 {
     static_assert(AMREX_SPACEDIM == 3, "ABL requires 3 dimensional mesh");
 
 public:
-    explicit ABLBoundaryPlane(CFDSim& /*sim*/);
+    static std::string identifier() { return "BoundaryPlane"; }
 
-    //! Execute initialization actions after mesh has been fully generated
-    void post_init_actions();
+    explicit BoundaryPlane(CFDSim& /*sim*/);
 
-    void pre_advance_work();
+    void post_init_actions() override;
 
-    void pre_predictor_work();
+    void pre_advance_work() override;
 
-    void post_advance_work();
+    void post_advance_work() override;
+
+    void pre_predictor_work() override;
+
+    void set_velocity(
+        int lev,
+        amrex::Real time,
+        const Field& fld,
+        amrex::MultiFab& mfab,
+        int dcomp = 0,
+        int orig_comp = 0) const override;
+
+    // Non-inherited public methods
+
+    void pre_advance_inner_calls();
 
     void initialize_data();
 
@@ -147,7 +160,7 @@ public:
     void populate_data(
         int /*lev*/,
         amrex::Real /*time*/,
-        Field& /*fld*/,
+        const Field& /*fld*/,
         amrex::MultiFab& /*mfab*/,
         int dcomp = 0,
         int orig_comp = 0) const;
@@ -163,8 +176,6 @@ public:
         amrex::Gpu::ManagedVector<amrex::Real>& /*buffer*/);
 #endif
 
-    [[nodiscard]] bool is_initialized() const { return m_is_initialized; }
-
     [[nodiscard]] bool box_intersects_boundary(
         const amrex::Box& /*bx*/,
         int /*lev*/,
@@ -252,8 +263,9 @@ private:
     //! IO mode
     io_mode m_io_mode{io_mode::undefined};
 
-    //! Flag indicating if this capability is available
-    bool m_is_initialized{false};
+    //! Flag indicating if the simulation is overset -- needed for complicated
+    //! timing of pre_advance_work
+    bool m_has_overset{false};
 
     //! controls extents on native bndry output
     const int m_in_rad = 1;
@@ -266,4 +278,4 @@ private:
 
 } // namespace amr_wind
 
-#endif /* ABLBOUNDARYPLANE_H */
+#endif /* BOUNDARYPLANE_H */