Merge pull request #238 from smpark7/fix-prec-iter

Update MOOSE submodule and fix precursor tests

.github/workflows/auto-update-gh-pages.yml

@@ -39,7 +39,7 @@ jobs:
           conda deactivate
           conda activate moose-env
           git submodule init && git submodule update
-          make NAVIER_STOKES:='no' PHASE_FIELD:='no' -j 2
+          make NAVIER_STOKES:='no' PHASE_FIELD:='no' REACTOR:='no' -j 2
           cd doc
           ./moosedocs.py build --destination html
       

Makefile

@@ -28,20 +28,26 @@ ALL_MODULES                 := no
 
 CHEMICAL_REACTIONS          := no
 CONTACT                     := no
+ELECTROMAGNETICS            := no
 EXTERNAL_PETSC_SOLVER       := no
 FLUID_PROPERTIES            := no
+FSI                         := no
 FUNCTIONAL_EXPANSION_TOOLS  := no
 GEOCHEMISTRY                := no
 HEAT_CONDUCTION             := no
 LEVEL_SET                   := no
 MISC                        := no
 NAVIER_STOKES               := yes
+OPTIMIZATION                := no
+PERIDYNAMICS                := no
 PHASE_FIELD                 := yes
 POROUS_FLOW                 := no
 RAY_TRACING                 := no
+REACTOR                     := yes
 RDG                         := no
 RICHARDS                    := no
 STOCHASTIC_TOOLS            := no
+THERMAL_HYDRAULICS          := no
 TENSOR_MECHANICS            := no
 XFEM                        := no
 

include/postprocessors/AverageFissionHeat.h

@@ -9,11 +9,14 @@ class AverageFissionHeat : public ElmIntegTotFissHeatPostprocessor
 
   static InputParameters validParams();
 
+  using Postprocessor::getValue;
+  virtual Real getValue() const override;
+
 protected:
   virtual void initialize() override;
   virtual void execute() override;
-  virtual Real getValue() override;
   virtual void threadJoin(const UserObject & y) override;
+  virtual void finalize() override;
 
   Real _volume;
 };

include/postprocessors/DivisionPostprocessor.h

@@ -14,6 +14,8 @@ class DivisionPostprocessor : public DifferencePostprocessor
 
   static InputParameters validParams();
 
+  using Postprocessor::getValue;
+  virtual PostprocessorValue getValue() const override;
+
 protected:
-  virtual PostprocessorValue getValue() override;
 };

include/postprocessors/ElementL2Diff.h

@@ -9,12 +9,10 @@ class ElementL2Diff : public ElementIntegralVariablePostprocessor
 
   static InputParameters validParams();
 
-protected:
-  /**
-   * Get the L2 Error.
-   */
-  virtual Real getValue() override;
+  using Postprocessor::getValue;
+  virtual Real getValue() const override;
 
+protected:
   virtual Real computeQpIntegral() override;
 
   const VariableValue & _u_old;

include/postprocessors/LimitK.h

@@ -26,10 +26,8 @@ class LimitK : public TimestepSize
   virtual void initialize() override {}
   virtual void execute() override {}
 
-  /**
-   * This will return the current time step size.
-   */
-  virtual Real getValue() override;
+  using Postprocessor::getValue;
+  virtual Real getValue() const override;
 
 protected:
   const PostprocessorValue & _k;

src/postprocessors/AverageFissionHeat.C

@@ -25,18 +25,13 @@ void
 AverageFissionHeat::execute()
 {
   ElmIntegTotFissHeatPostprocessor::execute();
-
   _volume += _current_elem_volume;
 }
 
 Real
-AverageFissionHeat::getValue()
+AverageFissionHeat::getValue() const
 {
-  Real integral = ElmIntegTotFissHeatPostprocessor::getValue();
-
-  gatherSum(_volume);
-
-  return integral / _volume;
+  return _integral_value / _volume;
 }
 
 void
@@ -46,3 +41,10 @@ AverageFissionHeat::threadJoin(const UserObject & y)
   const AverageFissionHeat & pps = static_cast<const AverageFissionHeat &>(y);
   _volume += pps._volume;
 }
+
+void
+AverageFissionHeat::finalize()
+{
+  gatherSum(_volume);
+  gatherSum(_integral_value);
+}

src/postprocessors/DivisionPostprocessor.C

@@ -15,7 +15,7 @@ DivisionPostprocessor::DivisionPostprocessor(const InputParameters & parameters)
 }
 
 PostprocessorValue
-DivisionPostprocessor::getValue()
+DivisionPostprocessor::getValue() const
 {
   return _value1 / _value2;
 }

src/postprocessors/ElementL2Diff.C

@@ -15,7 +15,7 @@ ElementL2Diff::ElementL2Diff(const InputParameters & parameters)
 }
 
 Real
-ElementL2Diff::getValue()
+ElementL2Diff::getValue() const
 {
   return std::sqrt(ElementIntegralVariablePostprocessor::getValue());
 }

src/postprocessors/LimitK.C

@@ -42,7 +42,7 @@ LimitK::LimitK(const InputParameters & parameters)
 }
 
 Real
-LimitK::getValue()
+LimitK::getValue() const
 {
   Real dt = _feproblem.dt();
   if (_k > _k_threshold)

tests/pre/pre_loop.i

@@ -47,7 +47,7 @@ global_temperature=922
 
 [Executioner]
   type = Transient
-  end_time = 500
+  end_time = 400
   nl_rel_tol = 1e-6
   nl_abs_tol = 1e-5
   solve_type = 'NEWTON'
@@ -61,6 +61,7 @@ global_temperature=922
   fixed_point_rel_tol = 1e-6
   fixed_point_abs_tol = 1e-5
   dtmin = 1e-2
+  dtmax = 5
   [./TimeStepper]
     type = IterationAdaptiveDT
     dt = 1e-2

tests/pre/pre_loop_ins.i

@@ -180,7 +180,7 @@ ymax=100
 
 [Executioner]
   type = Transient
-  end_time = 500
+  end_time = 400
   nl_rel_tol = 1e-6
   nl_abs_tol = 1e-5
   solve_type = 'NEWTON'
@@ -194,6 +194,7 @@ ymax=100
   fixed_point_rel_tol = 1e-6
   fixed_point_abs_tol = 1e-5
   dtmin = 1e-2
+  dtmax = 4
   [./TimeStepper]
     type = IterationAdaptiveDT
     dt = 1e-2

tests/pre/sub.i

@@ -45,7 +45,7 @@ global_temperature=922
 
 [Executioner]
   type = Transient
-  end_time = 500
+  end_time = 400
   nl_rel_tol = 1e-6
   nl_abs_tol = 1e-5
   solve_type = 'NEWTON'
@@ -56,6 +56,7 @@ global_temperature=922
   nl_max_its = 20
   l_max_its = 50
   dtmin = 1e-2
+  dtmax = 5
   [./TimeStepper]
     type = IterationAdaptiveDT
     dt = 1e-2

tests/pre/sub_ins.i

@@ -45,7 +45,7 @@ global_temperature=922
 
 [Executioner]
   type = Transient
-  end_time = 500
+  end_time = 400
   nl_rel_tol = 1e-6
   nl_abs_tol = 1e-5
   solve_type = 'NEWTON'
@@ -56,6 +56,7 @@ global_temperature=922
   nl_max_its = 20
   l_max_its = 50
   dtmin = 1e-2
+  dtmax = 4
   [./TimeStepper]
     type = IterationAdaptiveDT
     dt = 1e-2