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

Diff of /trunk/escript/src/DataExpanded.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 20  Line 20 
20  #ifdef USE_NETCDF  #ifdef USE_NETCDF
21  #include <netcdfcpp.h>  #include <netcdfcpp.h>
22  #endif  #endif
23  #ifdef PASO_MPI  #ifdef ESYS_MPI
24  #include <mpi.h>  #include <mpi.h>
25  #endif  #endif
26    
# Line 663  DataExpanded::dump(const std::string fil Line 663  DataExpanded::dump(const std::string fil
663     const DataTypes::ShapeType& shape = getShape();     const DataTypes::ShapeType& shape = getShape();
664     int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();     int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();
665     int mpi_num=getFunctionSpace().getDomain()->getMPISize();     int mpi_num=getFunctionSpace().getDomain()->getMPISize();
666  #ifdef PASO_MPI  #ifdef ESYS_MPI
667     MPI_Status status;     MPI_Status status;
668  #endif  #endif
669    
670  #ifdef PASO_MPI  #ifdef ESYS_MPI
671     /* Serialize NetCDF I/O */     /* Serialize NetCDF I/O */
672     if (mpi_iam>0) MPI_Recv(&ndims, 0, MPI_INT, mpi_iam-1, 81801, MPI_COMM_WORLD, &status);     if (mpi_iam>0) MPI_Recv(&ndims, 0, MPI_INT, mpi_iam-1, 81801, MPI_COMM_WORLD, &status);
673  #endif  #endif
# Line 727  DataExpanded::dump(const std::string fil Line 727  DataExpanded::dump(const std::string fil
727       if (! (var->put(d_ptr,dims)) )       if (! (var->put(d_ptr,dims)) )
728          throw DataException("Error - DataExpanded:: copy data to netCDF buffer failed.");          throw DataException("Error - DataExpanded:: copy data to netCDF buffer failed.");
729     }     }
730  #ifdef PASO_MPI  #ifdef ESYS_MPI
731     if (mpi_iam<mpi_num-1) MPI_Send(&ndims, 0, MPI_INT, mpi_iam+1, 81801, MPI_COMM_WORLD);     if (mpi_iam<mpi_num-1) MPI_Send(&ndims, 0, MPI_INT, mpi_iam+1, 81801, MPI_COMM_WORLD);
732  #endif  #endif
733     #else     #else

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

  ViewVC Help
Powered by ViewVC 1.1.26