diff --git a/framework/include/timeintegrators/LinearTimeIntegratorInterface.h b/framework/include/timeintegrators/LinearTimeIntegratorInterface.h index 0f85e742ec44..376c65d95b0d 100644 --- a/framework/include/timeintegrators/LinearTimeIntegratorInterface.h +++ b/framework/include/timeintegrators/LinearTimeIntegratorInterface.h @@ -47,9 +47,6 @@ class LinearTimeIntegratorInterface /// Pointer to the linear system, can happen that we dont have any LinearSystem * _linear_system; - /// Boolean to check if it integrates a linear system - const bool _integrates_linear_system; - /// Nonlinear implicit system, if applicable; otherwise, nullptr libMesh::LinearImplicitSystem * _linear_implicit_system; }; diff --git a/framework/include/timeintegrators/NonlinearTimeIntegratorInterface.h b/framework/include/timeintegrators/NonlinearTimeIntegratorInterface.h index 1430586ef497..9bc56bb7fd1d 100644 --- a/framework/include/timeintegrators/NonlinearTimeIntegratorInterface.h +++ b/framework/include/timeintegrators/NonlinearTimeIntegratorInterface.h @@ -73,9 +73,6 @@ class NonlinearTimeIntegratorInterface /// Pointer to the nonlinear system, can happen that we dont have any NonlinearSystemBase * _nl; - /// Boolean to check if this integrator belongs to a nonlinear system - const bool _integrates_nl; - /// libMesh nonlinear implicit system, if applicable; otherwise, nullptr libMesh::NonlinearImplicitSystem * _nonlinear_implicit_system; diff --git a/framework/src/timeintegrators/CrankNicolson.C b/framework/src/timeintegrators/CrankNicolson.C index c2dd27896aab..64ee40182eb7 100644 --- a/framework/src/timeintegrators/CrankNicolson.C +++ b/framework/src/timeintegrators/CrankNicolson.C @@ -78,7 +78,7 @@ CrankNicolson::init() u_dot.zero(); computeDuDotDu(); - if (_integrates_nl) + if (_nl) { // compute residual for the initial time step // Note: we can not directly pass _residual_old in computeResidualTag because diff --git a/framework/src/timeintegrators/LinearTimeIntegratorInterface.C b/framework/src/timeintegrators/LinearTimeIntegratorInterface.C index c9344dd2986b..da94a504837e 100644 --- a/framework/src/timeintegrators/LinearTimeIntegratorInterface.C +++ b/framework/src/timeintegrators/LinearTimeIntegratorInterface.C @@ -15,7 +15,6 @@ LinearTimeIntegratorInterface::LinearTimeIntegratorInterface(SystemBase & system) : _linear_system(dynamic_cast(&system)), - _integrates_linear_system(_linear_system), _linear_implicit_system( _linear_system ? dynamic_cast(&_linear_system->system()) : nullptr) { diff --git a/framework/src/timeintegrators/NonlinearTimeIntegratorInterface.C b/framework/src/timeintegrators/NonlinearTimeIntegratorInterface.C index ad74656ecd61..7784e6c98df2 100644 --- a/framework/src/timeintegrators/NonlinearTimeIntegratorInterface.C +++ b/framework/src/timeintegrators/NonlinearTimeIntegratorInterface.C @@ -18,11 +18,10 @@ NonlinearTimeIntegratorInterface::NonlinearTimeIntegratorInterface(FEProblemBase & problem, SystemBase & system) : _nl(dynamic_cast(&system)), - _integrates_nl(_nl), - _nonlinear_implicit_system( - _integrates_nl ? dynamic_cast(&_nl->system()) : nullptr), - _Re_time(_integrates_nl ? &_nl->getResidualTimeVector() : nullptr), - _Re_non_time(_integrates_nl ? &_nl->getResidualNonTimeVector() : nullptr), + _nonlinear_implicit_system(_nl ? dynamic_cast(&_nl->system()) + : nullptr), + _Re_time(_nl ? &_nl->getResidualTimeVector() : nullptr), + _Re_non_time(_nl ? &_nl->getResidualNonTimeVector() : nullptr), _u_dot_factor_tag(problem.addVectorTag("u_dot_factor", Moose::VECTOR_TAG_SOLUTION)), _u_dotdot_factor_tag(problem.addVectorTag("u_dotdot_factor", Moose::VECTOR_TAG_SOLUTION)) { @@ -33,7 +32,7 @@ NonlinearTimeIntegratorInterface::addVector(const std::string & name, const bool project, const libMesh::ParallelType type) { - if (_integrates_nl) + if (_nl) return &_nl->addVector(name, project, type); else return nullptr;