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

Timestamp:

05/24/11 08:21:57 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/output

Files:

• nc4_data_output.cpp (modified) (6 diffs)
• nc4_data_output.hpp (modified) (1 diff)
• onetcdf4.hpp (modified) (2 diffs)

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

@@ -67 +67 @@
          if (domain->isEmpty()) return;
 
+         int dvm = 1;
+
          std::vector<StdString> dim0, dim1;
          StdString domid     = (!domain->name.isEmpty())
@@ -101 +103 @@
                SuperClassWriter::addDimension(lonid_loc, domain->zoom_ni_loc.getValue());
                SuperClassWriter::addDimension(latid_loc, domain->zoom_nj_loc.getValue());
-               this->writeLocalAttributes(domain->ibegin.getValue(), domain->iend.getValue(),
-                                          domain->jbegin.getValue(), domain->jend.getValue(),
+               this->writeLocalAttributes(domain->zoom_ibegin_loc.getValue(),
+                                          domain->zoom_ni_loc.getValue(),
+                                          domain->zoom_jbegin_loc.getValue(),
+                                          domain->zoom_nj_loc.getValue(),
                                           domid);
                if (isCurvilinear)
@@ -131 +135 @@
                   domain->data_ibegin.getValue(),
                   domain->data_jbegin.getValue()*/);
+                  
+               SuperClassWriter::setDefaultValue(maskid, &dvm);
 
                SuperClassWriter::definition_end();
@@ -224 +230 @@
          bool wtime   = !(!field->operation.isEmpty() &&
                          ( field->operation.getValue().compare("once") == 0));
-
+                         
          if (wtime) dims.push_back(timeid);
 
@@ -278 +284 @@
                         ("interval_write", field->getRelFile()->output_freq.getValue(), &fieldid);
                }
+               
+               if (!field->default_value.isEmpty())
+               {
+                  double default_value = field->default_value.getValue();
+                  float fdefault_value = (float)default_value;
+                  if (type == NC_DOUBLE)
+                     SuperClassWriter::setDefaultValue(fieldid, &default_value);
+                  else
+                     SuperClassWriter::setDefaultValue(fieldid, &fdefault_value);
+               }
+               else
+               {
+                  double * default_value = NULL;
+                  SuperClassWriter::setDefaultValue(fieldid, default_value);
+               }             
 
                {  // Ecriture des coordonnées
@@ -381 +402 @@
       
       void CNc4DataOutput::writeLocalAttributes
-         (int ibegin, int iend, int jbegin, int jend, StdString domid)
+         (int ibegin, int ni, int jbegin, int nj, StdString domid)
       {
          SuperClassWriter::addAttribute(StdString("ibegin_").append(domid), ibegin);
-         SuperClassWriter::addAttribute(StdString("iend_"  ).append(domid), iend);
+         SuperClassWriter::addAttribute(StdString("ni_"    ).append(domid), ni);
          SuperClassWriter::addAttribute(StdString("jbegin_").append(domid), jbegin);
-         SuperClassWriter::addAttribute(StdString("jend_"  ).append(domid), jend);
+         SuperClassWriter::addAttribute(StdString("nj_"    ).append(domid), nj);
       }
 

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

@@ -52 +52 @@
          protected :
          
-            void writeLocalAttributes(int ibegin, int iend, int jbegin, int jend, StdString domid);
+            void writeLocalAttributes(int ibegin, int ni, int jbegin, int nj, StdString domid);
 
             void writeFileAttributes(const StdString & name,

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

@@ -53 +53 @@
       //----------------------------------------------------------------
          public :
+         
+            template <class T>
+               void setDefaultValue(const StdString & varname, const T * value = NULL);
          
             template <class T>
@@ -137 +140 @@
          this->writeData_(grpid, varid, sstart, scount, data->data());
       }
+      
+      //----------------------------------------------------------------
+           
+      template <class T>
+         void CONetCDF4::setDefaultValue(const StdString & varname, const T * value)
+      {
+         int grpid = this->getCurrentGroup();
+         int varid = this->getVariable(varname);
+         
+         if (value != NULL)
+         {
+            CheckError(nc_def_var_fill(grpid, varid, 0, value));
+            this->addAttribute(StdString("missing_value"), *value, &varname);
+         }
+         else
+            CheckError(nc_def_var_fill(grpid, varid, 1, NULL));         
+      }
      
       ///---------------------------------------------------------------