Changeset 47

Timestamp:

09/05/12 12:50:27 (12 years ago)

Author:

cholod

Message:

Andrew modif. to allow compilation with the ordinary netcdf4 libraries (pb netcdf_par.h)

Location:

trunk/NEMOGCM

Files:

• CONFIG/makenemo (modified) (2 diffs)
• EXTERNAL/XIOS/src/output/onetcdf4.cpp (modified) (2 diffs)
• EXTERNAL/XIOS/src/output/onetcdf4.hpp (modified) (1 diff)

trunk/NEMOGCM/CONFIG/makenemo

@@ -280 +280 @@
 
 #- At this stage the configuration has beeen chosen
-#- We coose the default light file
+#- We choose the default light file
 export USEBLD=bldxioxag.cfg
 
@@ -288 +288 @@
 
 #- and test whether we need to build the ioserver
-#  (To put back with the new ioserver)
-#grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=${USEBLD/xio/}
+grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=${USEBLD/xio/}
 
 #-

trunk/NEMOGCM/EXTERNAL/XIOS/src/output/onetcdf4.cpp

@@ -32 +32 @@
             if (comm != NULL)
             {
-               if (!multifile) CheckError(nc_create_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp));
-               else CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp));
+               if (!multifile) { 
+#ifdef XIOS_NC4_PARALLEL
+                    CheckError(nc_create_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp));
+#else
+                    ERROR("Error: not multifile but ","netcdf4 not compiled with parallel file support");
+#endif
+               } else          {
+                    CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp));
+               }
             }
             else CheckError(nc_create(filename.c_str(), NC_NETCDF4, &this->ncidp));
@@ -41 +48 @@
             if (comm != NULL)
             {
-               if (!multifile) CheckError(nc_open_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp));
-               else CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp));
+               if (!multifile) { 
+#ifdef XIOS_NC4_PARALLEL
+                     CheckError(nc_open_par(filename.c_str(), NC_NETCDF4|NC_MPIIO, *comm, MPI_INFO_NULL, &this->ncidp));
+#else
+                     ERROR("Error: not multifile but ","netcdf4 not compiled with parallel file support");
+#endif
+               } else          {
+                     CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp));
+               }
             }
             else  CheckError(nc_open(filename.c_str(), NC_NETCDF4, &this->ncidp));

trunk/NEMOGCM/EXTERNAL/XIOS/src/output/onetcdf4.hpp

@@ -11 +11 @@
 #define MPI_INCLUDED
 #include <netcdf.h>
+#ifdef XIOS_NC4_PARALLEL
 extern "C" {
 #include <netcdf_par.h>
 }
+#endif