Changeset 413 for XIOS/trunk

Timestamp:

01/19/13 19:31:15 (11 years ago)

Author:

ymipsl

Message:

Performance improvment on Lustre

YM

Location:

XIOS/trunk/src/output

Files:

• nc4_data_output.cpp (modified) (4 diffs)
• onetcdf4.cpp (modified) (3 diffs)
• onetcdf4.hpp (modified) (2 diffs)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -527 +527 @@
          CContext* context = CContext::getCurrent() ;
 //          if (field->getRelFile()->isSyncTime()) SuperClassWriter::sync() ;
+         CContextServer* server=context->server ;
 
          CGrid* grid = field->grid ;
@@ -543 +544 @@
              
          CArray<double,1> time_data(1) ;
+         
          if (field->operation.getValue()=="instant") time_data(0) = Time(*field->last_Write_srv)
                                                                       -Time(context->calendar->getTimeOrigin());
          else time_data(0) = (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2
                                -Time(context->calendar->getTimeOrigin());
+         
+         
+         bool isRoot ;
+         if (server->intraCommRank==0) isRoot=true ;
+         else isRoot=false ;
            
          if (grid->hasAxis()) // 3D
@@ -578 +585 @@
                  }
                  SuperClassWriter::writeData(field_data3D, fieldid, isCollective, field->getNStep()-1,&start,&count );
-                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1 );
+                 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot );
                  break;
               }
@@ -613 +620 @@
 
                  SuperClassWriter::writeData(field_data2D, fieldid, isCollective, field->getNStep()-1,&start,&count);
-                 SuperClassWriter::writeData(time_data, oss.str(), isCollective, field->getNStep()-1);
-                 break;
+                 SuperClassWriter::writeTimeAxisData(time_data, oss.str(), isCollective, field->getNStep()-1,isRoot);
+                 break; 
               
               }

XIOS/trunk/src/output/onetcdf4.cpp

@@ -350 +350 @@
             it  = sizes.begin(), end = sizes.end();
          int i = 0;
-      
+         cout<<"nc Size -->"<<sizes.size()<<endl ;
          if (iddims.begin()->compare(this->getUnlimitedDimensionName()) == 0)
          {
@@ -379 +379 @@
          
       }
-
-      //---------------------------------------------------------------
-
+      
+                     
+ 
       template <>
          void CONetCDF4::writeData_(int grpid, int varid,
@@ -425 +425 @@
          this->writeData_(grpid, varid, sstart, scount, data.dataFirst());
       }
+
+      void CONetCDF4::writeTimeAxisData(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)
+         CheckError(nc_var_par_access(grpid, varid, NC_COLLECTIVE));
+         if (this->wmpi && !collective)
+         CheckError(nc_var_par_access(grpid, varid, NC_INDEPENDENT));
+         
+         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());
+       }
 
       //---------------------------------------------------------------

XIOS/trunk/src/output/onetcdf4.hpp

@@ -64 +64 @@
                               const std::vector<StdSize> * count = NULL);
 
-            void writeData(const CArray<int, 2>& data, const StdString & name);
-
+            void writeData(const CArray<int, 2>& data, const StdString & name);     
+            void writeTimeAxisData(const CArray<double,1>& data, const StdString & name,
+                                   bool collective, StdSize record, bool Isroot) ;
             /// Accesseur ///
             const CONetCDF4Path & getCurrentPath(void) const;
@@ -115 +116 @@
             int ncidp;
             bool wmpi;
-
+            map<int,size_t> timeAxis ;
       }; // class CONetCDF4