diff options
| author | goodale <goodale@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2004-04-02 23:54:35 +0000 |
|---|---|---|
| committer | goodale <goodale@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2004-04-02 23:54:35 +0000 |
| commit | 156a5b1ad8da6429b059217d8b42b45fa5b4d84c (patch) | |
| tree | 9b73144f594edd088bc54836a6e7812aa9d0f1ba | |
| parent | 1a193f3468af8738f03417fd8becc1cd428ca2bd (diff) | |
Changes for the Cray X-1
git-svn-id: http://svn.cactuscode.org/arrangements/CactusExternal/FlexIO/trunk@62 21a6bef8-4479-4f54-8f8d-0db94a2919ef
| -rw-r--r-- | src/H5IO.hh | 2 | ||||
| -rw-r--r-- | src/HDFIO.hh | 2 | ||||
| -rw-r--r-- | src/IEEEIO.hh | 2 | ||||
| -rw-r--r-- | src/IO.hh | 2 | ||||
| -rw-r--r-- | src/make.code.defn | 7 |
5 files changed, 11 insertions, 4 deletions
diff --git a/src/H5IO.hh b/src/H5IO.hh index de6f144..891f9bc 100644 --- a/src/H5IO.hh +++ b/src/H5IO.hh @@ -108,7 +108,7 @@ public: #define f_h5_opena F77NAME(h5_opena_,h5_opena,H5_OPENA) extern "C" { -#ifdef CRAY // Note: This isn't really implemented yet... +#if defined(CRAY) && defined(T3E) // Note: This isn't really implemented yet... #include <fortran.h> Long8 f_h5_open(_fcd fcfilename,_fcd accessname); Long8 f_h5_openr(_fcd fcfilename); diff --git a/src/HDFIO.hh b/src/HDFIO.hh index 6840e6c..1f9fcf2 100644 --- a/src/HDFIO.hh +++ b/src/HDFIO.hh @@ -57,7 +57,7 @@ public: #define f_hdf_opena F77NAME(hdf_opena_,hdf_opena,HDF_OPENA) extern "C" { -#ifdef CRAY // Note: This isn't really implemented yet... +#ifdef defined(CRAY) && defined(T3E) // Note: This isn't really implemented yet... #include <fortran.h> Long8 f_hdf_open(_fcd fcfilename,_fcd accessname); Long8 f_hdf_openr(_fcd fcfilename); diff --git a/src/IEEEIO.hh b/src/IEEEIO.hh index 7d2661f..8ad9222 100644 --- a/src/IEEEIO.hh +++ b/src/IEEEIO.hh @@ -688,7 +688,7 @@ int IEEEIO::read(void *data,size_t size){ #define f_ieee_bufon F77NAME(ieee_bufon_,ieee_bufon,IEEE_BUFON) #define f_ieee_bufoff F77NAME(ieee_bufoff_,ieee_bufoff,IEEE_BUFOFF) extern "C"{ -#ifdef CRAY // Note: This isn't really implemented yet... +#if defined(CRAY) && defined(T3E) // Note: This isn't really implemented yet... #include <fortran.h> Long8 f_ieee_open (_fcd fcfilename,_fcd fcaccessmode); Long8 f_ieee_openr (_fcd fcfilename); @@ -113,7 +113,7 @@ extern "C"{ //================Ansi C interface #include "IOProtos.h" //==== f77 interface -#ifdef CRAY +#if defined(CRAY) && defined(T3E) // Cray fortran uses an _fcd data structure to pass strings. This is in preparation // for using this on Crays, but since nobody is using them yet, I've left the code for // these versions of the routines blank. It'll be filled in later if the need arises diff --git a/src/make.code.defn b/src/make.code.defn index 1d95638..ba6ba3a 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -111,6 +111,13 @@ CXXFLAGS += -DANSI -DT3E -DFFIO -hinstantiate=used endif +# CRAY X-1 +ifeq ($(UNAME), UNICOS/mp) + +CXXFLAGS += -DANSI -DFFIO -hinstantiate=used + +endif + # SP ifeq ($(UNAME), AIX) |