Changeset 5977

Timestamp:

11/10/21 15:26:34 (2 years ago)

Author:

ymipsl

Message:

Better management when writing slice of ensemble

YM

Location:

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src

Files:

• config/axis_attribute.conf (modified) (1 diff)
• io/nc4_data_output.cpp (modified) (1 diff)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/config/axis_attribute.conf

@@ -14 +14 @@
 DECLARE_ATTRIBUTE(int,       n_glo)
 DECLARE_ENUM2(positive, up, down)
-DECLARE_ENUM4(axis_type, X, Y, Z, T)
+DECLARE_ENUM5(axis_type, X, Y, Z, T, E)
 
 DECLARE_ATTRIBUTE(StdString, dim_name)

CONFIG_DEVT/IPSLCM6.5_work_ENSEMBLES/modeles/XIOS/src/io/nc4_data_output.cpp

@@ -2634 +2634 @@
                 }
 
+                
                 // suppose first dim is dedicated for ensemble
-                double defaultValue=field->default_value ;
+                std::vector<StdString> axisList   = grid->getAxisList();
+                if (!axisList.empty())
+                {
+                  CAxis* axis = CAxis::get(axisList[axisList.size() - 1]);
+                  if (axis->axis_type == CAxis::axis_type_attr::E)
+                  {
+                    start[0] = axis->data_begin ;
+                    count[0] = axis->data_n ; 
+                  }
+                }  
                 size_t slice=1 ;
                 for(int i=1 ; i<count.size() ; i++) slice=slice*count[i] ;
-                
-                size_t nEnsemble=count[0] ;
-                size_t pos=0 ;
-                start[0] = 0 ;
-                count[0] = 0 ;
-                for(size_t i=0 ; i<nEnsemble ; i++)
-                {
-                  bool allMissing=true ;
-                  for (size_t j=0 ; j<slice ; j++,pos++)
-                    if (fieldData(pos)!=defaultValue) { allMissing=false ; break;}
-                  if (allMissing) 
-                  {
-                    if (count[0]==0) start[0]++ ;
-                    else break ;
-                  }
-                  else count[0]++ ;  
-                }  
-
                 CArray<double,1> newData(fieldData.dataFirst()+start[0]*slice,shape(count[0]*slice),neverDeleteData) ;
-                info(0)<<"write data parameter  "<<fieldid<<"  "<<field->getNStep()<<"  start : " ;
-                for(auto it : start) info(0)<<" "<<it ;
-                info(0)<<"  count : " ; 
-                for(auto it : count) info(0)<<"  "<<it ;
-                info(0)<<endl ; 
-                 
+               
+                ostringstream str ;
+                str<<"write data parameter  "<<fieldid<<"  "<<field->getNStep()<<"  start : " ;
+                for(auto it : start) str<<" "<<it ;
+                str<<"  count : " ; 
+                for(auto it : count) str<<"  "<<it ;
+                info(0)<<str.str()<<endl ;  
+                cout<<str.str()<<endl ;
                 CTimer::get("Files : writing data").resume();
+                double t0=CTimer::getTime();
                 SuperClassWriter::writeData(newData, fieldid, isCollective, field->getNStep() - 1, &start, &count);
+                double t1=CTimer::getTime();
+                double dataSize=1 ;
+                for(auto it : count) dataSize*=it ;
+                info(0)<<"Field "<<fieldid<<" : size "<<dataSize<<"  --> Bandwith "<<dataSize/(t1-t0)/(1024*1024)*4<<" Mb/s"<<endl  ;
+
                 CTimer::get("Files : writing data").suspend();