Reduce visibility of nested structures after refactoring. (#1720)

Author: TotoGaz

src/coreComponents/constitutive/fluid/CompressibleSinglePhaseFluid.hpp

@@ -133,7 +133,7 @@ class CompressibleSinglePhaseFluid : public SingleFluidBase
    */
   KernelWrapper createKernelWrapper();
 
-  struct viewKeyStruct : public SingleFluidBase::viewKeyStruct
+  struct viewKeyStruct
   {
     static constexpr char const * compressibilityString() { return "compressibility"; }
     static constexpr char const * viscosibilityString() { return "viscosibility"; }

src/coreComponents/constitutive/fluid/ParticleFluid.hpp

@@ -209,7 +209,7 @@ class ParticleFluid : public ParticleFluidBase
 
   // *** Data repository keys
 
-  struct viewKeyStruct : public ParticleFluidBase::viewKeyStruct
+  struct viewKeyStruct
   {
     static constexpr char const * fluidViscosityString() { return "fluidViscosity"; }
     static constexpr char const * proppantDiameterString() { return "proppantDiameter"; }

src/coreComponents/constitutive/fluid/ParticleFluidBase.hpp

@@ -154,14 +154,6 @@ class ParticleFluidBase : public ConstitutiveBase
 
   static constexpr localIndex MAX_NUM_COMPONENTS = 4;
 
-  // *** Data repository keys
-
-  struct viewKeyStruct
-  {
-    static constexpr char const * maxProppantConcentrationString() { return "maxProppantConcentration"; }
-    static constexpr char const * isCollisionalSlipString() { return "isCollisionalSlip"; }
-  };
-
 protected:
 
   virtual void postProcessInput() override;
@@ -180,6 +172,15 @@ class ParticleFluidBase : public ConstitutiveBase
 
   real64 m_maxProppantConcentration;
 
+private:
+
+  // *** Data repository keys
+  struct viewKeyStruct
+  {
+    static constexpr char const * maxProppantConcentrationString() { return "maxProppantConcentration"; }
+    static constexpr char const * isCollisionalSlipString() { return "isCollisionalSlip"; }
+  };
+
 };
 
 } //namespace constitutive

src/coreComponents/constitutive/fluid/ProppantSlurryFluid.hpp

@@ -307,7 +307,7 @@ class ProppantSlurryFluid : public SlurryFluidBase
 
   // *** Data repository keys
 
-  struct viewKeyStruct : public SlurryFluidBase::viewKeyStruct
+  struct viewKeyStruct
   {
     static constexpr char const * compressibilityString() { return "compressibility"; }
     static constexpr char const * referencePressureString() { return "referencePressure"; }

src/coreComponents/constitutive/fluid/SingleFluidBase.hpp

@@ -185,14 +185,6 @@ class SingleFluidBase : public ConstitutiveBase
   real64 defaultDensity() const { return m_defaultDensity; }
   real64 defaultViscosity() const { return m_defaultViscosity; }
 
-  // *** Data repository keys
-
-  struct viewKeyStruct
-  {
-    static constexpr char const * defaultDensityString() { return "defaultDensity"; }
-    static constexpr char const * defaultViscosityString() { return "defaultViscosity"; }
-  };
-
 protected:
 
   virtual void postProcessInput() override;
@@ -208,6 +200,14 @@ class SingleFluidBase : public ConstitutiveBase
   array2d< real64 > m_viscosity;
   array2d< real64 > m_dViscosity_dPressure;
 
+private:
+
+  // *** Data repository keys
+  struct viewKeyStruct
+  {
+    static constexpr char const * defaultDensityString() { return "defaultDensity"; }
+    static constexpr char const * defaultViscosityString() { return "defaultViscosity"; }
+  };
 };
 
 } //namespace constitutive

src/coreComponents/constitutive/fluid/SlurryFluidBase.hpp

@@ -310,20 +310,6 @@ class SlurryFluidBase : public ConstitutiveBase
 
   bool isNewtonianFluid() const { return m_isNewtonianFluid; }
 
-  // *** Data repository keys
-
-  struct viewKeyStruct
-  {
-    static constexpr char const * componentNamesString() { return "componentNames"; }
-
-    static constexpr char const * defaultDensityString() { return "defaultDensity"; }
-    static constexpr char const * defaultCompressibilityString() { return "defaultCompressibility"; }
-    static constexpr char const * defaultViscosityString() { return "defaultViscosity"; }
-
-    static constexpr char const * flowBehaviorIndexString() { return "flowBehaviorIndex"; }
-    static constexpr char const * flowConsistencyIndexString() { return "flowConsistencyIndex"; }
-  };
-
 protected:
 
   virtual void postProcessInput() override;
@@ -361,6 +347,20 @@ class SlurryFluidBase : public ConstitutiveBase
 
   bool m_isNewtonianFluid;
 
+private:
+
+  // *** Data repository keys
+  struct viewKeyStruct
+  {
+    static constexpr char const * componentNamesString() { return "componentNames"; }
+
+    static constexpr char const * defaultDensityString() { return "defaultDensity"; }
+    static constexpr char const * defaultCompressibilityString() { return "defaultCompressibility"; }
+    static constexpr char const * defaultViscosityString() { return "defaultViscosity"; }
+
+    static constexpr char const * flowBehaviorIndexString() { return "flowBehaviorIndex"; }
+    static constexpr char const * flowConsistencyIndexString() { return "flowConsistencyIndex"; }
+  };
 };
 
 } //namespace constitutive