projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r87: Upgraded from MPI to MPI++
[ctsim.git]
/
include
/
imagefile.h
diff --git
a/include/imagefile.h
b/include/imagefile.h
index 4660a92139c91c0fdb9995ee3ff193d685fb7d88..3c1bb9a8ef87fec8fb4b17809350298b4f2fff32 100644
(file)
--- a/
include/imagefile.h
+++ b/
include/imagefile.h
@@
-3,6
+3,8
@@
#include <string>
#include "kstddef.h"
#include <string>
#include "kstddef.h"
+#include <sys/types.h>
+#include <unistd.h>
#include <array2d.h>
using namespace std;
#include <array2d.h>
using namespace std;
@@
-633,20
+635,21
@@
public:
kuint32 ny(void) const
{ return adf.ny(); }
kuint32 ny(void) const
{ return adf.ny(); }
-#ifdef
MPI_CT
- MPI
_
Datatype getMPIDataType (void) const
- { return MPI
_
FLOAT; }
+#ifdef
HAVE_MPI
+ MPI
::
Datatype getMPIDataType (void) const
+ { return MPI
::
FLOAT; }
#endif
};
#endif
};
+
class F64Image
{
public:
Array2dFile<kfloat64> adf;
class F64Image
{
public:
Array2dFile<kfloat64> adf;
-#ifdef
MPI_CT
- MPI
_
Datatype getMPIDataType (void) const
- { return MPI
_
DOUBLE; }
+#ifdef
HAVE_MPI
+ MPI
::
Datatype getMPIDataType (void) const
+ { return MPI
::
DOUBLE; }
#endif
F64Image (const char* const fname, unsigned int nx, unsigned int ny) : adf (fname, nx, ny)
#endif
F64Image (const char* const fname, unsigned int nx, unsigned int ny) : adf (fname, nx, ny)