Merge branch 'feature/support-mingw' into 'master'

Feature/support mingw

See merge request !88

dune/istl/test/bvectortest.cc

@@ -4,7 +4,9 @@
 #include <dune/istl/bvector.hh>
 #include <dune/common/fvector.hh>
 #include <dune/common/poolallocator.hh>
+#if HAVE_MPROTECT
 #include <dune/common/debugallocator.hh>
+#endif
 #include <dune/common/classname.hh>
 
 #include <dune/istl/test/vectortest.hh>
@@ -223,10 +225,14 @@ int main()
 
   ret += testVector<1>();
   //  ret += testVector<1, Dune::PoolAllocator<void,1000000> >();
+#if HAVE_MPROTECT
   ret += testVector<1, Dune::DebugAllocator<void> >();
+#endif
   ret += testVector<3>();
   //  ret += testVector<3, Dune::PoolAllocator<void,1000000> >();
+#if HAVE_MPROTECT
   ret += testVector<3, Dune::DebugAllocator<void> >();
+#endif
 
   testCapacity();
 

dune/istl/test/matrixtest.cc

@@ -206,8 +206,8 @@ void testMatrix(MatrixType& matrix, X& x, Y& y)
   //   Test component-wise operations
   // ///////////////////////////////////////////////////////
 
-  matrix *= M_PI;
-  matrix /= M_PI;
+  matrix *= real_type(1.0);
+  matrix /= real_type(1.0);
 
   matrix += secondMatrix;
   matrix -= secondMatrix;
@@ -234,11 +234,11 @@ void testMatrix(MatrixType& matrix, X& x, Y& y)
 
   matrix.mmhv(x,y);
 
-  matrix.usmv(M_PI,x,y);
+  matrix.usmv(field_type(1.0),x,y);
 
-  matrix.usmtv(M_PI,x,y);
+  matrix.usmtv(field_type(1.0),x,y);
 
-  matrix.usmhv(M_PI,x,y);
+  matrix.usmhv(field_type(1.0),x,y);
 
   // //////////////////////////////////////////////////////////////
   //   Test the matrix norms
@@ -297,8 +297,8 @@ void testTranspose(const MatrixType& matrix)
 int main()
 {
 
-  // feenableexcept does not exist on OS X
-#ifndef __APPLE__
+  // feenableexcept does not exist on OS X or windows
+#if not defined( __APPLE__ ) and not defined( __MINGW32__ )
   feenableexcept(FE_INVALID);
 #endif
 

dune/istl/tutorial/example.cc

@@ -10,7 +10,6 @@
 #include <complex>
 
 #include <cmath>                 // Yes, we do some math here
-#include <sys/times.h>            // for timing measurements
 
 #include <dune/common/indices.hh>
 #include <dune/istl/istlexception.hh>
@@ -31,39 +30,6 @@
 #include <dune/istl/multitypeblockvector.hh>
 #include <dune/istl/multitypeblockmatrix.hh>
 
-// a simple stop watch
-class Timer
-{
-public:
-  Timer ()
-  {
-    struct tms buf;
-    cstart = times(&buf);
-  }
-
-  void start ()
-  {
-    struct tms buf;
-    cstart = times(&buf);
-  }
-
-  double stop ()
-  {
-    struct tms buf;
-    cend = times(&buf);
-    return ((double)(cend-cstart))/100.0;
-  }
-
-  double gettime ()
-  {
-    return ((double)(cend-cstart))/100.0;
-  }
-
-private:
-  clock_t cstart,cend;
-};
-
-
 // testing codes
 void test_basearray ()
 {
@@ -150,7 +116,7 @@ void test_BlockVector ()
   x[2] = y[7];
 
   // timing the axpy operation
-  Timer watch;
+  Dune::Timer watch;
   double t;
   int i;
 
@@ -345,7 +311,7 @@ void test_IO ()
 
 void test_Iter ()
 {
-  Timer t;
+  Dune::Timer t;
 
   // block types
   const int BlockSize = 6;
@@ -385,7 +351,7 @@ void test_Iter ()
       else
         (*j) = E;
   t.stop();
-  std::cout << "time for build=" << t.gettime() << " seconds." << std::endl;
+  std::cout << "time for build=" << t.elapsed() << " seconds." << std::endl;
   //   printmatrix(std::cout,A,"system matrix","row",8,1);
 
   // set up system
@@ -427,7 +393,7 @@ void test_Iter ()
     if (d.two_norm()<1E-4) break;
   }
   t.stop();
-  std::cout << "time for solve=" << t.gettime() << " seconds." << std::endl;
+  std::cout << "time for solve=" << t.elapsed() << " seconds." << std::endl;
 }