Multiphase dev - FY24 Q2 milestone

amr-wind/equation_systems/vof/vof_advection.H

@@ -23,8 +23,6 @@ struct AdvectionOp<VOF, fvm::Godunov>
     {
         amrex::ParmParse pp_multiphase("VOF");
         pp_multiphase.query("remove_debris", m_rm_debris);
-        pp_multiphase.query("sharpen_acq_field", m_sharpen_acq);
-        pp_multiphase.query("sharpen_dest_field", m_sharpen_dest);
         pp_multiphase.query("replace_masked", m_replace_mask);
 
         // Setup density factor arrays for multiplying velocity flux
@@ -37,9 +35,7 @@ struct AdvectionOp<VOF, fvm::Godunov>
         const FieldState /*unused*/,
         const amrex::Real /*unused*/,
         const amrex::Real /*unused*/)
-    {
-        // Would be best to sharpen old vof and update old density here
-    }
+    {}
 
     void operator()(const FieldState /*unused*/, const amrex::Real dt)
     {
@@ -60,19 +56,6 @@ struct AdvectionOp<VOF, fvm::Godunov>
         // Working state of vof is nph, to keep others untouched during step
         auto& dof_field = fields.field.state(amr_wind::FieldState::NPH);
 
-        // Sharpen starting vof field if hybrid solver is being used
-        if (repo.int_field_exists("iblank_cell") && m_sharpen_acq) {
-            auto& f_iblank = repo.get_int_field("iblank_cell");
-            amr_wind::multiphase::sharpen_acquired_vof(
-                nlevels, f_iblank, dof_old);
-        }
-        // Sharpen future vof field if hybrid solver is being used
-        if (repo.int_field_exists("iblank_cell") && m_sharpen_dest) {
-            auto& f_iblank = repo.get_int_field("iblank_cell");
-            amr_wind::multiphase::sharpen_acquired_vof(
-                nlevels, f_iblank, dof_new);
-        }
-
         // Initialize as old state values
         for (int lev = 0; lev < repo.num_active_levels(); ++lev) {
             amrex::MultiFab::Copy(
@@ -148,8 +131,6 @@ struct AdvectionOp<VOF, fvm::Godunov>
     Field& w_mac;
     int isweep = 0;
     bool m_rm_debris{true};
-    bool m_sharpen_acq{false};
-    bool m_sharpen_dest{false};
     bool m_replace_mask{true};
     // Lagrangian transport is deprecated, only Eulerian is supported
 };

amr-wind/equation_systems/vof/vof_hybridsolver_ops.H

@@ -7,44 +7,6 @@
 
 namespace amr_wind::multiphase {
 
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE amrex::Real sharpen_kernel(
-    int i,
-    int j,
-    int k,
-    amrex::Array4<amrex::Real const> const& volfrac) noexcept
-{
-    return std::max(
-        0.0,
-        std::min(
-            1.0,
-            0.5 + (volfrac(i, j, k) < 0.5 ? -1.0 : 1.0) *
-                      std::pow(std::abs(volfrac(i, j, k) - 0.5), 1.0 / 3.0)));
-}
-
-static void sharpen_acquired_vof(
-    const int nlevels, amr_wind::IntField& f_iblank, amr_wind::Field& f_vof)
-{
-    // Sharpen data from nalu-wind (in iblank regions)
-    for (int lev = 0; lev < nlevels; ++lev) {
-        auto& iblank = f_iblank(lev);
-        auto& vof = f_vof(lev);
-
-        for (amrex::MFIter mfi(iblank); mfi.isValid(); ++mfi) {
-            const auto& gbx = mfi.growntilebox();
-            const amrex::Array4<const int>& native_flag =
-                iblank.const_array(mfi);
-            const amrex::Array4<amrex::Real>& volfrac = vof.array(mfi);
-            amrex::ParallelFor(
-                gbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept {
-                    // In iblanked regions, sharpen VOF and limit it
-                    volfrac(i, j, k) = (native_flag(i, j, k) > 0)
-                                           ? volfrac(i, j, k)
-                                           : sharpen_kernel(i, j, k, volfrac);
-                });
-        }
-    }
-}
-
 static void replace_masked_vof(
     const int nlevels,
     amr_wind::IntField& f_iblank,

amr-wind/equation_systems/vof/vof_ops.H

@@ -73,10 +73,6 @@ struct PostSolveOp<VOF>
         m_fields.field.fillpatch(m_sim.time().current_time());
         auto& multiphase = m_sim.physics_manager().get<MultiPhase>();
         multiphase.set_density_via_vof();
-        // Do this for old state too if modified by vof sharpening
-        if (m_sim.repo().int_field_exists("iblank_cell")) {
-            multiphase.set_density_via_vof(amr_wind::FieldState::Old);
-        }
 
         // Calculate n+1/2 density
         multiphase.set_nph_density();