Changeset 265 for XMLIO_V2/dev/dev_rv/src/xmlio/output

Timestamp:

09/06/11 11:57:45 (13 years ago)

Author:

hozdoba

Message:

Corrections après tests sur titane

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/output

Files:

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

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ +1 @@
+
 #include "nc4_data_output.hpp"
 
@@ -137 +138 @@
                   domain->data_jbegin.getValue()*/);
                   
-               SuperClassWriter::setDefaultValue(maskid, &dvm);
+               //SuperClassWriter::setDefaultValue(maskid, &dvm);
 
                SuperClassWriter::definition_end();
@@ -223 +224 @@
                              ? field->name.getValue() : field->getBaseFieldReference()->getId();
 
-         unsigned int ssize = domain->ni.getValue() * domain->nj.getValue();
+         unsigned int ssize = domain->zoom_ni_loc.getValue() * domain->zoom_nj_loc.getValue();
          bool isCurvilinear = (domain->lonvalue.getValue()->size() == ssize);
 
@@ -380 +381 @@
          if (grid->hasAxis()) // 3D
          {
-            ARRAY(double, 3) field_data3D;            
+            ARRAY(double, 3) field_data3D (new CArray<double,3>(grid->getLocalShape()/*, boost::c_storage_order()*/));            
             grid->outputField(field_data, field_data3D);
-            SuperClassWriter::writeData(field_data3D, fieldid, true, 0);
+            SuperClassWriter::writeData(field_data3D, fieldid, true, field->getNStep()-1);
             
          }
          else // 2D
          {
-            ARRAY(double, 3) field_data2D;
+            ARRAY(double, 2) field_data2D (new CArray<double, 2>(grid->getLocalShape()/*, boost::c_storage_order()*/));
             grid->outputField(field_data,  field_data2D);
-            SuperClassWriter::writeData(field_data2D, fieldid, true, 0);
+            SuperClassWriter::writeData(field_data2D, fieldid, true, field->getNStep()-1);
          }
       }

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.cpp

@@ -142 +142 @@
       }
       
+      StdString CONetCDF4::getUnlimitedDimensionName(void)
+      {
+         char full_name_in[NC_MAX_NAME +1];
+         int grpid = this->getGroup(path);
+         int dimid = this->getUnlimitedDimension();
+                              
+         if (dimid == -1) return (std::string());
+            CheckError(nc_inq_dimname(grpid, dimid, full_name_in));
+                                          
+         StdString dimname(full_name_in);
+         return (dimname);
+      }
+      
       //---------------------------------------------------------------
       
@@ -166 +179 @@
          return (retvalue);
       }
+
+      std::vector<std::string> CONetCDF4::getDimensionsIdList (const std::string * _varname)
+      {
+         char full_name_in[NC_MAX_NAME +1];
+         int nbdim = 0, *dimid = NULL;
+         int grpid = this->getCurrentGroup();
+         int varid = (_varname != NULL) ? this->getVariable(*_varname) : NC_GLOBAL;
+         std::vector<std::string> retvalue;
+                                   
+         if (_varname != NULL)
+         {
+            CheckError(nc_inq_varndims(grpid, varid, &nbdim));
+            dimid = new int[nbdim]();
+            CheckError(nc_inq_vardimid(grpid, varid, dimid));
+         }
+         else
+         {
+            CheckError(nc_inq_dimids(grpid, &nbdim, NULL, 1));
+            dimid = new int[nbdim]();
+            CheckError(nc_inq_dimids(grpid, NULL, dimid, 1));
+         }
+                                        
+         for (int i = 0; i < nbdim; i++)
+         {
+            CheckError(nc_inq_dimname(grpid, dimid[i], full_name_in));
+            std::string dimname(full_name_in);
+            retvalue.push_back(dimname);
+         }
+         delete [] dimid;
+                                                                                                                                                      
+         return (retvalue);
+      }
+
 
       //---------------------------------------------------------------
@@ -271 +317 @@
                                         const std::vector<StdSize> * start,
                                         const std::vector<StdSize> * count)
-      {
-         std::vector<StdSize> sizes = this->getDimensions(name);       
-         std::vector<StdSize>::const_iterator
+      {   
+         std::vector<std::size_t> sizes  = this->getDimensions(name);
+         std::vector<std::string> iddims = this->getDimensionsIdList (&name);   
+         std::vector<std::size_t>::const_iterator
             it  = sizes.begin(), end = sizes.end();
          int i = 0;
+      
+         if (iddims.begin()->compare(this->getUnlimitedDimensionName()) == 0)
+         {
+            sstart.push_back(record);
+            scount.push_back(1); 
+            if ((start == NULL) &&
+                (count == NULL)) i++;
+            it++;
+         }
 
          for (;it != end; it++)
-         {
-            StdSize  s = *it;
+         {      
             if ((start != NULL) && (count != NULL))
             {
-               if (s == UNLIMITED_DIM)
-               {
-                  sstart.push_back(record);
-                  scount.push_back(1);
-               }
-               else
-               {
-                  sstart.push_back((*start)[i]);
-                  scount.push_back((*count)[i]);
-                  array_size *= (*count)[i];
-                  i++;
-               }
+               sstart.push_back((*start)[i]);
+               scount.push_back((*count)[i]);
+               array_size *= (*count)[i];
+               i++;
             }
             else
             {
-               if (s == UNLIMITED_DIM)
-               {
-                  sstart.push_back(record);
-                  scount.push_back(1);
-               }
-               else
-               {
-                  sstart.push_back(0);
-                  scount.push_back(sizes[i]);
-                  array_size *= sizes[i];
-               }
+               sstart.push_back(0);
+               scount.push_back(sizes[i]);
+               array_size *= sizes[i];
                i++;
             }
          }
+         
+         
+//         for (StdSize u = 0; u < sstart.size(); u++)
+//            std::cout << "(" << sstart[u] << "," << scount[u]  << ")" ;
+//         std::cout << std::endl;
       }
 

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp

@@ -12 +12 @@
 #define MPI_INCLUDED
 #include <netcdf.h>
-extern "C"
-{
+extern "C" {
 #include <netcdf_par.h>
 }
@@ -95 +94 @@
             int getVariable(const StdString & varname);
             int getDimension(const StdString & dimname);
-            std::vector<StdSize> getDimensions(const StdString & varname);
-            int getUnlimitedDimension(void);
+            std::vector<StdSize>   getDimensions       (const StdString & varname);
+            std::vector<StdString> getDimensionsIdList (const StdString * varname);
+            int       getUnlimitedDimension(void);
+            StdString getUnlimitedDimensionName(void);
 
             bool varExist(const StdString & varname);
@@ -145 +146 @@
          this->getWriteDataInfos
          (name, record, array_size,  sstart, scount, start, count);
+         if (data->num_elements() != array_size)
+         {
+            ERROR("CONetCDF4::writeData(...)",
+                  << "[ input array size = "  << data->num_elements()
+                  << ", intern array size = " << array_size
+                  << " ] Invalid input data !" );
+         }
+         
          this->writeData_(grpid, varid, sstart, scount, data->data());
       }