Merge pull request #26656 from lingzou/use-CoupledName

Use CoupledName as an alias for std::vector<VariableName>
idaholab · Jan 27, 2024 · 41d8b30 · 41d8b30
2 parents 995e101 + 2b1c0e7
commit 41d8b30
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 16 deletions.
diff --git a/framework/include/utils/MooseTypes.h b/framework/include/utils/MooseTypes.h
@@ -1057,6 +1057,10 @@ DerivativeStringClass(NonlinearSystemName);
 /// Command line argument, specialized to handle quotes in vector arguments
 DerivativeStringClass(CLIArgString);
 
+/**
+ * additional MOOSE typedefs
+ */
+typedef std::vector<VariableName> CoupledName;
 namespace Moose
 {
 extern const TagName SOLUTION_TAG;

diff --git a/modules/contact/include/actions/ContactAction.h b/modules/contact/include/actions/ContactAction.h
@@ -111,9 +111,6 @@ class ContactAction : public Action
   /// Whether mortar dynamic contact constraints are to be used
   const bool _mortar_dynamics;
 
-  /// Type that we use in Actions for declaring coupling
-  typedef std::vector<VariableName> CoupledName;
-
 private:
   /**
    * Generate mesh and other Moose objects for Mortar contact

diff --git a/modules/navier_stokes/include/actions/CNSAction.h b/modules/navier_stokes/include/actions/CNSAction.h
@@ -113,7 +113,4 @@ class CNSAction : public Action
   std::set<SubdomainID> _block_ids;
   /// pressure variable name
   const std::string _pressure_variable_name;
-
-  /// Type that we use in Actions for declaring coupling
-  typedef std::vector<VariableName> CoupledName;
 };
diff --git a/modules/navier_stokes/include/actions/INSAction.h b/modules/navier_stokes/include/actions/INSAction.h
@@ -84,7 +84,4 @@ class INSAction : public Action
   std::set<SubdomainID> _block_ids;
   /// pressure variable name
   const std::string _pressure_variable_name;
-
-  /// Type that we use in Actions for declaring coupling
-  typedef std::vector<VariableName> CoupledName;
 };
diff --git a/modules/navier_stokes/include/base/NSFVBase.h b/modules/navier_stokes/include/base/NSFVBase.h
@@ -55,10 +55,6 @@ class NSFVBase : public BaseType
   ///@}
 
 protected:
-  /// Type that we use in Actions for declaring coupling between the solutions
-  /// of different physics components
-  typedef std::vector<VariableName> CoupledName;
-
   /// Adds NS variables
   void addNSVariables();
   /// Adds NS initial conditions

diff --git a/modules/tensor_mechanics/include/actions/DomainIntegralAction.h b/modules/tensor_mechanics/include/actions/DomainIntegralAction.h
@@ -160,7 +160,4 @@ class DomainIntegralAction : public Action
    * is greater than 1
    */
   const bool _used_by_xfem_to_grow_crack;
-
-  /// Type that we use in Actions for declaring coupling
-  typedef std::vector<VariableName> CoupledName;
 };