Merge branch 'issue/small_corrections' into 'master'

problems with ms visual studio corrected and small errors in parmetis partitioner

- typedef in ProblemStat that irritated msvc
- variable definitions deparated by , in MTL4 library
- parmetis real_t and some missing macros for old parmetis/metis combination

See merge request !4

AMDiS/lib/mtl4/boost/numeric/mtl/utility/view_code.hpp

@@ -59,8 +59,8 @@ struct view_code<mtl::matrix::hermitian_view<Matrix> >
 template <unsigned Value>
 struct view_normalize_const
 {
-      static const unsigned tmp2= Value == 0 || Value == 4 ? Value | 1 : Value, // if matrix ref or transposed, make it const
-	                    value= (tmp2 & 3) == 3 ? tmp2 ^ 1 : tmp2;           // for conj turn off const
+      static const unsigned tmp2= Value == 0 || Value == 4 ? Value | 1 : Value; // if matrix ref or transposed, make it const
+	  static const unsigned value= (tmp2 & 3) == 3 ? tmp2 ^ 1 : tmp2;           // for conj turn off const
 };
 
 template <typename ViewCode>

AMDiS/src/ProblemStat.h

@@ -703,7 +703,7 @@ namespace AMDiS {
 			 public StandardProblemIteration
     {
       using ProblemStatType::getName;
-      using ProblemStatSeq::info;
+      using ProblemStatType::info;
 
       /// Constructor
       ProblemStat(std::string nameStr,

AMDiS/src/parallel/ParMetisPartitioner.h

@@ -30,6 +30,15 @@
 #include <parmetis.h>
 #include <mpi.h>
 
+#ifndef REALTYPEWIDTH
+#define real_t float
+#endif
+
+#ifndef PARMETIS_PSR_COUPLED
+#define PARMETIS_PSR_COUPLED 1
+#define PARMETIS_PSR_UNCOUPLED 2
+#endif
+
 #include "AMDiS_fwd.h"
 #include "Global.h"
 #include "parallel/MeshPartitioner.h"
@@ -182,7 +191,7 @@ namespace AMDiS { namespace Parallel {
 
     void createPartitionMap(std::map<int, int>& partitionMap);
 
-    void setItr(double value)
+    void setItr(real_t value)
     {
       itr = value;
     }
@@ -195,7 +204,7 @@ namespace AMDiS { namespace Parallel {
   protected:
     ParMetisMesh *parMetisMesh;
 
-    double itr;
+    real_t itr;
   };
 } }