EXODIFF: Make some private functions private

sandialabs · Sep 19, 2023 · 7139e49 · 7139e49
1 parent eec06a1
commit 7139e49
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/packages/seacas/applications/exodiff/edge_block.h b/packages/seacas/applications/exodiff/edge_block.h
@@ -23,9 +23,8 @@ template <typename INT> class Edge_Block : public Exo_Entity
 
   size_t Edge_Index(size_t position) const;
 
-  int Check_State() const override;
-
 private:
+  int  Check_State() const override;
   void entity_load_params() override;
 
   EXOTYPE     exodus_type() const override;

diff --git a/packages/seacas/applications/exodiff/exo_block.h b/packages/seacas/applications/exodiff/exo_block.h
@@ -34,12 +34,11 @@ template <typename INT> class Exo_Block : public Exo_Entity
   const INT              *Connectivity(size_t elmt_index) const; // 1-offset connectivity
 
   // Misc:
-  int Check_State() const override;
-
   int64_t offset() const { return offset_; }
   void    offset(int64_t off) { offset_ = off; }
 
 private:
+  int  Check_State() const override;
   void entity_load_params() override;
 
   EXOTYPE     exodus_type() const override;

diff --git a/packages/seacas/applications/exodiff/exo_entity.h b/packages/seacas/applications/exodiff/exo_entity.h
@@ -37,8 +37,6 @@ class Exo_Entity
   size_t Id() const { return id_; }
   size_t Index() const { return index_; }
 
-  virtual int Check_State() const = 0;
-
   void initialize(int file_id, size_t id);
 
   bool        is_valid_var(size_t var_index) const;
@@ -65,9 +63,6 @@ class Exo_Entity
   // Return "block", "nodelist", "surface", depending on underlying type.
   virtual const char *short_label() const = 0;
 
-  // Return EX_ELEM_BLOCK, EX_NODE_SET, ... of underlying type
-  virtual EXOTYPE exodus_type() const = 0;
-
 protected:
   std::string  name_{};
   int          fileId{-1};
@@ -76,6 +71,10 @@ class Exo_Entity
   size_t       numEntity{0}; // Number of items (nodes, sides, elements)
 
 private:
+  // Return EX_ELEM_BLOCK, EX_NODE_SET, ... of underlying type
+  virtual EXOTYPE exodus_type() const = 0;
+
+  virtual int  Check_State() const  = 0;
   virtual void entity_load_params() = 0;
   void         internal_load_params();
 

diff --git a/packages/seacas/applications/exodiff/face_block.h b/packages/seacas/applications/exodiff/face_block.h
@@ -22,9 +22,8 @@ template <typename INT> class Face_Block : public Exo_Entity
 
   size_t Face_Index(size_t position) const;
 
-  int Check_State() const override;
-
 private:
+  int  Check_State() const override;
   void entity_load_params() override;
 
   EXOTYPE     exodus_type() const override;

diff --git a/packages/seacas/applications/exodiff/node_set.h b/packages/seacas/applications/exodiff/node_set.h
@@ -29,9 +29,8 @@ template <typename INT> class Node_Set : public Exo_Entity
   const double *Distribution_Factors() const;
   void          Free_Distribution_Factors() const;
 
-  int Check_State() const override;
-
 private:
+  int  Check_State() const override;
   void entity_load_params() override;
 
   EXOTYPE     exodus_type() const override;

diff --git a/packages/seacas/applications/exodiff/side_set.h b/packages/seacas/applications/exodiff/side_set.h
@@ -30,10 +30,10 @@ template <typename INT> class Side_Set : public Exo_Entity
   const double       *Distribution_Factors() const;
   void                Free_Distribution_Factors() const;
 
-  int    Check_State() const override;
   size_t Distribution_Factor_Count() const { return num_dist_factors; }
 
 private:
+  int  Check_State() const override;
   void load_sides(const std::vector<INT> &elmt_map) const;
   void load_df() const;
   void entity_load_params() override;