Removed the replicate functions advance_nonlinear() and ApplyPredicto…

…rNonLinear(), and moved their functionality into advance() and ApplyPredictor()
Exawind · Sep 30, 2024 · 5ae6bcd · 5ae6bcd
1 parent f9f0681
commit 5ae6bcd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 295 deletions.
diff --git a/amr-wind/incflo.H b/amr-wind/incflo.H
@@ -98,8 +98,7 @@ public:
     void pre_advance_stage2();
     void do_advance(int inonlin);
     void post_overset_work();
-    void advance();
-    void advance_nonlinear();
+    void advance(int inonlin);
     void prescribe_advance();
     void post_advance_work();
 
@@ -135,8 +134,7 @@ public:
     void ComputeDt(bool explicit_diffusion);
     void ComputePrescribeDt();
 
-    void ApplyPredictor(bool incremental_projection = false);
-    void ApplyPredictorNonLinear(bool incremental_projection = false);
+    void ApplyPredictor(bool incremental_projection = false, int inonlin = 0);
     void ApplyCorrector();
     void ApplyPrescribeStep();
 

diff --git a/amr-wind/incflo.cpp b/amr-wind/incflo.cpp
@@ -318,14 +318,9 @@ void incflo::do_advance(int inonlin)
     if (m_prescribe_vel && inonlin == 0) {
         prescribe_advance();
     } else {
-        amrex::Print() << "INONLIN " << inonlin << std::endl;
-        if (inonlin == 0) {
-            advance();
-        } else {
-            amrex::Print() << "Iteration " << inonlin
-                           << " in advection iteration loop" << std::endl;
-            advance_nonlinear();
-        }
+        amrex::Print() << "Iteration " << inonlin
+                       << " in advection iteration loop" << std::endl;
+        advance(inonlin);
     }
     if (m_sim.has_overset()) {
         m_ovst_ops.post_advance_work();