Merge branch 'issue/make_datatransferoperation_enum_class' into 'develop'

make DataTransferOperation an enum class

See merge request !99

src/amdis/DataTransfer.hpp

@@ -11,10 +11,10 @@ namespace AMDiS
    * @{
    **/
 
-  typedef enum {
+  enum class DataTransferOperation {
     NO_OPERATION = 0,
     INTERPOLATE  = 1
-  } DataTransferOperation;
+  };
 
 
   /// \brief Interface for Containers allowing data transfer between grid changes.
@@ -66,10 +66,10 @@ namespace AMDiS
     {
       switch (op)
       {
-        case NO_OPERATION:
+        case DataTransferOperation::NO_OPERATION:
           return std::make_unique<NoDataTransfer<Container>>();
-        case INTERPOLATE:
-          return std::make_unique< DataTransfer<Container, Basis> >(basis);
+        case DataTransferOperation::INTERPOLATE:
+          return std::make_unique<DataTransfer<Container, Basis>>(basis);
         default:
           error_exit("Invalid data transfer\n");
           return nullptr; // avoid warnings

src/amdis/ProblemInstat.inc.hpp

@@ -45,7 +45,7 @@ void ProblemInstat<Traits>::createUhOld()
   if (oldSolution_)
     warning("oldSolution already created\n");
   else // create oldSolution
-    oldSolution_.reset(new SystemVector(*problemStat_->globalBasis(), INTERPOLATE));
+    oldSolution_.reset(new SystemVector(*problemStat_->globalBasis(), DataTransferOperation::INTERPOLATE));
 }
 
 

src/amdis/ProblemStat.inc.hpp

@@ -173,8 +173,8 @@ template <class Traits>
 void ProblemStat<Traits>::createMatricesAndVectors()
 {
   systemMatrix_ = std::make_shared<SystemMatrix>(*globalBasis_, *globalBasis_);
-  solution_ = std::make_shared<SystemVector>(*globalBasis_, INTERPOLATE);
-  rhs_ = std::make_shared<SystemVector>(*globalBasis_, NO_OPERATION);
+  solution_ = std::make_shared<SystemVector>(*globalBasis_, DataTransferOperation::INTERPOLATE);
+  rhs_ = std::make_shared<SystemVector>(*globalBasis_, DataTransferOperation::NO_OPERATION);
 
   auto localView = globalBasis_->localView();
   for_each_node(localView.tree(), [&,this](auto const& node, auto treePath)

src/amdis/linearalgebra/DOFVectorBase.hpp

@@ -57,7 +57,7 @@ namespace AMDiS
 
   public:
     /// Constructor. Constructs new BaseVector.
-    DOFVectorBase(GlobalBasis const& basis, DataTransferOperation op = NO_OPERATION)
+    DOFVectorBase(GlobalBasis const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
       : basis_(&basis)
       , dataTransfer_(DataTransferFactory::create(op, basis))
     {

src/amdis/linearalgebra/eigen/DOFVector.hpp

@@ -91,7 +91,7 @@ namespace AMDiS
     using Super = DOFVectorBase<BasisType, EigenVector<ValueType>>;
 
   public:
-    DOFVector(BasisType const& basis, DataTransferOperation op = NO_OPERATION)
+    DOFVector(BasisType const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
       : Super(basis, op)
     {}
 
@@ -102,7 +102,7 @@ namespace AMDiS
   /// Constructor a dofvector from given basis and name
   template <class ValueType = double, class Basis>
   DOFVector<Basis, ValueType>
-  makeDOFVector(Basis const& basis, DataTransferOperation op = NO_OPERATION)
+  makeDOFVector(Basis const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
   {
     return {basis, op};
   }

src/amdis/linearalgebra/istl/DOFVector.hpp

@@ -100,7 +100,7 @@ namespace AMDiS
     using Super = DOFVectorBase<BasisType, IstlVector<ValueType>>;
 
   public:
-    DOFVector(BasisType const& basis, DataTransferOperation op = NO_OPERATION)
+    DOFVector(BasisType const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
       : Super(basis, op)
     {}
 
@@ -111,7 +111,7 @@ namespace AMDiS
   /// Constructor a dofvector from given basis and name
   template <class ValueType = double, class Basis>
   DOFVector<Basis, ValueType>
-  makeDOFVector(Basis const& basis, DataTransferOperation op = NO_OPERATION)
+  makeDOFVector(Basis const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
   {
     return {basis, op};
   }

src/amdis/linearalgebra/mtl/DOFVector.hpp

@@ -91,7 +91,7 @@ namespace AMDiS
     using Super = DOFVectorBase<BasisType, MtlVector<ValueType>>;
 
   public:
-    DOFVector(BasisType const& basis, DataTransferOperation op = NO_OPERATION)
+    DOFVector(BasisType const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
       : Super(basis, op)
     {}
 
@@ -102,7 +102,7 @@ namespace AMDiS
   /// Constructor a dofvector from given basis and name
   template <class ValueType = double, class Basis>
   DOFVector<Basis, ValueType>
-  makeDOFVector(Basis const& basis, DataTransferOperation op = NO_OPERATION)
+  makeDOFVector(Basis const& basis, DataTransferOperation op = DataTransferOperation::NO_OPERATION)
   {
     return {basis, op};
   }