Merge branch 'fix-mpi' into 'master'

fix compiler errors in mpi build

redefinition of default argument and wrong namespace

See merge request !5
This commit is contained in:
Joachim Schöberl 2016-07-15 18:52:01 +02:00
commit 962ae7954e
2 changed files with 3 additions and 4 deletions

View File

@ -39,9 +39,9 @@ namespace netgen
{ return MPI_DOUBLE; }
template <int S> class Vec;
template <int S, typename T> class Vec;
template <>
inline MPI_Datatype MyGetMPIType<Vec<3> > ()
inline MPI_Datatype MyGetMPIType<Vec<3, double> > ()
{
static MPI_Datatype MPI_T = 0;
if (!MPI_T)

View File

@ -29,14 +29,13 @@
#include <meshing.hpp>
#include "../interface/writeuser.hpp"
void (*NGS_ParallelRun) (const string & message) = NULL;
namespace netgen
{
#include "../interface/writeuser.hpp"
extern string ngdir;
#ifdef OPENGL