Changeset 189 for XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.cpp

Timestamp:

05/06/11 10:15:47 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.cpp (modified) (15 diffs)

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

@@ -14 +14 @@
          this->initialize(filename, exist, comm);
       }
-
+      
+      //---------------------------------------------------------------
+      
       CONetCDF4::CONetCDF4
          (const StdString & filename, bool exist, const comm::MPIComm * comm, bool)
@@ -29 +31 @@
          }
       }
-
+      
+      //---------------------------------------------------------------
+      
       CONetCDF4::~CONetCDF4(void)
       {
@@ -57 +61 @@
          }
       }
-
+      
+      //---------------------------------------------------------------
+      
       void CONetCDF4::definition_start(void)
-      { CheckError(nc_redef(this->ncidp)); }
-
+      { 
+         CheckError(nc_redef(this->ncidp));
+      }
+      
+      //---------------------------------------------------------------
+      
       void CONetCDF4::definition_end(void)
-      { CheckError(nc_enddef(this->ncidp)); }
-
+      { 
+         CheckError(nc_enddef(this->ncidp));
+      }
+      
+      //---------------------------------------------------------------
+      
       void CONetCDF4::CheckError(int status)
       {
@@ -75 +89 @@
 
       //---------------------------------------------------------------
+      
       int CONetCDF4::getCurrentGroup(void)
       {
          return (this->getGroup(this->getCurrentPath()));
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::getGroup(const CONetCDF4Path & path)
       {
@@ -94 +111 @@
          return (retvalue);
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::getVariable(const StdString & varname)
       {
@@ -102 +121 @@
          return (varid);
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::getDimension(const StdString & dimname)
       {
@@ -110 +131 @@
          return (dimid);
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::getUnlimitedDimension(void)
       {
@@ -118 +141 @@
          return (dimid);
       }
-
+      
+      //---------------------------------------------------------------
+      
       std::vector<StdSize> CONetCDF4::getDimensions(const StdString & varname)
       {
@@ -159 +184 @@
          return (retvalue);
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::addDimension(const StdString& name, const StdSize size)
       {
@@ -170 +197 @@
          return (retvalue);
       }
-
+      
+      //---------------------------------------------------------------
+      
       int CONetCDF4::addVariable(const StdString & name, nc_type type,
                                   const std::vector<StdString> & dim)
@@ -201 +230 @@
          //CheckError(nc_put_att_string(grpid, varid, name.c_str(), 1, &str));
       }
-
+      
+      //---------------------------------------------------------------
+      
       template <>
          void CONetCDF4::addAttribute
@@ -210 +241 @@
          CheckError(nc_put_att_double(grpid, varid, name.c_str(), NC_DOUBLE,1, &value));
       }
-
+      
+      //---------------------------------------------------------------
+      
       template <>
          void CONetCDF4::addAttribute
@@ -219 +252 @@
          CheckError(nc_put_att_float(grpid, varid, name.c_str(), NC_FLOAT, 1, &value));
       }
-
+      
+      //---------------------------------------------------------------
+      
       template <>
          void CONetCDF4::addAttribute
@@ -278 +313 @@
       }
 
-      template <>
-         void CONetCDF4::writeData(const ARRAY(double, 1) data, const StdString & name,
-                                   bool collective, StdSize record,
-                                   const std::vector<StdSize> * start,
-                                   const std::vector<StdSize> * count)
+      //---------------------------------------------------------------
+
+      template <>
+         void CONetCDF4::writeData_(int grpid, int varid,
+                                    const std::vector<StdSize> & sstart,
+                                    const std::vector<StdSize> & scount, double * data)
+      {
+         CheckError(nc_put_vara_double(grpid, varid, &(sstart[0]), &(scount[0]), data));
+      }
+      
+      //---------------------------------------------------------------
+      
+      template <>
+         void CONetCDF4::writeData_(int grpid, int varid,
+                                    const std::vector<StdSize> & sstart,
+                                    const std::vector<StdSize> & scount, int * data)
+      {
+          CheckError(nc_put_vara_int(grpid, varid, &(sstart[0]), &(scount[0]), data));
+      }
+      
+      //---------------------------------------------------------------
+      
+      template <>
+         void CONetCDF4::writeData_(int grpid, int varid,
+                                    const std::vector<StdSize> & sstart,
+                                    const std::vector<StdSize> & scount, float * data)
+      {
+          CheckError(nc_put_vara_float(grpid, varid, &(sstart[0]), &(scount[0]), data));
+      }
+
+      //---------------------------------------------------------------
+
+      void CONetCDF4::writeData(const ARRAY(int, 2) data, const StdString & name)
       {
          int grpid = this->getCurrentGroup();
@@ -289 +352 @@
          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);
-         CheckError(nc_put_vara_double(grpid, varid, &(sstart[0]), &(scount[0]), data->data()));
-      }
-
-      template <>
-         void CONetCDF4::writeData(const ARRAY(int, 1) 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);
-          CheckError(nc_put_vara_int(grpid, varid, &(sstart[0]), &(scount[0]), data->data()));
-      }
-
-      template <>
-         void CONetCDF4::writeData(const ARRAY(float, 1) 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);
-          CheckError(nc_put_vara_float(grpid, varid, &(sstart[0]), &(scount[0]), data->data()));
-      }
-
-      void CONetCDF4::writeData(const ARRAY(int, 2) data, const StdString & name)
-      {
-         int grpid = this->getCurrentGroup();
-         int varid = this->getVariable(name);
-         StdSize array_size = 1;
-         std::vector<StdSize> sstart, scount;
-
          this->getWriteDataInfos(name, 0, array_size,  sstart, scount, NULL, NULL);
-          CheckError(nc_put_vara_int(grpid, varid, &(sstart[0]), &(scount[0]), data->data()));
+         this->writeData_(grpid, varid, sstart, scount, data->data());
       }