Merge branch 'development' into add_use_real_bcs

erf-model · Jan 12, 2024 · bc5250e · bc5250e
2 parents 5aed7af + 7422c18
commit bc5250e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Exec/RegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow b/Exec/RegTests/ScalarAdvDiff/inputs_advdiffinflowoutflow
@@ -23,7 +23,7 @@ xlo.theta = 1.
 xlo.scalar = 0.
 
 # TIME STEP CONTROL
-erf.fixed_dt = 2.e-4
+erf.fixed_dt = 1.e-4
 erf.fixed_mri_dt_ratio = 4
 
 # DIAGNOSTICS & VERBOSITY

diff --git a/Source/Particles/ERFPC.H b/Source/Particles/ERFPC.H
@@ -131,6 +131,17 @@ class ERFPC : public amrex::ParticleContainer< ERFParticlesRealIdx::ncomps,
  m_advect_w_gravity = a_flag;
  }
 
+ /*! Uses midpoint method to advance particles using flow velocity. */
+ void AdvectWithFlow ( amrex::MultiFab*,
+ int,
+ amrex::Real,
+ const std::unique_ptr<amrex::MultiFab>& );
+
+ /*! Uses midpoint method to advance particles falling under gravity. */
+ void AdvectWithGravity ( int,
+ amrex::Real,
+ const std::unique_ptr<amrex::MultiFab>& );
+
  protected:
 
  bool m_advect_w_flow; /*!< advect with flow velocity */
@@ -147,17 +158,6 @@ class ERFPC : public amrex::ParticleContainer< ERFParticlesRealIdx::ncomps,
  /*! Default particle initialization */
  void initializeParticlesUniformDistribution (const std::unique_ptr<amrex::MultiFab>& a_ptr = nullptr);
 
- /*! Uses midpoint method to advance particles using flow velocity. */
- void AdvectWithFlow ( amrex::MultiFab*,
- int,
- amrex::Real,
- const std::unique_ptr<amrex::MultiFab>& );
-
- /*! Uses midpoint method to advance particles falling under gravity. */
- void AdvectWithGravity ( int,
- amrex::Real,
- const std::unique_ptr<amrex::MultiFab>& );
-
  private:
 
  /*! Default particle initialization */