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

Timestamp:

05/24/11 17:47:01 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio/output

Files:

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

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

@@ -5 +5 @@
 
 #include "file.hpp"
+#include "calendar.hpp"
 
 namespace xmlioserver
@@ -231 +232 @@
                          ( field->operation.getValue().compare("once") == 0));
                          
-         if (wtime) dims.push_back(timeid);
+         if (wtime)
+         {
+            StdOStringStream oss;
+            oss << "time_" << field->operation.getValue()
+                << "_" << field->getRelFile()->output_freq.getValue();
+
+            coodinates.push_back(oss.str());
+            dims.push_back(timeid);
+         }
 
          if (!grid->axis_ref.isEmpty())
@@ -385 +394 @@
 
       //---------------------------------------------------------------
+
+      void CNc4DataOutput::writeTimeAxis_
+                  (const boost::shared_ptr<tree::CField>    field,
+                   const boost::shared_ptr<date::CCalendar> cal)
+      {
+         StdOStringStream oss;
+         oss << "time_" << field->operation.getValue()
+             << "_" << field->getRelFile()->output_freq.getValue();
+
+         std::vector<StdString> dims;
+         StdString axisid = oss.str();
+         StdString timeid = StdString("time_counter");
+
+         dims.push_back(timeid);
+         if (!SuperClassWriter::varExist(axisid))
+         {
+            SuperClassWriter::addVariable(axisid, NC_DOUBLE, dims);
+            this->writeTimeAxisAttributes(axisid,
+                                         cal->getId(),
+                                         "lol",
+                                         "lol");
+         }
+
+      }
+
+      //---------------------------------------------------------------
+      
+      void CNc4DataOutput::writeTimeAxisAttributes(const StdString & axis_name,
+                                                   const StdString & calendar,
+                                                   const StdString & units,
+                                                   const StdString & time_origin,
+                                                   const StdString & standard_name,
+                                                   const StdString & long_name,
+                                                   const StdString & title)
+      {
+         SuperClassWriter::addAttribute("standard_name", standard_name, &axis_name);
+         SuperClassWriter::addAttribute("long_name",     long_name    , &axis_name);
+         SuperClassWriter::addAttribute("title",         title        , &axis_name);
+         SuperClassWriter::addAttribute("calendar",      calendar     , &axis_name);
+         SuperClassWriter::addAttribute("units",         units        , &axis_name);
+         SuperClassWriter::addAttribute("time_origin",   time_origin  , &axis_name);
+      }
+      
+      //---------------------------------------------------------------
+
       void CNc4DataOutput::writeAxisAttributes(const StdString & axis_name,
                                                const StdString & axis,

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

@@ -43 +43 @@
 
             /// Ecriture ///
-            virtual void writeDomain_    (const boost::shared_ptr<tree::CDomain> domain);
-            virtual void writeAxis_      (const boost::shared_ptr<tree::CAxis>   axis);
-            virtual void writeField_     (const boost::shared_ptr<tree::CField>  field);
-            virtual void writeFieldData_ (const boost::shared_ptr<tree::CField>  field);
-            virtual void writeFile_      (const boost::shared_ptr<tree::CFile>   file);
-
+            virtual void writeDomain_    (const boost::shared_ptr<tree::CDomain>   domain);
+            virtual void writeAxis_      (const boost::shared_ptr<tree::CAxis>     axis);
+            virtual void writeField_     (const boost::shared_ptr<tree::CField>    field);
+            virtual void writeFieldData_ (const boost::shared_ptr<tree::CField>    field);
+            virtual void writeFile_      (const boost::shared_ptr<tree::CFile>     file);
+            virtual void writeTimeAxis_  (const boost::shared_ptr<tree::CField>    field,
+                                          const boost::shared_ptr<date::CCalendar> cal);
 
          protected :
          
             void writeLocalAttributes(int ibegin, int ni, int jbegin, int nj, StdString domid);
+
+            void writeTimeAxisAttributes(const StdString & axis_name,
+                                         const StdString & calendar,
+                                         const StdString & units,
+                                         const StdString & time_origin,
+                                         const StdString & standard_name = StdString("time"),
+                                         const StdString & long_name     = StdString("Time axis"),
+                                         const StdString & title         = StdString("Time"));
 
             void writeFileAttributes(const StdString & name,

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

@@ -356 +356 @@
       }
 
+      //---------------------------------------------------------------
+      
+      bool CONetCDF4::varExist(const StdString & varname)
+      {
+         int varid = 0;
+         int grpid = this->getCurrentGroup();
+         return (nc_inq_varid (grpid, varname.c_str(), &varid) == NC_NOERR);
+      }
+
       ///--------------------------------------------------------------
    } // namespace io

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

@@ -92 +92 @@
             std::vector<StdSize> getDimensions(const StdString & varname);
             int getUnlimitedDimension(void);
-            
+
+            bool varExist(const StdString & varname);
+
       //----------------------------------------------------------------