Fix and test AuxKernel support (idaholab#22563)

dschwen · Mar 7, 2023 · e285c68 · e285c68
1 parent 65be7e5
commit e285c68
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/framework/src/loops/ComputeElemAuxVarsThread.C b/framework/src/loops/ComputeElemAuxVarsThread.C
@@ -125,15 +125,14 @@ ComputeElemAuxVarsThread<AuxKernelType>::onElement(const Elem * elem)
         Threads::spin_mutex::scoped_lock lock(writable_variable_mutex);
         for (auto * var : aux->getWritableCoupledVariables())
         {
-          std::cerr << aux->name() << " var " << var->name() << '\n';
           // insert into the global solution vector
           var->insert(_aux_sys.solution());
           var->prepareAux();
         }
 
         // make solution values available for dependent AuxKernels
-        // aux->variable().insert(_aux_sys.solution());
-        // aux->variable().prepareAux();
+        aux->variable().insert(_aux_sys.solution());
+        aux->variable().prepareAux();
         _fe_problem.reinitElem(elem, _tid);
       }
     }

diff --git a/framework/src/loops/ComputeNodalAuxVarsThread.C b/framework/src/loops/ComputeNodalAuxVarsThread.C
@@ -117,6 +117,8 @@ ComputeNodalAuxVarsThread<AuxKernelType>::onNode(ConstNodeRange::const_iterator
           }
 
           // make solution values available for dependent AuxKernels
+          aux->variable().insert(_aux_sys.solution());
+          aux->variable().prepareAux();
           _fe_problem.reinitNode(node, _tid);
         }
       }

diff --git a/test/include/auxkernels/MultipleUpdateElemAux.h b/test/include/auxkernels/MultipleUpdateElemAux.h
@@ -29,4 +29,6 @@ class MultipleUpdateElemAux : public AuxKernel
 
   unsigned int _n_vars;
   std::vector<MooseVariable *> _vars;
+
+  const bool _use_compute_value;
 };
diff --git a/test/src/auxkernels/MultipleUpdateElemAux.C b/test/src/auxkernels/MultipleUpdateElemAux.C
@@ -17,11 +17,14 @@ MultipleUpdateElemAux::validParams()
   InputParameters params = AuxKernel::validParams();
   params.addRequiredCoupledVar("vars",
                                "Coupled variables that will be written to by the test object.");
+  params.addParam<bool>("use_compute_value", false, "Use computeValue() instead of setNodalValue");
   return params;
 }
 
 MultipleUpdateElemAux::MultipleUpdateElemAux(const InputParameters & parameters)
-  : AuxKernel(parameters), _n_vars(coupledComponents("vars"))
+  : AuxKernel(parameters),
+    _n_vars(coupledComponents("vars")),
+    _use_compute_value(getParam<bool>("use_compute_value"))
 {
   for (unsigned int i = 0; i < _n_vars; i++)
     _vars.push_back(&writableVariable("vars", i));
@@ -39,14 +42,17 @@ MultipleUpdateElemAux::compute()
   for (unsigned int i = 0; i < _n_vars; i++)
     _vars[i]->setNodalValue(values[i]);
 
-  _var.setNodalValue(100.0);
+  if (_use_compute_value)
+    AuxKernel::compute();
+  else
+    _var.setNodalValue(0.0);
 }
 
 Real
 MultipleUpdateElemAux::computeValue()
 {
-  // never executed
-  return 100.0;
+  // executed if _use_compute_value == true
+  return 0.0;
 }
 
 void

diff --git a/test/tests/auxkernels/nodal_aux_var/tests b/test/tests/auxkernels/nodal_aux_var/tests
@@ -48,6 +48,14 @@
     requirement = "The MOOSE auxiliary system shall be capable of updating multiple elemental "
                   "auxiliary variables within a single AuxKernel object."
   []
+  [multi_update_elem_test_coupled_value]
+    type = 'Exodiff'
+    input = 'multi_update_elem_var_test.i'
+    cli_args = 'AuxKernels/all/use_compute_value=true'
+    exodiff = 'out_multi_elem_var.e'
+    requirement = "The MOOSE auxiliary system shall be capable of updating multiple elemental "
+                  "auxiliary variables within a single AuxKernel object."
+  []
 
   [ts_test]
     type = 'Exodiff'