Lam4 does not use constant identifiers for the MPI_Datatypes but

pointers to extern structs.

Therefor the MPITraits for the primitive datatypes did not work.

Fixed that and modified tests for running under lam4.

[[Imported from SVN: r1434]]

istl/mpitraits.hh

@@ -29,82 +29,28 @@ namespace Dune
   class MPITraits
   {};
 
-  template<typename T, MPI_Datatype t>
-  struct MPITraitsHelper
-  {
-    /**
-     * brief Get the corresponding MPI Type.
-     */
-    inline static MPI_Datatype getType();
+  // A Macro for defining traits for the primitive data types
+#define ComposeMPITraits(p,m) \
+  template<> \
+  struct MPITraits<p>{ \
+    static inline MPI_Datatype getType(){ \
+      return m; \
+    } \
   };
 
-  template<typename T, MPI_Datatype t>
-  inline MPI_Datatype MPITraitsHelper<T,t>::getType()
-  {
-    return t;
-  }
-
-  template<>
-  struct MPITraits<char>
-    : MPITraitsHelper<char, MPI_CHAR>
-  {};
-
-  template<>
-  struct MPITraits<unsigned char>
-    : public MPITraitsHelper<unsigned char,MPI_UNSIGNED_CHAR>
-  {};
-
-  template<>
-  struct MPITraits<short>
-    : public MPITraitsHelper<short,MPI_SHORT>
-  {};
-
-  template<>
-  struct MPITraits<unsigned short>
-    : public MPITraitsHelper<unsigned short,MPI_UNSIGNED_SHORT>
-  {};
-
-  template<>
-  struct MPITraits<int>
-    : public MPITraitsHelper<int,MPI_INT>
-  {};
-
-  template<>
-  struct MPITraits<unsigned int> :
-    public MPITraitsHelper<unsigned int,MPI_UNSIGNED>
-  {};
-
-
-  template<>
-  struct MPITraits<long> :
-    public MPITraitsHelper<long,MPI_LONG>
-  {};
-
-
-  template<>
-  struct MPITraits<unsigned long>
-    : public MPITraitsHelper<unsigned long,MPI_UNSIGNED_LONG>
-  {};
-
-
-  template<>
-  struct MPITraits<float>
-    : public MPITraitsHelper<float,MPI_FLOAT>
-  {};
-
-
-
-  template<>
-  struct MPITraits<double>
-    : public MPITraitsHelper<double,MPI_DOUBLE>
-  {};
-
-
-
-  template<>
-  struct MPITraits<long double>
-    : public MPITraitsHelper<long double,MPI_LONG_DOUBLE>
-  {};
+  ComposeMPITraits(char, MPI_CHAR);
+  ComposeMPITraits(unsigned char,MPI_UNSIGNED_CHAR);
+  ComposeMPITraits(short,MPI_SHORT);
+  ComposeMPITraits(unsigned short,MPI_UNSIGNED_SHORT);
+  ComposeMPITraits(int,MPI_INT);
+  ComposeMPITraits(unsigned int,MPI_UNSIGNED);
+  ComposeMPITraits(long,MPI_LONG);
+  ComposeMPITraits(unsigned long,MPI_UNSIGNED_LONG);
+  ComposeMPITraits(float,MPI_FLOAT);
+  ComposeMPITraits(double,MPI_DOUBLE);
+  ComposeMPITraits(long double,MPI_LONG_DOUBLE);
+
+#undef ComposeMPITraits
 
   /** @} */
 }

istl/test/Makefile.am

 # $Id $
 
 if MPI
-  TESTPROGS = indicestest  selectiontest
+  INDEXPROG = indicestest
+  SELECTPROG = selectiontest
+  INDEXRUN = run-indices
 endif
 
-# which tests to run
-TESTS = $(TESTPROGS)
+# which tests where program to build and run are equal
+NORMALTESTS = $(SELECTPROG)
+
+# list of tests to run (indicestest is special case)
+TESTS = $(NORMALTESTS) $(INDEXRUN)
 
 # programs just to build when "make check" is used
-check_PROGRAMS = $(TESTPROGS)
+check_PROGRAMS = $(NORMALTESTS) $(INDEXPROG)
 
 # define the programs
 

istl/test/run-indices

+#!/bin/sh
+# $ Id: $
+
+# run lamboot if possible
+if which lamboot; then
+  lamboot 2>&1 > /dev/null
+fi
+
+# start test and abort on fail
+set -e
+mpirun -np 1 indicestest
+set +e
+
+# possibly stop LAM again
+if which lamhalt; then
+  lamhalt 2>&1 > /dev/null
+fi

istl/test/selectiontest.cc

@@ -26,7 +26,7 @@ int meassure(const T& selection)
   int count=0;
   Dune::Timer timer;
   timer.reset();
-  for(int i=0; i<100; i++)
+  for(int i=0; i<10; i++)
     for(iterator iter = selection.begin(); iter != end; ++iter)
       count+=*iter;