Merge branch 'remove-move-semantics' into 'master'

Remove move semantics

See merge request !52

CMakeLists.txt

@@ -140,12 +140,6 @@ target_link_libraries(Operators PUBLIC ${NEKTAR++_LIBRARIES} ${NEKTAR++_TP_LIBRA
 target_include_directories(Operators PRIVATE "${CMAKE_SOURCE_DIR}")
 target_compile_definitions(Operators PUBLIC ${NEKTAR++_DEFINITIONS})
 
-set(TEST_SRC main.cpp)
-add_executable(main ${TEST_SRC})
-target_link_libraries(main Operators)
-target_include_directories(main PRIVATE "${CMAKE_SOURCE_DIR}")
-target_compile_definitions(main PUBLIC ${NEKTAR++_DEFINITIONS})
-
 add_subdirectory(tests)
 
 find_package(Doxygen)

Operators/AssmbScatr/AssmbScatrImpl.cpp

@@ -8,6 +8,6 @@ template <>
 std::string OperatorAssmbScatrImpl<double, ImplStdMat>::className =
     GetOperatorFactory<double>().RegisterCreatorFunction(
         "AssmbScatr", OperatorAssmbScatrImpl<double, ImplStdMat>::instantiate,
-        "");
+        "...");
 
 } // namespace Nektar::Operators::detail

Operators/ConjGrad/ConjGradImpl.cpp

@@ -7,6 +7,7 @@ namespace Nektar::Operators::detail
 template <>
 std::string OperatorConjGradImpl<double, ImplStdMat>::className =
     GetOperatorFactory<double>().RegisterCreatorFunction(
-        "ConjGrad", OperatorConjGradImpl<double, ImplStdMat>::instantiate, "");
+        "ConjGrad", OperatorConjGradImpl<double, ImplStdMat>::instantiate,
+        "...");
 
 } // namespace Nektar::Operators::detail

Operators/DiagPrecon/DiagPreconImpl.cpp

@@ -8,6 +8,6 @@ template <>
 std::string OperatorDiagPreconImpl<double, ImplStdMat>::className =
     GetOperatorFactory<double>().RegisterCreatorFunction(
         "DiagPrecon", OperatorDiagPreconImpl<double, ImplStdMat>::instantiate,
-        "");
+        "...");
 
 } // namespace Nektar::Operators::detail

Operators/DiagPrecon/DiagPreconStdMat.hpp

@@ -19,7 +19,7 @@ class OperatorDiagPreconImpl<TData, ImplStdMat>
 {
 public:
     OperatorDiagPreconImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorDiagPrecon<TData>(std::move(expansionList))
+        : OperatorDiagPrecon<TData>(expansionList)
     {
         auto contfield =
             std::dynamic_pointer_cast<ContField>(this->m_expansionList);

Operators/DirBndCond/DirBndCondImpl.cpp

@@ -8,6 +8,6 @@ template <>
 std::string OperatorDirBndCondImpl<double, ImplStdMat>::className =
     GetOperatorFactory<double>().RegisterCreatorFunction(
         "DirBndCond", OperatorDirBndCondImpl<double, ImplStdMat>::instantiate,
-        "");
+        "...");
 
 } // namespace Nektar::Operators::detail

Operators/DirBndCond/DirBndCondStdMat.hpp

@@ -16,7 +16,7 @@ class OperatorDirBndCondImpl<TData, ImplStdMat>
 {
 public:
     OperatorDirBndCondImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorDirBndCond<TData>(std::move(expansionList))
+        : OperatorDirBndCond<TData>(expansionList)
     {
     }
 

Operators/IProductWRTBase/IProductWRTBaseStdMat.hpp

@@ -12,7 +12,7 @@ class OperatorIProductWRTBaseImpl<TData, ImplStdMat>
 public:
     OperatorIProductWRTBaseImpl(
         const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorIProductWRTBase<TData>(std::move(expansionList))
+        : OperatorIProductWRTBase<TData>(expansionList)
     {
         // Initialise jacobian.
         size_t jacSize = Operator<TData>::GetGeometricFactorSize();
@@ -79,7 +79,7 @@ public:
         const MultiRegions::ExpListSharedPtr &expansionList)
     {
         return std::make_unique<OperatorIProductWRTBaseImpl<TData, ImplStdMat>>(
-            std::move(expansionList));
+            expansionList);
     }
 
     static std::string className;

Operators/IProductWRTBase/IProductWRTBaseSumFac.hpp

@@ -13,7 +13,7 @@ class OperatorIProductWRTBaseImpl<TData, ImplSumFac>
 public:
     OperatorIProductWRTBaseImpl(
         const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorIProductWRTBase<TData>(std::move(expansionList))
+        : OperatorIProductWRTBase<TData>(expansionList)
     {
         // Initialise jacobian.
         size_t jacSize = Operator<TData>::GetGeometricFactorSize();
@@ -75,7 +75,7 @@ public:
         const MultiRegions::ExpListSharedPtr &expansionList)
     {
         return std::make_unique<OperatorIProductWRTBaseImpl<TData, ImplSumFac>>(
-            std::move(expansionList));
+            expansionList);
     }
 
     static std::string className;

Operators/IProductWRTDerivBase/IProductWRTDerivBaseStdMat.hpp

@@ -12,7 +12,7 @@ class OperatorIProductWRTDerivBaseImpl<TData, ImplStdMat>
 public:
     OperatorIProductWRTDerivBaseImpl(
         const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorIProductWRTDerivBase<TData>(std::move(expansionList))
+        : OperatorIProductWRTDerivBase<TData>(expansionList)
     {
         size_t nTotElmts = this->m_expansionList->GetNumElmts();
         size_t nDim      = this->m_expansionList->GetShapeDimension();
@@ -194,8 +194,7 @@ public:
         const MultiRegions::ExpListSharedPtr &expansionList)
     {
         return std::make_unique<
-            OperatorIProductWRTDerivBaseImpl<TData, ImplStdMat>>(
-            std::move(expansionList));
+            OperatorIProductWRTDerivBaseImpl<TData, ImplStdMat>>(expansionList);
     }
 
     static std::string className;

Operators/Identity/IdentityCUDA.hpp

@@ -18,7 +18,7 @@ class OperatorIdentityImpl<TData, TFieldState, ImplCUDA>
 {
 public:
     OperatorIdentityImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorIdentity<TData, TFieldState>(std::move(expansionList))
+        : OperatorIdentity<TData, TFieldState>(expansionList)
     {
     }
 
@@ -62,8 +62,7 @@ public:
         const MultiRegions::ExpListSharedPtr &expansionList)
     {
         return std::make_unique<
-            OperatorIdentityImpl<TData, TFieldState, ImplCUDA>>(
-            std::move(expansionList));
+            OperatorIdentityImpl<TData, TFieldState, ImplCUDA>>(expansionList);
     }
 
     static std::string className;

Operators/Identity/IdentityStdMat.hpp

@@ -11,7 +11,7 @@ class OperatorIdentityImpl<TData, TFieldState, ImplStdMat>
 {
 public:
     OperatorIdentityImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorIdentity<TData, TFieldState>(std::move(expansionList))
+        : OperatorIdentity<TData, TFieldState>(expansionList)
     {
     }
 

Operators/Mass/MassStdMat.hpp

@@ -12,7 +12,7 @@ class OperatorMassImpl<TData, ImplStdMat> : public OperatorMass<TData>
 {
 public:
     OperatorMassImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorMass<TData>(std::move(expansionList)),
+        : OperatorMass<TData>(expansionList),
           m_field(Field<TData, FieldState::Phys>::create(
               GetBlockAttributes(FieldState::Phys, expansionList)))
     {

Operators/Matrix/MatrixCUDA.hpp

@@ -18,7 +18,7 @@ class OperatorMatrixImpl<TData, TFieldState, ImplCUDA>
 {
 public:
     OperatorMatrixImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorMatrix<TData, TFieldState>(std::move(expansionList))
+        : OperatorMatrix<TData, TFieldState>(expansionList)
     {
         // get size of the matrix from the blocks given by state and
         // expansionlist
@@ -108,8 +108,7 @@ public:
         const MultiRegions::ExpListSharedPtr &expansionList)
     {
         return std::make_unique<
-            OperatorMatrixImpl<TData, TFieldState, ImplCUDA>>(
-            std::move(expansionList));
+            OperatorMatrixImpl<TData, TFieldState, ImplCUDA>>(expansionList);
     }
 
     static std::string className;

Operators/Matrix/MatrixImpl.cpp

@@ -10,7 +10,7 @@ std::string OperatorMatrixImpl<double, FieldState::Coeff,
     GetOperatorFactory<double>().RegisterCreatorFunction(
         "MatrixCoeff",
         OperatorMatrixImpl<double, FieldState::Coeff, ImplStdMat>::instantiate,
-        "");
+        "...");
 
 template <>
 std::string OperatorMatrixImpl<double, FieldState::Phys,
@@ -18,5 +18,5 @@ std::string OperatorMatrixImpl<double, FieldState::Phys,
     GetOperatorFactory<double>().RegisterCreatorFunction(
         "MatrixPhys",
         OperatorMatrixImpl<double, FieldState::Phys, ImplStdMat>::instantiate,
-        "");
+        "...");
 } // namespace Nektar::Operators::detail

Operators/Matrix/MatrixStdMat.hpp

@@ -14,7 +14,7 @@ class OperatorMatrixImpl<TData, TFieldState, ImplStdMat>
 {
 public:
     OperatorMatrixImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorMatrix<TData, TFieldState>(std::move(expansionList))
+        : OperatorMatrix<TData, TFieldState>(expansionList)
     {
         // get size of the matrix from the blocks given by state and
         // expansionlist
@@ -34,7 +34,7 @@ public:
 
     void fill(std::vector<TData> src)
     {
-    	std::copy(src.begin(), src.end(), m_matrix.begin());
+        std::copy(src.begin(), src.end(), m_matrix.begin());
     }
 
     std::string toString()

Operators/NeuBndCond/NeuBndCondImpl.cpp

@@ -8,6 +8,6 @@ template <>
 std::string OperatorNeuBndCondImpl<double, ImplStdMat>::className =
     GetOperatorFactory<default_fp_type>().RegisterCreatorFunction(
         "NeuBndCond", OperatorNeuBndCondImpl<double, ImplStdMat>::instantiate,
-        "");
+        "...");
 
 } // namespace Nektar::Operators::detail

Operators/NeuBndCond/NeuBndCondStdMat.hpp

@@ -16,7 +16,7 @@ class OperatorNeuBndCondImpl<TData, ImplStdMat>
 {
 public:
     OperatorNeuBndCondImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorNeuBndCond<TData>(std::move(expansionList))
+        : OperatorNeuBndCond<TData>(expansionList)
     {
     }
 

Operators/NullPrecon/NullPreconStdMat.hpp

@@ -18,7 +18,7 @@ class OperatorNullPreconImpl<TData, ImplStdMat>
 {
 public:
     OperatorNullPreconImpl(const MultiRegions::ExpListSharedPtr &expansionList)
-        : OperatorNullPrecon<TData>(std::move(expansionList))
+        : OperatorNullPrecon<TData>(expansionList)
     {
         auto contfield =
             std::dynamic_pointer_cast<ContField>(this->m_expansionList);

Operators/OperatorAssmbScatr.hpp

@@ -21,6 +21,13 @@ public:
     virtual void apply(Field<TData, FieldState::Coeff> &in,
                        Field<TData, FieldState::Coeff> &out,
                        const bool &zeroDir = false) = 0;
+
+    virtual void operator()(Field<TData, FieldState::Coeff> &in,
+                            Field<TData, FieldState::Coeff> &out,
+                            const bool &zeroDir)
+    {
+        apply(in, out, zeroDir);
+    }
 };
 
 // Descriptor / traits class for Assembly+scatter to be used by Operator create