Use OpenMCBase.

Ref. neams-th-coe#1031
nuclearkevin · Jan 25, 2025 · 2fa321f · 2fa321f
1 parent 70075db
commit 2fa321f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 48 deletions.
diff --git a/include/auxkernels/FDTallyGradAux.h b/include/auxkernels/FDTallyGradAux.h
@@ -18,15 +18,18 @@
 
 #pragma once
 
-#include "OpenMCAuxKernel.h"
+#include "AuxKernel.h"
+
+#include "OpenMCBase.h"
 
 /**
  * A class which approximates gradients of constant monomial tallies using forward finite
  * differences. The gradient computation is based on:
  * K. N. Stolte and P. V. Tsvetkov (2023), Annals of Nuclear Energy, 182, 109617.
  * https://doi.org/10.1016/j.anucene.2022.109617
  */
-class FDTallyGradAux : public OpenMCVectorAuxKernel
+class FDTallyGradAux : public VectorAuxKernel,
+                       public OpenMCBase
 {
 public:
   static InputParameters validParams();

diff --git a/include/base/OpenMCBase.h b/include/base/OpenMCBase.h
@@ -67,5 +67,5 @@ class OpenMCBase
                                                                          THREAD_ID t_id) const;
 
   /// The OpenMCCellAverageProblem required by all objects which inherit from OpenMCBase.
-  const OpenMCCellAverageProblem * _openmc_problem;
+  OpenMCCellAverageProblem * _openmc_problem;
 };
diff --git a/src/auxkernels/FDTallyGradAux.C b/src/auxkernels/FDTallyGradAux.C
@@ -27,7 +27,8 @@ registerMooseObject("CardinalApp", FDTallyGradAux);
 InputParameters
 FDTallyGradAux::validParams()
 {
-  auto params = OpenMCVectorAuxKernel::validParams();
+  auto params = VectorAuxKernel::validParams();
+  params += OpenMCBase::validParams();
   params.addClassDescription(
       "An auxkernel which approximates tally gradients at element centroids using "
       "forward finite differences.");
@@ -50,7 +51,8 @@ FDTallyGradAux::validParams()
 }
 
 FDTallyGradAux::FDTallyGradAux(const InputParameters & parameters)
-  : OpenMCVectorAuxKernel(parameters),
+  : VectorAuxKernel(parameters),
+    OpenMCBase(this, parameters),
     _bin_index(getParam<unsigned int>("ext_filter_bin")),
     _sum_y_y_t(RealEigenMatrix::Zero(3, 3)),
     _sum_y_du_dy(RealEigenVector::Zero(3))
@@ -72,9 +74,9 @@ FDTallyGradAux::FDTallyGradAux(const InputParameters & parameters)
                    "! Please "
                    "ensure that one of your [Tallies] is scoring the requested score.");
 
-  auto score_vars = getTallyScoreVariables(score);
-  auto score_bins = getTallyScoreVariableValues(score);
-  auto neighbor_score_bins = getTallyScoreNeighborVariableValues(score);
+  auto score_vars = getTallyScoreVariables(score, _tid);
+  auto score_bins = getTallyScoreVariableValues(score, _tid);
+  auto neighbor_score_bins = getTallyScoreNeighborVariableValues(score, _tid);
 
   if (_bin_index >= score_bins.size())
     paramError("ext_filter_bin",

diff --git a/test/tests/neutronics/tally_grad/finite_diff/tests b/test/tests/neutronics/tally_grad/finite_diff/tests
@@ -37,11 +37,4 @@
     mesh_mode = 'replicated'
     required_objects = 'OpenMCCellAverageProblem'
   []
-  [wrong_problem]
-    type = RunException
-    input = 'wrong_problem.i'
-    requirement = 'The system shall error if the user attempts to add an FDTallyGradAux without an OpenMCCellAverageProblem.'
-    expect_err = "This auxkernel can only be used with problems of type 'OpenMCCellAverageProblem'!"
-    required_objects = 'OpenMCCellAverageProblem'
-  []
 []
diff --git a/test/tests/neutronics/tally_grad/finite_diff/wrong_problem.i b/test/tests/neutronics/tally_grad/finite_diff/wrong_problem.i