Moved enum into StateStruct

phymucs · May 8, 2023 · d9afc77 · d9afc77
1 parent e04f482
commit d9afc77
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Albany_Application.cpp b/src/Albany_Application.cpp
@@ -3205,7 +3205,7 @@ Application::loadWorksetBucketInfo(PHAL::Workset& workset, const int& ws,
   // Sidesets are integrated within the Cells
   loadWorksetSidesetInfo(workset, ws);
 
-  workset.stateArrayPtr = &disc->getStateArrays(StateArrays::ELEM)[ws];
+  workset.stateArrayPtr = &disc->getStateArrays(StateStruct::ElemState)[ws];
 }
 
 void

diff --git a/src/Albany_StateInfoStruct.hpp b/src/Albany_StateInfoStruct.hpp
@@ -46,12 +46,6 @@ using StateArrayVec = std::vector<StateArray>;
 
 struct StateArrays
 {
-  enum StateArrayType
-  {
-    ELEM,
-    NODE
-  };
-
   StateArrayVec elemStateArrays;
   StateArrayVec nodeStateArrays;
 };
@@ -61,6 +55,12 @@ struct StateArrays
 
 struct StateStruct
 {
+  enum StateType
+  {
+    ElemState = 1,
+    NodeState
+  };
+
   enum MeshFieldEntity
   {
     WorksetValue,

diff --git a/src/disc/Albany_AbstractDiscretization.hpp b/src/disc/Albany_AbstractDiscretization.hpp
@@ -239,8 +239,8 @@ class AbstractDiscretization
   getStateArrays() = 0;
 
   //! Get stateArray of given type
-  StateArrayVec& getStateArrays(const StateArrays::StateArrayType type) {
-    if (type==StateArrays::ELEM) {
+  StateArrayVec& getStateArrays(const StateStruct::StateType type) {
+    if (type==StateStruct::ElemState) {
       return getStateArrays().elemStateArrays;
     } else {
       return getStateArrays().nodeStateArrays;