Changeset 352 for XIOS/trunk/src/output

Timestamp:

07/09/12 11:33:05 (12 years ago)

Author:

ymipsl

Message:

 

Location:

XIOS/trunk/src/output

Files:

• nc4_data_output.cpp (modified) (1 diff)
• nc4_data_output.hpp (modified) (2 diffs)
• onetcdf4.cpp (modified) (1 diff)
• onetcdf4.hpp (modified) (1 diff)
• onetcdf4_decl.cpp (added)
• onetcdf4_impl.hpp (added)

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -3 +3 @@
 
 #include <boost/lexical_cast.hpp>
-#include "attribute_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "group_template.hpp"
 
 #include "file.hpp"

XIOS/trunk/src/output/nc4_data_output.hpp

@@ -81 +81 @@
                                      const StdString & units,
                                      const StdString & nav_model);
+/*
             template <class T>
                void writeAxisData(const StdString & axis_name,
@@ -87 +88 @@
                                   const std::vector<StdSize> * start = NULL,
                                   const std::vector<StdSize> * count = NULL);
-
+*/
          private :
 

XIOS/trunk/src/output/onetcdf4.cpp

@@ -1 +1 @@
 #include "onetcdf4.hpp"
-#include "group_template_impl.hpp"
+#include "group_template.hpp"
 
 namespace xios

XIOS/trunk/src/output/onetcdf4.hpp

@@ -126 +126 @@
       ///---------------------------------------------------------------
            
-      template <class T, StdSize ndim>
-         void CONetCDF4::writeData(const ARRAY(T, ndim) data, const StdString & name,
-                                   bool collective, StdSize record,
-                                   const std::vector<StdSize> * start,
-                                   const std::vector<StdSize> * count)
-      {
-         int grpid = this->getCurrentGroup();
-         int varid = this->getVariable(name);
-         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, 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());
-      }
-      
-      //----------------------------------------------------------------
-           
-      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));         
-      }
-     
-      ///---------------------------------------------------------------
 
 } // namespace xios