a fix for time integrator: associate vectors with tags early because …

…kernels may be using the tags idaholab#17586
aeslaughter · Jun 2, 2021 · d6ea207 · d6ea207
1 parent 9e361da
commit d6ea207
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/framework/include/timeintegrators/TimeIntegrator.h b/framework/include/timeintegrators/TimeIntegrator.h
@@ -67,7 +67,7 @@ class TimeIntegrator : public MooseObject, public Restartable
    */
   virtual void init() {}
   virtual void preSolve() {}
-  virtual void preStep();
+  virtual void preStep() {}
 
   /**
    * Solves the time step and sets the number of nonlinear and linear iterations.

diff --git a/framework/src/problems/FEProblemBase.C b/framework/src/problems/FEProblemBase.C
@@ -5337,6 +5337,13 @@ FEProblemBase::addTimeIntegrator(const std::string & type,
   // integrator
   _aux->addDotVectors();
   _nl->addDotVectors();
+
+  auto tag_udot = _nl->getTimeIntegrator()->uDotFactorTag();
+  if (!_nl->hasVector(tag_udot))
+    _nl->associateVectorToTag(*_nl->solutionUDot(), tag_udot);
+  auto tag_udotdot = _nl->getTimeIntegrator()->uDotDotFactorTag();
+  if (!_nl->hasVector(tag_udotdot) && uDotDotRequested())
+    _nl->associateVectorToTag(*_nl->solutionUDotDot(), tag_udotdot);
 }
 
 void

diff --git a/framework/src/timeintegrators/CentralDifference.C b/framework/src/timeintegrators/CentralDifference.C
@@ -60,7 +60,9 @@ CentralDifference::initialSetup()
   ActuallyExplicitEuler::initialSetup();
 
   // _nl here so that we don't create this vector in the aux system time integrator
+  _nl.disassociateVectorFromTag(*_nl.solutionUDot(), _u_dot_factor_tag);
   _nl.addVector(_u_dot_factor_tag, true, GHOSTED);
+  _nl.disassociateVectorFromTag(*_nl.solutionUDotDot(), _u_dotdot_factor_tag);
   _nl.addVector(_u_dotdot_factor_tag, true, GHOSTED);
 }
 

diff --git a/framework/src/timeintegrators/TimeIntegrator.C b/framework/src/timeintegrators/TimeIntegrator.C
@@ -50,16 +50,6 @@ TimeIntegrator::TimeIntegrator(const InputParameters & parameters)
   _fe_problem.setUDotRequested(true);
 }
 
-void
-TimeIntegrator::preStep()
-{
-  // If nothing else (children TimeIntegrators) associated these tags, associate them now
-  if (!_nl.hasVector(_u_dot_factor_tag))
-    _nl.associateVectorToTag(*_nl.solutionUDot(), _u_dot_factor_tag);
-  if (!_nl.hasVector(_u_dotdot_factor_tag) && _fe_problem.uDotDotRequested())
-    _nl.associateVectorToTag(*_nl.solutionUDotDot(), _u_dotdot_factor_tag);
-}
-
 void
 TimeIntegrator::solve()
 {