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

Diff of /trunk/escript/src/DataTagged.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  #include "DataMaths.h"  #include "DataMaths.h"
# Line 783  DataTagged::dump(const std::string fileN Line 783  DataTagged::dump(const std::string fileN
783     DataTypes::ShapeType shape = getShape();     DataTypes::ShapeType shape = getShape();
784     int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();     int mpi_iam=getFunctionSpace().getDomain()->getMPIRank();
785     int mpi_num=getFunctionSpace().getDomain()->getMPISize();     int mpi_num=getFunctionSpace().getDomain()->getMPISize();
786  #ifdef PASO_MPI  #ifdef ESYS_MPI
787     MPI_Status status;     MPI_Status status;
788  #endif  #endif
789    
790  #ifdef PASO_MPI  #ifdef ESYS_MPI
791     /* Serialize NetCDF I/O */     /* Serialize NetCDF I/O */
792     if (mpi_iam>0) MPI_Recv(&ndims, 0, MPI_INT, mpi_iam-1, 81803, MPI_COMM_WORLD, &status);     if (mpi_iam>0) MPI_Recv(&ndims, 0, MPI_INT, mpi_iam-1, 81803, MPI_COMM_WORLD, &status);
793  #endif  #endif
# Line 862  DataTagged::dump(const std::string fileN Line 862  DataTagged::dump(const std::string fileN
862      esysUtils::free(tags);      esysUtils::free(tags);
863          throw DataException("Error - DataTagged:: copy data to netCDF buffer failed.");          throw DataException("Error - DataTagged:: copy data to netCDF buffer failed.");
864     }     }
865  #ifdef PASO_MPI  #ifdef ESYS_MPI
866     if (mpi_iam<mpi_num-1) MPI_Send(&ndims, 0, MPI_INT, mpi_iam+1, 81803, MPI_COMM_WORLD);     if (mpi_iam<mpi_num-1) MPI_Send(&ndims, 0, MPI_INT, mpi_iam+1, 81803, MPI_COMM_WORLD);
867  #endif  #endif
868     #else     #else

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

  ViewVC Help
Powered by ViewVC 1.1.26