Some comments; method split is probably unnecessary.

lindsayad · Dec 5, 2017 · 85c5c23 · 85c5c23
1 parent c90c22f
commit 85c5c23
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/framework/include/base/FEProblemBase.h b/framework/include/base/FEProblemBase.h
@@ -825,9 +825,9 @@ class FEProblemBase : public SubProblem, public Restartable
   bool execMultiApps(ExecFlagType type, bool auto_advance = true);
 
   /**
-   * Advance the MultiApps associated with the ExecFlagType
+   * Advance the MultiApps t_step associated with the ExecFlagType
    */
-  void advanceMultiApps(ExecFlagType type);
+  void incrementMultiAppTStep(ExecFlagType type);
 
   /**
    * Backup the MultiApps associated with the ExecFlagType

diff --git a/framework/include/multiapps/FullSolveMultiApp.h b/framework/include/multiapps/FullSolveMultiApp.h
@@ -37,7 +37,9 @@ class FullSolveMultiApp : public MultiApp
 
   virtual bool solveStep(Real dt, Real target_time, bool auto_advance = true) override;
 
-  virtual void advanceStep() override {}
+  virtual void incrementTStep() override {}
+
+  virtual void finishStep() override {}
 
   virtual bool isSolved() const override { return _solved; }
 

diff --git a/framework/include/multiapps/MultiApp.h b/framework/include/multiapps/MultiApp.h
@@ -95,13 +95,11 @@ class MultiApp : public MooseObject, public SetupInterface, public Restartable
    */
   virtual bool solveStep(Real dt, Real target_time, bool auto_advance = true) = 0;
 
-  /**
-   * Actually advances time and causes output.
-   *
-   * If auto_advance=true was used in solveStep() then this function
-   * will do nothing.
-   */
-  virtual void advanceStep() = 0;
+  /// Advances the time step (not the time if you can believe it)
+  virtual void incrementTStep() = 0;
+
+  /// Creates output
+  virtual void finishStep() = 0;
 
   /**
    * Save off the state of every Sub App

diff --git a/framework/include/multiapps/TransientMultiApp.h b/framework/include/multiapps/TransientMultiApp.h
@@ -40,7 +40,9 @@ class TransientMultiApp : public MultiApp
 
   virtual bool solveStep(Real dt, Real target_time, bool auto_advance = true) override;
 
-  virtual void advanceStep() override;
+  virtual void incrementTStep() override;
+
+  virtual void finishStep() override;
 
   virtual bool needsRestoration() override;
 

diff --git a/framework/src/base/FEProblemBase.C b/framework/src/base/FEProblemBase.C
@@ -3271,21 +3271,21 @@ FEProblemBase::postExecute()
 }
 
 void
-FEProblemBase::advanceMultiApps(ExecFlagType type)
+FEProblemBase::incrementMultiAppTStep(ExecFlagType type)
 {
   const auto & multi_apps = _multi_apps[type].getActiveObjects();
 
   if (multi_apps.size())
   {
-    _console << COLOR_CYAN << "\nAdvancing MultiApps" << COLOR_DEFAULT << std::endl;
+    _console << COLOR_CYAN << "\nAdvancing MultiApps t_step" << COLOR_DEFAULT << std::endl;
 
     for (const auto & multi_app : multi_apps)
-      multi_app->advanceStep();
+      multi_app->incrementTStep();
 
     _console << "Waiting For Other Processors To Finish" << std::endl;
     MooseUtils::parallelBarrierNotify(_communicator, _parallel_barrier_messaging);
 
-    _console << COLOR_CYAN << "Finished Advancing MultiApps\n" << COLOR_DEFAULT << std::endl;
+    _console << COLOR_CYAN << "Finished Advancing MultiApps t_step\n" << COLOR_DEFAULT << std::endl;
   }
 }
 

diff --git a/framework/src/executioners/Transient.C b/framework/src/executioners/Transient.C
@@ -369,8 +369,8 @@ Transient::incrementStepOrReject()
 
       _problem.advanceState();
 
-      _problem.advanceMultiApps(EXEC_TIMESTEP_BEGIN);
-      _problem.advanceMultiApps(EXEC_TIMESTEP_END);
+      _problem.incrementMultiAppTStep(EXEC_TIMESTEP_BEGIN);
+      _problem.incrementMultiAppTStep(EXEC_TIMESTEP_END);
     }
   }
   else

diff --git a/framework/src/multiapps/TransientMultiApp.C b/framework/src/multiapps/TransientMultiApp.C
@@ -391,8 +391,8 @@ TransientMultiApp::solveStep(Real dt, Real target_time, bool auto_advance)
               if (!caught_up)
                 throw MultiAppSolveFailure(name() + " Failed to catch up!\n");
             }
-          }
-        }
+          } // if (!ex->lastSolveConverged())
+        }   // if (auto_advance)
         else if (!ex->lastSolveConverged())
           throw MultiAppSolveFailure(name() + " failed to converge");
       }
@@ -418,22 +418,36 @@ TransientMultiApp::solveStep(Real dt, Real target_time, bool auto_advance)
 }
 
 void
-TransientMultiApp::advanceStep()
+TransientMultiApp::incrementTStep()
 {
   if (!_sub_cycling)
   {
     for (unsigned int i = 0; i < _my_num_apps; i++)
     {
       /*FEProblemBase * problem =*/appProblemBase(_first_local_app + i);
       Transient * ex = _transient_executioners[i];
-
       ex->endStep();
       ex->postStep();
       ex->incrementStepOrReject();
     }
   }
 }
 
+void
+TransientMultiApp::finishStep()
+{
+  if (!_sub_cycling)
+  {
+    for (unsigned int i = 0; i < _my_num_apps; i++)
+    {
+      /*FEProblemBase * problem =*/appProblemBase(_first_local_app + i);
+      Transient * ex = _transient_executioners[i];
+      ex->endStep();
+      ex->postStep();
+    }
+  }
+}
+
 bool
 TransientMultiApp::needsRestoration()
 {