Fix min gcc, clang and rocky issues. (#25722)

idaholab · Jan 29, 2024 · f815da4 · f815da4
1 parent 8d6ca03
commit f815da4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/framework/include/variables/MooseLinearVariableFV.h b/framework/include/variables/MooseLinearVariableFV.h
@@ -617,7 +617,7 @@ template <typename OutputType>
 typename MooseLinearVariableFV<OutputType>::ValueType
 MooseLinearVariableFV<OutputType>::evaluate(const ElemArg & elem_arg, const StateArg & state) const
 {
-  const auto elem_info = &_mesh.elemInfo(elem_arg.elem->id());
+  const auto elem_info = &this->_mesh.elemInfo(elem_arg.elem->id());
   return getElemValue(elem_info, state);
 }
 
@@ -626,15 +626,15 @@ typename MooseLinearVariableFV<OutputType>::ValueType
 MooseLinearVariableFV<OutputType>::evaluate(const ElemPointArg & elem_point,
                                             const StateArg & state) const
 {
-  const auto elem_info = &_mesh.elemInfo(elem_point.elem->id());
+  const auto elem_info = &this->_mesh.elemInfo(elem_point.elem->id());
   return getElemValue(elem_info, state);
 }
 
 template <typename OutputType>
 typename MooseLinearVariableFV<OutputType>::ValueType
 MooseLinearVariableFV<OutputType>::evaluate(const ElemQpArg & elem_qp, const StateArg & state) const
 {
-  const auto elem_info = &_mesh.elemInfo(elem_qp.elem->id());
+  const auto elem_info = &this->_mesh.elemInfo(elem_qp.elem->id());
   return getElemValue(elem_info, state);
 }
 
@@ -651,7 +651,7 @@ typename MooseLinearVariableFV<OutputType>::GradientType
 MooseLinearVariableFV<OutputType>::evaluateGradient(const ElemQpArg & qp_arg,
                                                     const StateArg & /*state*/) const
 {
-  const auto & elem_info = &_mesh.elemInfo(qp_arg.elem->id());
+  const auto & elem_info = &this->_mesh.elemInfo(qp_arg.elem->id());
   return gradSln(elem_info);
 }
 
@@ -660,7 +660,7 @@ typename MooseLinearVariableFV<OutputType>::GradientType
 MooseLinearVariableFV<OutputType>::evaluateGradient(const ElemArg & elem_arg,
                                                     const StateArg & /*state*/) const
 {
-  const auto & elem_info = &_mesh.elemInfo(elem_arg.elem->id());
+  const auto & elem_info = &this->_mesh.elemInfo(elem_arg.elem->id());
   return gradSln(elem_info);
 }
 

diff --git a/framework/src/loops/ComputeLinearFVElementalThread.C b/framework/src/loops/ComputeLinearFVElementalThread.C
@@ -44,7 +44,7 @@ ComputeLinearFVElementalThread::operator()(const ElemInfoRange & range)
   ParallelUniqueId puid;
   _tid = puid.id;
 
-  _subdomain = Moose::INVALID_BLOCK_ID;
+  _old_subdomain = Moose::INVALID_BLOCK_ID;
 
   // Iterate over all the elements in the range
   for (const auto & elem_info : range)
@@ -63,8 +63,6 @@ ComputeLinearFVElementalThread::operator()(const ElemInfoRange & range)
         kernel->addRightHandSideContribution();
     }
   }
-
-  _old_subdomain = _subdomain;
 }
 
 void
@@ -89,6 +87,7 @@ ComputeLinearFVElementalThread::fetchSystemContributionObjects()
     base_query.condition<AttribMatrixTags>(_tags).queryInto(kernels);
   else
     base_query.condition<AttribVectorTags>(_tags).queryInto(kernels);
+  _old_subdomain = _subdomain;
 
   _fv_kernels = std::set<LinearFVElementalKernel *>(kernels.begin(), kernels.end());
 }
diff --git a/framework/src/loops/ComputeLinearFVFaceThread.C b/framework/src/loops/ComputeLinearFVFaceThread.C
@@ -36,8 +36,8 @@ ComputeLinearFVFaceThread::operator()(const FaceInfoRange & range)
   ParallelUniqueId puid;
   _tid = puid.id;
 
-  _subdomain = Moose::INVALID_BLOCK_ID;
-  _neighbor_subdomain = Moose::INVALID_BLOCK_ID;
+  _old_subdomain = Moose::INVALID_BLOCK_ID;
+  _old_neighbor_subdomain = Moose::INVALID_BLOCK_ID;
 
   // Iterate over all the elements in the range
   for (const auto & face_info : range)

diff --git a/framework/src/variables/MooseLinearVariableFV.C b/framework/src/variables/MooseLinearVariableFV.C
@@ -111,7 +111,7 @@ MooseLinearVariableFV<OutputType>::getElemValue(const ElemInfo * const elem_info
                                  ? *this->_sys.currentSolution()
                                  : this->_sys.solutionState(state.state, state.iteration_type);
 
-  return global_soln(elem_info->dofIndices()[_sys.number()][this->number()]);
+  return global_soln(elem_info->dofIndices()[this->_sys.number()][this->number()]);
 }
 
 template <typename OutputType>
@@ -130,8 +130,9 @@ MooseLinearVariableFV<OutputType>::gradSln(const ElemInfo * const elem_info) con
   if (_needs_cell_gradients)
   {
     _cell_gradient.zero();
-    for (const auto i : make_range(_mesh.dimension()))
-      _cell_gradient(i) = (*_grad_cache[i])(elem_info->dofIndices()[_sys.number()][this->number()]);
+    for (const auto i : make_range(this->_mesh.dimension()))
+      _cell_gradient(i) =
+          (*_grad_cache[i])(elem_info->dofIndices()[this->_sys.number()][this->number()]);
   }
 
   return _cell_gradient;
@@ -162,10 +163,10 @@ MooseLinearVariableFV<OutputType>::initialSetup()
   if (_needs_cell_gradients)
   {
     _grad_cache.clear();
-    for (const auto i : make_range(_mesh.dimension()))
+    for (const auto i : make_range(this->_mesh.dimension()))
     {
       (void)i;
-      _grad_cache.push_back(_sys.currentSolution()->zero_clone());
+      _grad_cache.push_back(this->_sys.currentSolution()->zero_clone());
     }
   }
 

diff --git a/unit/src/MooseServerTest.C b/unit/src/MooseServerTest.C
@@ -1054,7 +1054,7 @@ TEST_F(MooseServerTest, CompletionDocumentRootLevel)
 
   EXPECT_EQ(request_id, response_id);
 
-  EXPECT_EQ(48u, completions_array.size());
+  EXPECT_EQ(50u, completions_array.size());
 
   std::ostringstream completions_actual;