Merge branch 'fix/fundamentals_type_error_plus_cmake_cpp11' into 'master'

Fix for build issue with fundamentals-differentiation tutorial code

See merge request !31

fundamentals/differentiation/fundamentals-differentiation/completed/LocDifferentiation2D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 #define WITHSOLUTION 1
 
 int main(int argc, char *argv[])
@@ -40,8 +39,8 @@ int main(int argc, char *argv[])
 
     // Declare pointers (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrices
-    MatrixSharedPtrType derivMatrixDir1;
-    MatrixSharedPtrType derivMatrixDir2;
+    DNekMatSharedPtr derivMatrixDir1;
+    DNekMatSharedPtr derivMatrixDir2;
 
     // Calculate the GLL-quadrature zeros and the differentiation
     // matrices in both directions. This is done in 2 steps.

fundamentals/differentiation/fundamentals-differentiation/completed/StdDifferentiation1D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 #define WITHSOLUTION 1
 
 int main(int argc, char *argv[])
@@ -34,7 +33,7 @@ int main(int argc, char *argv[])
 
     // Declare a pointer (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrix
-    MatrixSharedPtrType derivMatrix;
+    DNekMatSharedPtr derivMatrix;
 
     // Calculate the quadrature zeros and the differentiation matrix.
     // This is done in 2 steps.

fundamentals/differentiation/fundamentals-differentiation/completed/StdDifferentiation2D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 #define WITHSOLUTION 1
 
 int main(int argc, char *argv[])
@@ -40,8 +39,8 @@ int main(int argc, char *argv[])
 
     // Declare pointers (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrices
-    MatrixSharedPtrType derivMatrixDir1;
-    MatrixSharedPtrType derivMatrixDir2;
+    DNekMatSharedPtr derivMatrixDir1;
+    DNekMatSharedPtr derivMatrixDir2;
 
     // Calculate the GLL-quadrature zeros and the differentiation
     // matrices in both directions. This is done in 2 steps.

fundamentals/differentiation/fundamentals-differentiation/tutorial/LocDifferentiation2D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 int main(int argc, char *argv[])
 {
     cout << "=========================================================" << endl;
@@ -38,8 +37,8 @@ int main(int argc, char *argv[])
 
     // Declare pointers (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrices
-    MatrixSharedPtrType derivMatrixDir1;
-    MatrixSharedPtrType derivMatrixDir2;
+    DNekMatSharedPtr derivMatrixDir1;
+    DNekMatSharedPtr derivMatrixDir2;
 
     // Calculate the GLL-quadrature zeros and the differentiation
     // matrices in both directions. This is done in 2 steps.

fundamentals/differentiation/fundamentals-differentiation/tutorial/StdDifferentiation1D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 int main(int argc, char *argv[])
 {
     cout << "======================================================" << endl;
@@ -32,7 +31,7 @@ int main(int argc, char *argv[])
 
     // Declare a pointer (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrix
-    MatrixSharedPtrType derivMatrix;
+    DNekMatSharedPtr derivMatrix;
 
     // Calculate the quadrature zeros and the differentiation matrix.
     // This is done in 2 steps.

fundamentals/differentiation/fundamentals-differentiation/tutorial/StdDifferentiation2D.cpp

@@ -3,12 +3,11 @@
 
 #include <LibUtilities/Foundations/ManagerAccess.h>
 #include <LibUtilities/Polylib/Polylib.h>
+#include <LibUtilities/LinearAlgebra/NekTypeDefs.hpp>
 
 using namespace Nektar;
 using namespace std;
 
-typedef std::shared_ptr<NekMatrix<NekDouble> > MatrixSharedPtrType;
-
 int main(int argc, char *argv[])
 {
     cout << "===========================================================" << endl;
@@ -38,8 +37,8 @@ int main(int argc, char *argv[])
 
     // Declare pointers (to type NekMatrix<NekDouble>) to hold the
     // differentiation matrices
-    MatrixSharedPtrType derivMatrixDir1;
-    MatrixSharedPtrType derivMatrixDir2;
+    DNekMatSharedPtr derivMatrixDir1;
+    DNekMatSharedPtr derivMatrixDir2;
 
     // Calculate the GLL-quadrature zeros and the differentiation
     // matrices in both directions. This is done in 2 steps.