/[escript]/trunk/escript/src/DataFactory.cpp
ViewVC logotype

Diff of /trunk/escript/src/DataFactory.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3258 by jfenwick, Thu Jan 28 02:03:15 2010 UTC revision 3259 by jfenwick, Mon Oct 11 01:48:14 2010 UTC
# Line 21  Line 21 
21  #ifdef USE_NETCDF  #ifdef USE_NETCDF
22  #include <netcdfcpp.h>  #include <netcdfcpp.h>
23  #endif  #endif
24  #ifdef PASO_MPI  #ifdef ESYS_MPI
25  #include <mpi.h>  #include <mpi.h>
26  #endif  #endif
27    
# Line 185  load(const std::string fileName, Line 185  load(const std::string fileName,
185     NcError err(NcError::silent_nonfatal);     NcError err(NcError::silent_nonfatal);
186     int mpi_iam=0, mpi_num=1;     int mpi_iam=0, mpi_num=1;
187     // Create the file.     // Create the file.
188  #ifdef PASO_MPI  #ifdef ESYS_MPI
189     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_iam);
190     MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);     MPI_Comm_size(MPI_COMM_WORLD, &mpi_num);
191  #endif  #endif

Legend:
Removed from v.3258  
changed lines
  Added in v.3259

  ViewVC Help
Powered by ViewVC 1.1.26