Add more coupled*Values* functions (idaholab#21989)

dschwen · Feb 22, 2024 · a766c95 · a766c95
1 parent 2584f74
commit a766c95
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/framework/include/interfaces/Coupleable.h b/framework/include/interfaces/Coupleable.h
@@ -541,6 +541,13 @@ class Coupleable
    */
   std::vector<const VariableValue *> coupledValuesOld(const std::string & var_name) const;
 
+  /**
+   * Returns the older values for all of a coupled variable's components
+   * @param var_name Name of coupled variable
+   * @return Vector of VariableValue pointers for each component of \p var_name
+   */
+  std::vector<const VariableValue *> coupledValuesOlder(const std::string & var_name) const;
+
   /**
    * Returns an old value from two time steps previous of a coupled variable
    * @param var_name Name of coupled variable
@@ -551,13 +558,6 @@ class Coupleable
   virtual const VariableValue & coupledValueOlder(const std::string & var_name,
                                                   unsigned int comp = 0) const;
 
-  /**
-   * Returns the older values for all of a coupled variable's components
-   * @param var_name Name of coupled variable
-   * @return Vector of VariableValue pointers for each component of \p var_name
-   */
-  std::vector<const VariableValue *> coupledValuesOlder(const std::string & var_name) const;
-
   /**
    * Returns value of previous Newton iterate of a coupled variable
    * @param var_name Name of coupled variable

diff --git a/framework/include/interfaces/NeighborCoupleable.h b/framework/include/interfaces/NeighborCoupleable.h
@@ -37,6 +37,8 @@ class NeighborCoupleable : public Coupleable
                                                      unsigned int comp = 0) const;
 
   std::vector<const VariableValue *> coupledNeighborValues(const std::string & var_name) const;
+  std::vector<const VariableValue *> coupledNeighborValuesOld(const std::string & var_name) const;
+  std::vector<const VariableValue *> coupledNeighborValuesOlder(const std::string & var_name) const;
 
   /**
    * Get the coupled neighbor variable value for \p var_name with derivative information for

diff --git a/framework/src/interfaces/NeighborCoupleable.C b/framework/src/interfaces/NeighborCoupleable.C
@@ -41,6 +41,22 @@ NeighborCoupleable::coupledNeighborValues(const std::string & var_name) const
   return coupledVectorHelper<const VariableValue *>(var_name, func);
 }
 
+std::vector<const VariableValue *>
+NeighborCoupleable::coupledNeighborValuesOld(const std::string & var_name) const
+{
+  auto func = [this, &var_name](unsigned int comp)
+  { return &coupledNeighborValueOld(var_name, comp); };
+  return coupledVectorHelper<const VariableValue *>(var_name, func);
+}
+
+std::vector<const VariableValue *>
+NeighborCoupleable::coupledNeighborValuesOlder(const std::string & var_name) const
+{
+  auto func = [this, &var_name](unsigned int comp)
+  { return &coupledNeighborValueOlder(var_name, comp); };
+  return coupledVectorHelper<const VariableValue *>(var_name, func);
+}
+
 const ADVariableValue &
 NeighborCoupleable::adCoupledNeighborValue(const std::string & var_name, unsigned int comp) const
 {