Changeset 1160 for XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp

Timestamp:

06/06/17 19:06:45 (7 years ago)

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

File:

• XIOS/dev/branch_yushan_merged/src/io/onetcdf4.cpp (modified) (7 diffs)

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

@@ -6 +6 @@
 #include "netCdfInterface.hpp"
 #include "netCdfException.hpp"
-#include "timer.hpp"
 // mpi_std.hpp
 
@@ -55 +54 @@
          if (!append || !std::ifstream(filename.c_str()))
          {
-            CTimer::get("Files : create").resume();
             if (wmpi)
                CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL_STD, this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
-            CTimer::get("Files : create").suspend();
- 
+
             this->appendMode = false;
          }
@@ -67 +64 @@
          {
             mode |= NC_WRITE;
-            CTimer::get("Files : open").resume();
             if (wmpi)
                //CNetCdfInterface::openPar(filename, mode, static_cast<MPI_Comm>(comm->mpi_comm), MPI_INFO_NULL_STD, this->ncidp);
@@ -73 +69 @@
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);
-            CTimer::get("Files : open").suspend();
+
             this->appendMode = true;
          }
@@ -87 +83 @@
       void CONetCDF4::close()
       {
-        CTimer::get("Files : close").resume();
         CNetCdfInterface::close(this->ncidp);
-        CTimer::get("Files : close").suspend();
       }
 
@@ -564 +558 @@
 
          this->getWriteDataInfos(name, 0, array_size,  sstart, scount, NULL, NULL);
-
          this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
-
       }
 
@@ -592 +584 @@
 
          this->getWriteDataInfos(name, record, array_size,  sstart, scount, NULL, NULL);
+         if (using_netcdf_internal)
+         {
+           if (!isRoot)
+           {
+             sstart[0] = sstart[0] + 1;
+             scount[0] = 0;
+           }
+         }
          this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
        }
 
-      void CONetCDF4::writeTimeAxisDataBounds(const CArray<double, 1>& data, const StdString& name,
-                                        bool collective, StdSize record, bool isRoot)
-      {
-         int grpid = this->getCurrentGroup();
-         int varid = this->getVariable(name);
-
-         map<int,size_t>::iterator it=timeAxis.find(varid);
-         if (it == timeAxis.end()) timeAxis[varid] = record;
-         else
-         {
-           if (it->second >= record) return;
-           else it->second =record;
-         }
-
-         StdSize array_size = 1;
-         std::vector<StdSize> sstart, scount;
-
-         if (this->wmpi && collective)
-            CNetCdfInterface::varParAccess(grpid, varid, NC_COLLECTIVE);
-         if (this->wmpi && !collective)
-            CNetCdfInterface::varParAccess(grpid, varid, NC_INDEPENDENT);
-
-         this->getWriteDataInfos(name, record, array_size,  sstart, scount, NULL, NULL);
-         this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
-       }
-
-
       //---------------------------------------------------------------