ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-mpi' into 'master'

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/general/mpi_interface.hpp
View File

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

3
ng/parallelfunc.cpp
View File

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