Merge pull request idaholab#15659 from hugary1995/adcoupledgenericsca…

…larvalue add coupledGenericScalarValue interface
snschune · Jul 23, 2020 · e97564c · e97564c
2 parents 0a9fb29 + 14bc25e
commit e97564c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/framework/include/interfaces/ScalarCoupleable.h b/framework/include/interfaces/ScalarCoupleable.h
@@ -104,6 +104,17 @@ class ScalarCoupleable
    */
   const ADVariableValue & adCoupledScalarValue(const std::string & var_name, unsigned int comp = 0);
 
+  /**
+   * Returns value of a coupled scalar variable for use in templated automatic differentiation
+   * classes
+   * @param var_name Name of coupled scalar variable
+   * @param comp Component number for vector of coupled scalar variables
+   * @return Reference to a GenericVariableValue for the coupled scalar variable
+   */
+  template <bool is_ad>
+  const GenericVariableValue<is_ad> & coupledGenericScalarValue(const std::string & var_name,
+                                                                unsigned int comp = 0);
+
   /**
    * Returns value of a scalar coupled variable
    * @param var_name Name of coupled variable

diff --git a/framework/src/interfaces/ScalarCoupleable.C b/framework/src/interfaces/ScalarCoupleable.C
@@ -149,6 +149,20 @@ ScalarCoupleable::adCoupledScalarValue(const std::string & var_name, unsigned in
                "coupledValue instead for non-implicit");
 }
 
+template <>
+const GenericVariableValue<false> &
+ScalarCoupleable::coupledGenericScalarValue<false>(const std::string & var_name, unsigned int comp)
+{
+  return coupledScalarValue(var_name, comp);
+}
+
+template <>
+const GenericVariableValue<true> &
+ScalarCoupleable::coupledGenericScalarValue<true>(const std::string & var_name, unsigned int comp)
+{
+  return adCoupledScalarValue(var_name, comp);
+}
+
 ADVariableValue *
 ScalarCoupleable::getADDefaultValue(const std::string & var_name)
 {