refactor: split FieldSpecificationBase into two classes

src/coreComponents/fieldSpecification/AquiferBoundaryCondition.cpp

@@ -25,7 +25,7 @@ namespace geos
 using namespace dataRepository;
 
 AquiferBoundaryCondition::AquiferBoundaryCondition( string const & name, Group * parent )
-  : FieldSpecificationBase( name, parent ),
+  : FieldSpecification( name, parent ),
   m_waterPhaseIndex( -1 ),
   m_cumulativeFlux( 0.0 )
 {
@@ -99,15 +99,15 @@ AquiferBoundaryCondition::AquiferBoundaryCondition( string const & name, Group *
   registerWrapper( viewKeyStruct::cumulativeFluxString(), &m_cumulativeFlux ).
     setInputFlag( InputFlags::FALSE );
 
-  getWrapper< string >( FieldSpecificationBase::viewKeyStruct::fieldNameString() ).
+  getWrapper< string >( FieldSpecification::viewKeyStruct::fieldNameString() ).
     setInputFlag( InputFlags::FALSE );
   setFieldName( catalogName() );
 
-  getWrapper< string >( FieldSpecificationBase::viewKeyStruct::objectPathString() ).
+  getWrapper< string >( FieldSpecification::viewKeyStruct::objectPathString() ).
     setInputFlag( InputFlags::FALSE );
   setObjectPath( "faceManager" );
 
-  getWrapper< int >( FieldSpecificationBase::viewKeyStruct::componentString() ).
+  getWrapper< int >( FieldSpecification::viewKeyStruct::componentString() ).
     setInputFlag( InputFlags::FALSE );
 
 }
@@ -300,7 +300,7 @@ AquiferBoundaryCondition::KernelWrapper AquiferBoundaryCondition::createKernelWr
                                                   pressureInfluenceFunction.createKernelWrapper() );
 }
 
-REGISTER_CATALOG_ENTRY( FieldSpecificationBase, AquiferBoundaryCondition, string const &, Group * const )
+REGISTER_CATALOG_ENTRY( FieldSpecification, AquiferBoundaryCondition, string const &, Group * const )
 
 
 } /* namespace geos */

src/coreComponents/fieldSpecification/AquiferBoundaryCondition.hpp

@@ -21,7 +21,7 @@
 #ifndef GEOS_FIELDSPECIFICATION_AQUIFERBOUNDARYCONDITION_HPP
 #define GEOS_FIELDSPECIFICATION_AQUIFERBOUNDARYCONDITION_HPP
 
-#include "FieldSpecificationBase.hpp"
+#include "FieldSpecification.hpp"
 #include "functions/TableFunction.hpp"
 
 namespace geos
@@ -31,7 +31,7 @@ namespace geos
  * @class AquiferBoundaryCondition
  * Holds data and methods to apply a traction boundary condition
  */
-class AquiferBoundaryCondition : public FieldSpecificationBase
+class AquiferBoundaryCondition : public FieldSpecification
 {
 public:
 
@@ -118,7 +118,7 @@ class AquiferBoundaryCondition : public FieldSpecificationBase
 
   };
 
-  /// @copydoc FieldSpecificationBase(string const &, dataRepository::Group *)
+  /// @copydoc FieldSpecification(string const &, dataRepository::Group *)
   AquiferBoundaryCondition( string const & name, Group * parent );
 
   /// deleted default constructor
@@ -202,7 +202,7 @@ class AquiferBoundaryCondition : public FieldSpecificationBase
   /**
    * @brief View keys
    */
-  struct viewKeyStruct : public FieldSpecificationBase::viewKeyStruct
+  struct viewKeyStruct : public FieldSpecification::viewKeyStruct
   {
 
     // aquifer geological properties

src/coreComponents/fieldSpecification/CMakeLists.txt

@@ -25,8 +25,9 @@ Contains:
 set( fieldSpecification_headers
      DirichletBoundaryCondition.hpp
      EquilibriumInitialCondition.hpp
-     FieldSpecificationBase.hpp
+     FieldSpecification.hpp
      FieldSpecificationManager.hpp
+     FieldSpecificationImpl.hpp
      SourceFluxBoundaryCondition.hpp
      TractionBoundaryCondition.hpp
      AquiferBoundaryCondition.hpp
@@ -39,7 +40,7 @@ set( fieldSpecification_headers
 set( fieldSpecification_sources
      DirichletBoundaryCondition.cpp
      EquilibriumInitialCondition.cpp
-     FieldSpecificationBase.cpp
+     FieldSpecification.cpp
      FieldSpecificationManager.cpp
      SourceFluxBoundaryCondition.cpp
      TractionBoundaryCondition.cpp

src/coreComponents/fieldSpecification/DirichletBoundaryCondition.cpp

@@ -24,7 +24,7 @@ namespace geos
 using namespace dataRepository;
 
 DirichletBoundaryCondition::DirichletBoundaryCondition( string const & name, Group * const parent ):
-  FieldSpecificationBase( name, parent )
+  FieldSpecification( name, parent )
 {
   // TODO Auto-generated constructor stub
 
@@ -37,6 +37,6 @@ DirichletBoundaryCondition::~DirichletBoundaryCondition()
 
 
 
-REGISTER_CATALOG_ENTRY( FieldSpecificationBase, DirichletBoundaryCondition, string const &, Group * const )
+REGISTER_CATALOG_ENTRY( FieldSpecification, DirichletBoundaryCondition, string const &, Group * const )
 
 } /* namespace geos */

src/coreComponents/fieldSpecification/DirichletBoundaryCondition.hpp

@@ -20,7 +20,7 @@
 #ifndef GEOS_FIELDSPECIFICATION_DIRICHLETBOUNDARYCONDITION_HPP_
 #define GEOS_FIELDSPECIFICATION_DIRICHLETBOUNDARYCONDITION_HPP_
 
-#include "FieldSpecificationBase.hpp"
+#include "FieldSpecification.hpp"
 
 namespace geos
 {
@@ -29,7 +29,7 @@ namespace geos
  * @class DirichletBoundaryCondition
  * A class to manage Dirichlet boundary conditions
  */
-class DirichletBoundaryCondition : public FieldSpecificationBase
+class DirichletBoundaryCondition : public FieldSpecification
 {
 public:
   /// @copydoc geos::dataRepository::Group::Group( string const & name, Group * const parent )

src/coreComponents/fieldSpecification/EquilibriumInitialCondition.cpp

@@ -27,7 +27,7 @@ namespace geos
 using namespace dataRepository;
 
 EquilibriumInitialCondition::EquilibriumInitialCondition( string const & name, Group * parent ):
-  FieldSpecificationBase( name, parent )
+  FieldSpecification( name, parent )
 {
   registerWrapper( viewKeyStruct::datumElevationString(), &m_datumElevation ).
     setInputFlag( InputFlags::REQUIRED ).
@@ -77,18 +77,18 @@ EquilibriumInitialCondition::EquilibriumInitialCondition( string const & name, G
     setInputFlag( InputFlags::OPTIONAL ).
     setDescription( "Phase contacts' elevations [m]" );
 
-  getWrapper< string >( FieldSpecificationBase::viewKeyStruct::fieldNameString() ).
+  getWrapper< string >( FieldSpecification::viewKeyStruct::fieldNameString() ).
     setInputFlag( InputFlags::FALSE );
   setFieldName( catalogName() );
 
-  getWrapper< int >( FieldSpecificationBase::viewKeyStruct::componentString() ).
+  getWrapper< int >( FieldSpecification::viewKeyStruct::componentString() ).
     setInputFlag( InputFlags::FALSE );
 
-  getWrapper< int >( FieldSpecificationBase::viewKeyStruct::initialConditionString() ).
+  getWrapper< int >( FieldSpecification::viewKeyStruct::initialConditionString() ).
     setInputFlag( InputFlags::FALSE );
   initialCondition( false ); // to make sure this is not called by applyInitialConditions
 
-  getWrapper< string_array >( FieldSpecificationBase::viewKeyStruct::setNamesString() ).
+  getWrapper< string_array >( FieldSpecification::viewKeyStruct::setNamesString() ).
     setRTTypeName( rtTypes::CustomTypes::groupNameRefArray ).
     setInputFlag( InputFlags::FALSE );
   addSetName( "all" );
@@ -243,7 +243,7 @@ void EquilibriumInitialCondition::initializePreSubGroups()
   }
 }
 
-REGISTER_CATALOG_ENTRY( FieldSpecificationBase, EquilibriumInitialCondition, string const &, Group * const )
+REGISTER_CATALOG_ENTRY( FieldSpecification, EquilibriumInitialCondition, string const &, Group * const )
 
 
 } /* namespace geos */

src/coreComponents/fieldSpecification/EquilibriumInitialCondition.hpp

@@ -21,7 +21,7 @@
 #ifndef GEOS_FIELDSPECIFICATION_EQUILIBRIUMINITIALCONDITION_HPP
 #define GEOS_FIELDSPECIFICATION_EQUILIBRIUMINITIALCONDITION_HPP
 
-#include "FieldSpecificationBase.hpp"
+#include "FieldSpecification.hpp"
 
 namespace geos
 {
@@ -30,11 +30,11 @@ namespace geos
  * @class EquilibriumInitialCondition
  * Holds data to compute an hydrostatic equilibrium condition for flow problems
  */
-class EquilibriumInitialCondition : public FieldSpecificationBase
+class EquilibriumInitialCondition : public FieldSpecification
 {
 public:
 
-  /// @copydoc FieldSpecificationBase(string const &, dataRepository::Group *)
+  /// @copydoc FieldSpecification(string const &, dataRepository::Group *)
   EquilibriumInitialCondition( string const & name, Group * parent );
 
   /// deleted default constructor
@@ -124,7 +124,7 @@ class EquilibriumInitialCondition : public FieldSpecificationBase
   /**
    * @brief View keys
    */
-  struct viewKeyStruct : public FieldSpecificationBase::viewKeyStruct
+  struct viewKeyStruct : public FieldSpecification::viewKeyStruct
   {
 
     // equilibration parameters

src/coreComponents/fieldSpecification/FieldSpecificationBase.cpp → src/coreComponents/fieldSpecification/FieldSpecification.cpp

@@ -13,15 +13,15 @@
  * ------------------------------------------------------------------------------------------------------------
  */
 
-#include "FieldSpecificationBase.hpp"
+#include "FieldSpecification.hpp"
 
 #include "fieldSpecification/FieldSpecificationManager.hpp"
 
 namespace geos
 {
 using namespace dataRepository;
 
-FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * parent ):
+FieldSpecification::FieldSpecification( string const & name, Group * parent ):
   Group( name, parent )
 {
   setInputFlags( InputFlags::OPTIONAL_NONUNIQUE );
@@ -99,19 +99,19 @@ FieldSpecificationBase::FieldSpecificationBase( string const & name, Group * par
 }
 
 
-FieldSpecificationBase::~FieldSpecificationBase()
+FieldSpecification::~FieldSpecification()
 {}
 
-FieldSpecificationBase::CatalogInterface::CatalogType &
-FieldSpecificationBase::getCatalog()
+FieldSpecification::CatalogInterface::CatalogType &
+FieldSpecification::getCatalog()
 {
-  static FieldSpecificationBase::CatalogInterface::CatalogType catalog;
+  static FieldSpecification::CatalogInterface::CatalogType catalog;
   return catalog;
 }
 
 
 
-void FieldSpecificationBase::setMeshObjectPath( Group const & meshBodies )
+void FieldSpecification::setMeshObjectPath( Group const & meshBodies )
 {
   try
   {
@@ -131,6 +131,6 @@ void FieldSpecificationBase::setMeshObjectPath( Group const & meshBodies )
 
 
 
-REGISTER_CATALOG_ENTRY( FieldSpecificationBase, FieldSpecificationBase, string const &, Group * const )
+REGISTER_CATALOG_ENTRY( FieldSpecification, FieldSpecification, string const &, Group * const )
 
 }