Ignore:
Timestamp:
05/18/17 17:40:03 (7 years ago)
Author:
yushan
Message:

test_remap back to work. No thread for now

Location:
XIOS/dev/branch_yushan_merged/src/io
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/branch_yushan_merged/src/io/inetcdf4.cpp

    r1134 r1138  
    44 
    55#include <boost/algorithm/string.hpp> 
     6// mpi_std.hpp 
     7#ifdef _usingEP 
     8#include "ep_declaration.hpp" 
     9#endif 
    610 
    711namespace xios 
    … …  
    1822    } 
    1923    mpi = comm && !multifile; 
    20     MPI_Info m_info; 
     24    MPI_Info m_info = MPI_INFO_NULL_STD; 
    2125 
    2226    // The file format will be detected automatically by NetCDF, it is safe to always set NC_MPIIO 

  • XIOS/dev/branch_yushan_merged/src/io/inetcdf4.hpp

    r1134 r1138  
    1313#define UNLIMITED_DIM (size_t)(-1) 
    1414#endif  // UNLIMITED_DIM 
     15 
    1516 
    1617namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/inetcdf4_decl.cpp

    r782 r1138  
    11#include "inetcdf4_impl.hpp" 
     2// mpi_std.hpp 
    23 
    34namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/inetcdf4_impl.hpp

    r782 r1138  
    44#include "inetcdf4.hpp" 
    55#include "netCdfInterface.hpp" 
     6// mpi_std.hpp 
    67 
    78namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_input.cpp

    r1064 r1138  
    88#include "scalar.hpp" 
    99 
     10// mpi.hpp 
     11 
    1012namespace xios 
    1113{ 
    12   CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/) 
     14  CNc4DataInput::CNc4DataInput(const StdString& filename, ::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/) 
    1315    : SuperClass() 
    1416    , SuperClassWriter(filename, &comm_file, multifile, timeCounterName) 

  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_input.hpp

    r967 r1138  
    66#include "data_input.hpp" 
    77#include "inetcdf4.hpp" 
     8// mpi_std.hpp 
    89 
    910namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.cpp

    r1134 r1138  
    1212#include "exception.hpp" 
    1313#include "uuid.hpp" 
     14// mpi.hpp 
    1415 
    1516namespace xios 
    … …  
    2829      CNc4DataOutput::CNc4DataOutput 
    2930         (CFile* file, const StdString & filename, bool exist, bool useClassicFormat, bool useCFConvention, 
    30           ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName) 
     31          ::MPI_Comm comm_file, bool multifile, bool isCollective, const StdString& timeCounterName) 
    3132            : SuperClass() 
    3233            , SuperClassWriter(filename, exist, useClassicFormat, useCFConvention, &comm_file, multifile, timeCounterName) 
    … …  
    463464      StdString domainName = domain->name; 
    464465      domain->assignMesh(domainName, domain->nvertex); 
    465       domain->mesh->createMeshEpsilon(static_cast<MPI_Comm>(server->intraComm.mpi_comm), domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv); 
     466      domain->mesh->createMeshEpsilon(static_cast< ::MPI_Comm >(server->intraComm.mpi_comm), domain->lonvalue_srv, domain->latvalue_srv, domain->bounds_lon_srv, domain->bounds_lat_srv); 
    466467 
    467468      StdString node_x = domainName + "_node_x"; 

  • XIOS/dev/branch_yushan_merged/src/io/nc4_data_output.hpp

    r1134 r1138  
    66#include "onetcdf4.hpp" 
    77#include "data_output.hpp" 
     8// mpi_std.hpp 
    89 
    910namespace xios 
    … …  
    2627            CNc4DataOutput 
    2728               (CFile* file, const StdString & filename, bool exist, bool useClassicFormat, 
    28                 bool useCFConvention, 
    29                 ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective = true, 
    30                 const StdString& timeCounterName = "time_counter"); 
     29                bool useCFConvention, MPI_Comm comm_file, bool multifile,  
     30                bool isCollective = true, const StdString& timeCounterName = "time_counter"); 
    3131 
    3232            CNc4DataOutput(const CNc4DataOutput & dataoutput);       // Not implemented. 
    … …  
    116116 
    117117            /// Propriétés privées /// 
    118             ep_lib::MPI_Comm comm_file; 
     118            MPI_Comm comm_file; 
    119119            const StdString filename; 
    120120            std::map<Time, StdSize> timeToRecordCache; 

  • XIOS/dev/branch_yushan_merged/src/io/netCdfInterface.cpp

    r1050 r1138  
    1010#include "netCdfInterface.hpp" 
    1111#include "netCdfException.hpp" 
     12// mpi_std.hpp 
    1213 
    1314namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/netCdfInterface_decl.cpp

    r1050 r1138  
    99 
    1010#include "netCdfInterface_impl.hpp" 
     11// mpi_std.hpp 
    1112 
    1213namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/netCdfInterface_impl.hpp

    r833 r1138  
    1313#include "netCdfInterface.hpp" 
    1414#include "netCdfException.hpp" 
     15// mpi_std.hpp 
    1516 
    1617namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/netCdf_cf_constant.hpp

    r782 r1138  
    44#include "inetcdf4.hpp" 
    55#include "netCdfInterface.hpp" 
     6 
     7// mpi_std.hpp 
    68 
    79namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/netcdf.hpp

    r1134 r1138  
    3030namespace xios 
    3131{ 
    32   inline int nc_create_par(const char *path, int cmode, ep_lib::MPI_Comm comm, MPI_Info info,int *ncidp) 
     32  inline int nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,int *ncidp) 
    3333  { 
    3434#if defined(USING_NETCDF_PAR) 
    35     return ::nc_create_par(path, cmode, static_cast<MPI_Comm>(comm.mpi_comm), info, ncidp) ; 
     35    return ::nc_create_par(path, cmode, comm, info, ncidp) ; 
    3636#else 
    3737    ERROR("int nc_create_par(const char *path, int cmode, MPI_Comm comm, MPI_Info info,int *ncidp)", 
    … …  
    4141  } 
    4242 
    43   inline int nc_open_par(const char *path, int mode, ep_lib::MPI_Comm comm, MPI_Info info,int *ncidp) 
     43  inline int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp) 
    4444  { 
    4545#if defined(USING_NETCDF_PAR) 
    46     return ::nc_open_par(path, mode, static_cast<MPI_Comm>(comm.mpi_comm), info, ncidp) ; 
     46    return ::nc_open_par(path, mode, comm, info, ncidp) ; 
    4747#else 
    4848    ERROR("int nc_open_par(const char *path, int mode, MPI_Comm comm, MPI_Info info,int *ncidp)", 

  • XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp

    r1134 r1138  
    66#include "netCdfInterface.hpp" 
    77#include "netCdfException.hpp" 
     8// mpi_std.hpp 
    89 
    910namespace xios 
    … …  
    1213 
    1314      CONetCDF4::CONetCDF4(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention,  
    14                            const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 
     15                           const MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 
    1516        : path() 
    1617        , wmpi(false) 
    … …  
    3031 
    3132      void CONetCDF4::initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention,  
    32                                  const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 
     33                                 const MPI_Comm* comm, bool multifile, const StdString& timeCounterName) 
    3334      { 
    3435         this->useClassicFormat = useClassicFormat; 
    … …  
    5455         { 
    5556            if (wmpi) 
    56                CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp);            
     57               //CNetCdfInterface::createPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp);            
     58               CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp);            
    5759            else 
    5860               CNetCdfInterface::create(filename, mode, this->ncidp); 
    … …  
    6466            mode |= NC_WRITE; 
    6567            if (wmpi) 
    66                CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp); 
     68               //CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp); 
     69               CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp); 
    6770            else 
    6871               CNetCdfInterface::open(filename, mode, this->ncidp); 

  • XIOS/dev/branch_yushan_merged/src/io/onetcdf4.hpp

    r1134 r1138  
    1414#endif  //UNLIMITED_DIM 
    1515 
     16// mpi_std.hpp 
     17 
    1618namespace xios 
    1719{ 
    … …  
    2830            CONetCDF4(const StdString& filename, bool append, bool useClassicFormat = false, 
    2931                          bool useCFConvention = true, 
    30                       const ep_lib::MPI_Comm* comm = NULL, bool multifile = true, 
     32                      const MPI_Comm* comm = NULL, bool multifile = true, 
    3133                      const StdString& timeCounterName = "time_counter"); 
    3234 
    … …  
    3739            /// Initialisation /// 
    3840            void initialize(const StdString& filename, bool append, bool useClassicFormat, bool useCFConvention, 
    39                             const ep_lib::MPI_Comm* comm, bool multifile, const StdString& timeCounterName); 
     41                            const MPI_Comm* comm, bool multifile, const StdString& timeCounterName); 
    4042            void close(void); 
    4143            void sync(void); 

  • XIOS/dev/branch_yushan_merged/src/io/onetcdf4_decl.cpp

    r1050 r1138  
    11#include "onetcdf4_impl.hpp" 
     2// mpi_std.hpp 
    23 
    34namespace xios 

  • XIOS/dev/branch_yushan_merged/src/io/onetcdf4_impl.hpp

    r1050 r1138  
    44#include "onetcdf4.hpp" 
    55#include "netCdfInterface.hpp" 
     6 
     7// mpi_std.hpp 
    68 
    79namespace xios 
Note: See TracChangeset for help on using the changeset viewer.