Avoid static casts

oanaoana · Dec 12, 2023 · c5a247f · c5a247f
1 parent 930813f
commit c5a247f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 31 deletions.
diff --git a/framework/include/variables/MooseVariableData.h b/framework/include/variables/MooseVariableData.h
@@ -152,7 +152,7 @@ class MooseVariableData : public MooseVariableDataBase<OutputType>
    */
   const MappedArrayVariablePhiGradient & arrayGradPhi() const
   {
-    mooseAssert(_var.fieldType() == Moose::VarFieldType::VAR_FIELD_ARRAY, "Not an array variable");
+    mooseAssert(var().fieldType() == Moose::VarFieldType::VAR_FIELD_ARRAY, "Not an array variable");
     return _mapped_grad_phi;
   }
 
@@ -166,7 +166,7 @@ class MooseVariableData : public MooseVariableDataBase<OutputType>
    */
   const MappedArrayVariablePhiGradient & arrayGradPhiFace() const
   {
-    mooseAssert(_var.fieldType() == Moose::VarFieldType::VAR_FIELD_ARRAY, "Not an array variable");
+    mooseAssert(var().fieldType() == Moose::VarFieldType::VAR_FIELD_ARRAY, "Not an array variable");
     return _mapped_grad_phi_face;
   }
 
@@ -665,7 +665,7 @@ class MooseVariableData : public MooseVariableDataBase<OutputType>
   /// A dummy ADReal variable
   ADReal _ad_real_dummy = 0;
 
-  using MooseVariableDataBase<OutputType>::_var;
+  using MooseVariableDataBase<OutputType>::var;
   using MooseVariableDataBase<OutputType>::_sys;
   using MooseVariableDataBase<OutputType>::_subproblem;
   using MooseVariableDataBase<OutputType>::_need_vector_tag_dof_u;

diff --git a/framework/include/variables/MooseVariableDataBase.h b/framework/include/variables/MooseVariableDataBase.h
@@ -140,6 +140,11 @@ class MooseVariableDataBase
   void prepareAux() { _has_dof_values = false; }
 
 protected:
+  /**
+   * @returns The variable to which the data in this class belongs to
+   */
+  virtual const MooseVariableField<OutputType> & var() const { return _var; }
+
   /**
    * insert a solution tag into our tag containers
    */
@@ -173,9 +178,6 @@ class MooseVariableDataBase
    */
   void resizeVectorTagData(TagID tag);
 
-  /// A const reference to the owning MooseVariableField object
-  const MooseVariableField<OutputType> & _var;
-
   /// The MOOSE system which ultimately holds the vectors and matrices relevant to this variable
   /// data
   SystemBase & _sys;
@@ -288,6 +290,10 @@ class MooseVariableDataBase
 
   /// The set of solution tags we need to evaluate
   std::set<TagID> _solution_tags;
+
+private:
+  /// A const reference to the owning MooseVariableField object
+  const MooseVariableField<OutputType> & _var;
 };
 
 template <>

diff --git a/framework/include/variables/MooseVariableDataFV.h b/framework/include/variables/MooseVariableDataFV.h
@@ -267,6 +267,9 @@ class MooseVariableDataFV : public MooseVariableDataBase<OutputType>, public Mes
 
   void meshChanged() override;
 
+protected:
+  virtual const MooseVariableFV<OutputType> & var() const override { return _var; }
+
 private:
   void initializeSolnVars();
 
@@ -282,6 +285,9 @@ class MooseVariableDataFV : public MooseVariableDataBase<OutputType>, public Mes
    */
   bool safeToComputeADUDot() const;
 
+  /// A const reference to the owning MooseVariableFV object
+  const MooseVariableFV<OutputType> & _var;
+
   const FEType & _fe_type;
 
   const unsigned int _var_num;
@@ -395,7 +401,6 @@ class MooseVariableDataFV : public MooseVariableDataBase<OutputType>, public Mes
   /// Cached warehouse query for FVFluxKernels
   TheWarehouse::QueryCache<> _fv_flux_kernel_query_cache;
 
-  using MooseVariableDataBase<OutputType>::_var;
   using MooseVariableDataBase<OutputType>::_sys;
   using MooseVariableDataBase<OutputType>::_subproblem;
   using MooseVariableDataBase<OutputType>::_need_vector_tag_dof_u;

diff --git a/framework/src/variables/MooseVariableData.C b/framework/src/variables/MooseVariableData.C
@@ -33,8 +33,8 @@ MooseVariableData<OutputType>::MooseVariableData(const MooseVariableField<Output
                                                  const Elem * const & elem)
 
   : MooseVariableDataBase<OutputType>(var, sys, tid),
-    _fe_type(_var.feType()),
-    _var_num(_var.number()),
+    _fe_type(var.feType()),
+    _var_num(var.number()),
     _assembly(_subproblem.assembly(_tid, var.kind() == Moose::VAR_NONLINEAR ? sys.number() : 0)),
     _element_type(element_type),
     _ad_zero(0),
@@ -1694,7 +1694,7 @@ MooseVariableData<OutputType>::nodalValueDot() const
   }
   else
     mooseError("Nodal values can be requested only on nodal variables, variable '",
-               _var.name(),
+               var().name(),
                "' is not nodal.");
 }
 
@@ -1717,7 +1717,7 @@ MooseVariableData<OutputType>::nodalValueDotDot() const
   }
   else
     mooseError("Nodal values can be requested only on nodal variables, variable '",
-               _var.name(),
+               var().name(),
                "' is not nodal.");
 }
 
@@ -1739,7 +1739,7 @@ MooseVariableData<OutputType>::nodalValueDotOld() const
   }
   else
     mooseError("Nodal values can be requested only on nodal variables, variable '",
-               _var.name(),
+               var().name(),
                "' is not nodal.");
 }
 
@@ -1762,7 +1762,7 @@ MooseVariableData<OutputType>::nodalValueDotDotOld() const
   }
   else
     mooseError("Nodal values can be requested only on nodal variables, variable '",
-               _var.name(),
+               var().name(),
                "' is not nodal.");
 }
 

diff --git a/framework/src/variables/MooseVariableDataBase.C b/framework/src/variables/MooseVariableDataBase.C
@@ -18,8 +18,7 @@ template <typename OutputType>
 MooseVariableDataBase<OutputType>::MooseVariableDataBase(const MooseVariableField<OutputType> & var,
                                                          SystemBase & sys,
                                                          THREAD_ID tid)
-  : _var(var),
-    _sys(sys),
+  : _sys(sys),
     _subproblem(_sys.subproblem()),
     _tid(tid),
     _dof_map(_sys.dofMap()),
@@ -43,7 +42,8 @@ MooseVariableDataBase<OutputType>::MooseVariableDataBase(const MooseVariableFiel
     _need_dof_values_dot_old(false),
     _need_dof_values_dotdot_old(false),
     _need_dof_du_dot_du(false),
-    _need_dof_du_dotdot_du(false)
+    _need_dof_du_dotdot_du(false),
+    _var(var)
 {
   auto num_vector_tags = _subproblem.numVectorTags();
   // Additional solution tags corresponding to older-than-current solution states may be requested
@@ -300,9 +300,8 @@ template <typename OutputType>
 const typename MooseVariableDataBase<OutputType>::FieldVariableValue &
 MooseVariableDataBase<OutputType>::sln(Moose::SolutionState state) const
 {
-  auto functor = [this](TagID tag_id) -> const FieldVariableValue & {
-    return vectorTagValue(tag_id);
-  };
+  auto functor = [this](TagID tag_id) -> const FieldVariableValue &
+  { return vectorTagValue(tag_id); };
 
   return const_cast<MooseVariableDataBase<OutputType> *>(this)
       ->stateToTagHelper<FieldVariableValue>(state, functor);
@@ -312,9 +311,8 @@ template <typename OutputType>
 const typename MooseVariableDataBase<OutputType>::FieldVariableGradient &
 MooseVariableDataBase<OutputType>::gradSln(Moose::SolutionState state) const
 {
-  auto functor = [this](TagID tag_id) -> const FieldVariableGradient & {
-    return vectorTagGradient(tag_id);
-  };
+  auto functor = [this](TagID tag_id) -> const FieldVariableGradient &
+  { return vectorTagGradient(tag_id); };
 
   return const_cast<MooseVariableDataBase<OutputType> *>(this)
       ->stateToTagHelper<FieldVariableGradient>(state, functor);

diff --git a/framework/src/variables/MooseVariableDataFV.C b/framework/src/variables/MooseVariableDataFV.C
@@ -36,6 +36,7 @@ MooseVariableDataFV<OutputType>::MooseVariableDataFV(const MooseVariableFV<Outpu
 
   : MooseVariableDataBase<OutputType>(var, sys, tid),
     MeshChangedInterface(var.parameters()),
+    _var(var),
     _fe_type(_var.feType()),
     _var_num(_var.number()),
     _assembly(_subproblem.assembly(_tid, var.kind() == Moose::VAR_NONLINEAR ? sys.number() : 0)),
@@ -100,7 +101,7 @@ MooseVariableDataFV<OutputType>::uDot() const
 {
   if (_sys.solutionUDot())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_u_dot = true;
     return _u_dot;
   }
@@ -115,7 +116,7 @@ MooseVariableDataFV<OutputType>::uDotDot() const
 {
   if (_sys.solutionUDotDot())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_u_dotdot = true;
     return _u_dotdot;
   }
@@ -131,7 +132,7 @@ MooseVariableDataFV<OutputType>::uDotOld() const
 {
   if (_sys.solutionUDotOld())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_u_dot_old = true;
     return _u_dot_old;
   }
@@ -147,7 +148,7 @@ MooseVariableDataFV<OutputType>::uDotDotOld() const
 {
   if (_sys.solutionUDotDotOld())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_u_dotdot_old = true;
     return _u_dotdot_old;
   }
@@ -161,7 +162,7 @@ template <typename OutputType>
 const typename MooseVariableDataFV<OutputType>::FieldVariableValue &
 MooseVariableDataFV<OutputType>::sln(Moose::SolutionState state) const
 {
-  static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+  _var.requireQpComputations();
   return MooseVariableDataBase<OutputType>::sln(state);
 }
 
@@ -171,7 +172,7 @@ MooseVariableDataFV<OutputType>::gradSlnDot() const
 {
   if (_sys.solutionUDot())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_grad_dot = true;
     return _grad_u_dot;
   }
@@ -186,7 +187,7 @@ MooseVariableDataFV<OutputType>::gradSlnDotDot() const
 {
   if (_sys.solutionUDotDot())
   {
-    static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+    _var.requireQpComputations();
     _need_grad_dotdot = true;
     return _grad_u_dotdot;
   }
@@ -200,7 +201,7 @@ template <typename OutputType>
 const typename MooseVariableDataFV<OutputType>::FieldVariableSecond &
 MooseVariableDataFV<OutputType>::secondSln(Moose::SolutionState state) const
 {
-  static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+  _var.requireQpComputations();
   switch (state)
   {
     case Moose::Current:
@@ -238,7 +239,7 @@ template <typename OutputType>
 const typename MooseVariableDataFV<OutputType>::FieldVariableCurl &
 MooseVariableDataFV<OutputType>::curlSln(Moose::SolutionState state) const
 {
-  static_cast<const MooseVariableFV<OutputType> *>(&_var)->requireQpComputations();
+  _var.requireQpComputations();
   switch (state)
   {
     case Moose::Current: