Use UserObjectInterface methods with error checking

refs idaholab#17512
loganharbour · Apr 7, 2021 · 4040c34 · 4040c34
1 parent 039b121
commit 4040c34
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/framework/include/ics/InitialConditionBase.h b/framework/include/ics/InitialConditionBase.h
@@ -95,13 +95,13 @@ class InitialConditionBase : public MooseObject,
   /**
    * reimplements the getUserObject method from UserObjectInterface
    */
-  template <typename T2>
-  const T2 & getUserObject(const std::string & name);
+  template <typename T>
+  const T & getUserObject(const std::string & name) const;
   /**
    * reimplements the getUserObjectByName method from UserObjectInterface
    */
-  template <typename T2>
-  const T2 & getUserObjectByName(const UserObjectName & name);
+  template <typename T>
+  const T & getUserObjectByName(const UserObjectName & name) const;
 
   /**
    * reimplements the getUserObjectBase method from UserObjectInterface
@@ -112,6 +112,10 @@ class InitialConditionBase : public MooseObject,
   /// The system object
   SystemBase & _sys;
 
+  /// If set, UOs retrieved by this IC will not be executed before this IC
+  const bool _ignore_uo_dependency;
+
+private:
   /// Dependent variables
   std::set<std::string> _depend_vars;
   /// Supplied variables
@@ -126,7 +130,7 @@ const T &
 InitialConditionBase::getUserObject(const std::string & name) const
 {
   if (!_ignore_uo_dependency)
-    _depend_uo.insert(_pars.get<UserObjectName>(name));
+    _depend_uo.insert(getUserObjectName(name));
   return UserObjectInterface::getUserObject<T>(name);
 }
 

diff --git a/framework/src/ics/InitialConditionBase.C b/framework/src/ics/InitialConditionBase.C
@@ -79,6 +79,6 @@ const UserObject &
 InitialConditionBase::getUserObjectBase(const std::string & name) const
 {
   if (!_ignore_uo_dependency)
-    _depend_uo.insert(_pars.get<UserObjectName>(name));
+    _depend_uo.insert(getUserObjectName(name));
   return UserObjectInterface::getUserObjectBase(name);
 }