Merge branch 'AMReX-Fluids:development' into vof

AMReX-Fluids · Oct 2, 2024 · 3971e64 · 3971e64
2 parents c8e1cd3 + e8f071a
commit 3971e64
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 23 deletions.
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -8,8 +8,7 @@ concurrency:
 
 jobs:
  codespell:
- runs-on: ubuntu-latest
-
+ runs-on: ubuntu-22.04
  steps:
  - uses: actions/checkout@v4
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -7,7 +7,7 @@ concurrency:
 
 jobs:
  build-and-deploy:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
  steps:
  - name: Checkout
  uses: actions/checkout@v4

diff --git a/Docs/sphinx_documentation/source/InputsAlgorithm.rst b/Docs/sphinx_documentation/source/InputsAlgorithm.rst
@@ -28,6 +28,9 @@ The following inputs must be preceded by "incflo."
 +----------------------+-----------------------------------------------------------------------+-------------+--------------+
 | mu_s | scalar diffusivity | Real(s) | 0.0 |
 +----------------------+-----------------------------------------------------------------------+-------------+--------------+
+| use_cc_proj | Use cell-centered rather than nodal pressure; this changes the | bool | false |
+| | which approximate projection we use | | |
++----------------------+-----------------------------------------------------------------------+-------------+--------------+
 | use_tensor_solve | In velocity solve, use multicomponent :math:`\nabla \cdot \tau` | bool | true |
 | | otherwise use separate solves for each velocity component | | |
 +----------------------+-----------------------------------------------------------------------+-------------+--------------+

diff --git a/src/incflo.H b/src/incflo.H
@@ -281,23 +281,31 @@ public:
  //
  ///////////////////////////////////////////////////////////////////////////
 
- void ApplyProjection( amrex::Vector<amrex::MultiFab const*> const& density,
- AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
- amrex::Vector<amrex::MultiFab*> const& v_mac,
- amrex::Vector<amrex::MultiFab*> const& w_mac),
- amrex::Real time, amrex::Real scaling_factor, bool incremental);
- void ApplyNodalProjection(amrex::Vector<amrex::MultiFab const*> density,
- amrex::Real time, amrex::Real scaling_factor, bool incremental);
- void ApplyNodalProjection(amrex::Vector<amrex::MultiFab const*> const& density,
- amrex::Vector<amrex::MultiFab *> vel,
- amrex::Vector<amrex::MultiFab *> const& divu_Source,
- amrex::Real time, amrex::Real scaling_factor, bool incremental,
- bool set_inflow_bc);
- void ApplyCCProjection(amrex::Vector<amrex::MultiFab const*> density,
- AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
- amrex::Vector<amrex::MultiFab*> const& v_mac,
- amrex::Vector<amrex::MultiFab*> const& w_mac),
- amrex::Real time, amrex::Real scaling_factor, bool incremental);
+ void ApplyProjection ( amrex::Vector<amrex::MultiFab const*> const& density,
+ AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
+ amrex::Vector<amrex::MultiFab*> const& v_mac,
+ amrex::Vector<amrex::MultiFab*> const& w_mac),
+ amrex::Real time, amrex::Real scaling_factor, bool incremental);
+
+ void ApplyProjection (amrex::Vector<amrex::MultiFab const*> const& density,
+ amrex::Vector<amrex::MultiFab *> const& vel,
+ amrex::Vector<amrex::MultiFab *> const& divu_Source,
+ amrex::Real time, amrex::Real scaling_factor, bool incremental,
+ bool set_inflow_bc);
+
+ void ApplyNodalProjection (amrex::Vector<amrex::MultiFab const*> density,
+ amrex::Real time, amrex::Real scaling_factor, bool incremental);
+ void ApplyNodalProjection (amrex::Vector<amrex::MultiFab const*> const& density,
+ amrex::Vector<amrex::MultiFab *> vel,
+ amrex::Vector<amrex::MultiFab *> const& divu_Source,
+ amrex::Real time, amrex::Real scaling_factor, bool incremental,
+ bool set_inflow_bc);
+
+ void ApplyCCProjection (amrex::Vector<amrex::MultiFab const*> density,
+ AMREX_D_DECL(amrex::Vector<amrex::MultiFab*> const& u_mac,
+ amrex::Vector<amrex::MultiFab*> const& v_mac,
+ amrex::Vector<amrex::MultiFab*> const& w_mac),
+ amrex::Real time, amrex::Real scaling_factor, bool incremental);
 
  ///////////////////////////////////////////////////////////////////////////
  //

diff --git a/src/incflo.cpp b/src/incflo.cpp
@@ -217,7 +217,22 @@ incflo::ApplyProjection (Vector<MultiFab const*> const& density,
  time,scaling_factor,incremental);
  }
  else
+ {
  ApplyNodalProjection(density,time,scaling_factor,incremental);
+ }
+}
+
+void
+incflo::ApplyProjection (Vector<MultiFab const*> const& density,
+ Vector<MultiFab *> const& vel,
+ Vector<MultiFab *> const& divu_Source,
+ Real time, Real scaling_factor, bool incremental,
+ bool set_inflow_bc)
+{
+ AMREX_ALWAYS_ASSERT("This is not yet coded for ccproj!");
+
+ ApplyNodalProjection(density, vel, divu_Source, time, scaling_factor,
+ incremental, set_inflow_bc);
 }
 
 // Make a new level from scratch using provided BoxArray and DistributionMapping.

diff --git a/src/setup/init.cpp b/src/setup/init.cpp
@@ -476,9 +476,10 @@ void incflo::InitialPressureProjection()
  // Always zero this here
  Vector<MultiFab*> Source(finest_level+1, nullptr);
 
- ApplyProjection(get_density_new_const(),
- AMREX_D_DECL(GetVecOfPtrs(u_mac_tmp), GetVecOfPtrs(v_mac_tmp),
- GetVecOfPtrs(w_mac_tmp)),m_cur_time,dummy_dt,false);
+ // FIXME FIXME FIXME - THIS ONLY WORKS RIGHT FOR NODAL PROJ
+ ApplyProjection(get_density_new_const(), GetVecOfPtrs(vel), Source,
+ m_cur_time, dummy_dt, false /*incremental*/,
+ true /*set_inflow_bc*/);
 }
 
 #ifdef AMREX_USE_EB