Merge pull request idaholab#431 from idaholab/ad-version2

Compatability with MOOSE after AD 2.0
recuero · Apr 14, 2020 · 08e1c82 · 08e1c82
2 parents 4e0be90 + 28f6f26
commit 08e1c82
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/include/other/MyTRIMElementEnergyAccess.h b/include/other/MyTRIMElementEnergyAccess.h
@@ -33,7 +33,7 @@ class MyTRIMElementEnergyAccess : public T
 
 template <class T>
 MyTRIMElementEnergyAccess<T>::MyTRIMElementEnergyAccess(const InputParameters & parameters)
-  : T(parameters), _mytrim(getUserObject<MyTRIMElementRun>("runner"))
+  : T(parameters), _mytrim(this->template getUserObject<MyTRIMElementRun>("runner"))
 {
   if (this->isNodal())
     mooseError("MyTRIMElementEnergyAccess needs to be applied to an elemental AuxVariable.");

diff --git a/include/other/MyTRIMElementResultAccess.h b/include/other/MyTRIMElementResultAccess.h
@@ -39,10 +39,11 @@ class MyTRIMElementResultAccess : public T
 template <class T>
 MyTRIMElementResultAccess<T>::MyTRIMElementResultAccess(const InputParameters & parameters)
   : T(parameters),
-    _mytrim(getUserObject<MyTRIMElementRun>("runner")),
+    _mytrim(this->template getUserObject<MyTRIMElementRun>("runner")),
     _rasterizer(_mytrim.rasterizer()),
-    _ivar(getParam<unsigned int>("ivar")),
-    _defect(getParam<MooseEnum>("defect").template getEnum<ThreadedRecoilLoopBase::DefectType>())
+    _ivar(this->template getParam<unsigned int>("ivar")),
+    _defect(this->template getParam<MooseEnum>("defect")
+                .template getEnum<ThreadedRecoilLoopBase::DefectType>())
 {
   if (this->isNodal())
     mooseError("MyTRIMElementResultAccess needs to be applied to an elemental AuxVariable.");

diff --git a/moose b/moose
diff --git a/src/transfers/MultiAppNeutronicsSpectrumTransfer.C b/src/transfers/MultiAppNeutronicsSpectrumTransfer.C
@@ -44,7 +44,7 @@ MultiAppNeutronicsSpectrumTransfer::execute()
   // get the neutronics PDF user object
   FEProblemBase & from_problem = _multi_app->problemBase();
   const NeutronicsSpectrumSamplerBase & neutronics_pdf =
-      from_problem.getUserObjectTempl<NeutronicsSpectrumSamplerBase>(_neutronics_pdf_name);
+      from_problem.getUserObject<NeutronicsSpectrumSamplerBase>(_neutronics_pdf_name);
 
   // loop over all sub apps and copy over the neutronics data
   for (unsigned int i = 0; i < _multi_app->numGlobalApps(); ++i)
@@ -57,8 +57,8 @@ MultiAppNeutronicsSpectrumTransfer::execute()
       for (THREAD_ID tid = 0; tid < libMesh::n_threads(); ++tid)
       {
         PKAGeneratorNeutronicsBase & pka_uo = const_cast<PKAGeneratorNeutronicsBase &>(
-            _multi_app->appProblem(i).getUserObjectTempl<PKAGeneratorNeutronicsBase>(
-                _pka_generator_name, tid));
+            _multi_app->appProblem(i).getUserObject<PKAGeneratorNeutronicsBase>(_pka_generator_name,
+                                                                                tid));
         pka_uo.setPDF(zaids, energies, probabilities);
       }
     }

diff --git a/src/utils/DiscretePKAPDF.C b/src/utils/DiscretePKAPDF.C
@@ -11,6 +11,8 @@
 #include "MooseRandom.h"
 #include "MagpieUtils.h"
 
+#include "libmesh/vector_value.h"
+
 DiscretePKAPDF::DiscretePKAPDF()
   : DiscretePKAPDFBase(),
     _probability_density_function(MultiIndex<Real>({1})),