Changeset 1097 for XIOS

Timestamp:

04/14/17 14:34:32 (7 years ago)

Author:

ymipsl

Message:

Expected performance enhancement when using append mode.
Instead to read the whole time axis, only the last record is read first, and eventually continue until to reach the record corresponding to the current timestep.
(currently untested)

YM

Location:

XIOS/trunk/src/io

Files:

• nc4_data_output.cpp (modified) (1 diff)
• onetcdf4.cpp (modified) (1 diff)
• onetcdf4.hpp (modified) (1 diff)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -2743 +2743 @@
 
           CArray<double,2> timeAxisBounds;
-          SuperClassWriter::getTimeAxisBounds(timeAxisBounds, timeAxisBoundsId, isCollective);
-          timeAxisBounds*=factorUnit ;
+          std::vector<StdSize> dimSize(SuperClassWriter::getDimensions(timeAxisBoundsId)) ;
           
           StdSize record = 0;
           double dtime(time);
-          for (int n = timeAxisBounds.extent(1) - 1; n >= 0; n--)
+          for (StdSize n = dimSize[0] - 1; n >= 0; n--)
           {
-            if (timeAxisBounds(1, n) < dtime)
+            SuperClassWriter::getTimeAxisBounds(timeAxisBounds, timeAxisBoundsId, isCollective, n);
+            timeAxisBounds*=factorUnit ;
+            if (timeAxisBounds(1, 0) < dtime)
             {
               record = n + 1;

XIOS/trunk/src/io/onetcdf4.cpp

@@ -247 +247 @@
       }
 
-      //---------------------------------------------------------------
+      void CONetCDF4::getTimeAxisBounds(CArray<double,2>& timeAxisBounds, const StdString& name, bool collective, size_t record)
+      {
+        int grpid = this->getCurrentGroup();
+        int varid = this->getVariable(name);
+
+        std::vector<StdSize> start(2), count(2);
+        start[0] = record;
+        count[0] = 1 ;
+        start[1] = 0;
+        count[1] = 2;
+
+        timeAxisBounds.resize(2, 1);
+
+        if (this->wmpi && collective)
+          CNetCdfInterface::varParAccess(grpid, varid, NC_COLLECTIVE);
+        if (this->wmpi && !collective)
+          CNetCdfInterface::varParAccess(grpid, varid, NC_INDEPENDENT);
+
+        CNetCdfInterface::getVaraType(grpid, varid, &start[0], &count[0], timeAxisBounds.dataFirst());
+      }
+
+
 
       const CONetCDF4::CONetCDF4Path& CONetCDF4::getCurrentPath(void) const

XIOS/trunk/src/io/onetcdf4.hpp

@@ -97 +97 @@
             const StdString& getTimeCounterName(void) const { return timeCounterName; };
 
-            void getTimeAxisBounds(CArray<double,2>& timeAxisBounds, const StdString& name, bool collective);
+            void getTimeAxisBounds(CArray<double,2>& timeAxisBounds, const StdString& name, bool collective );
+            void getTimeAxisBounds(CArray<double,2>& timeAxisBounds, const StdString& name, bool collective, size_t record);
 
             bool varExist(const StdString& varname);