Changeset 128 for XMLIO_V2/dev/dev_rv/src/XMLIO/NetCDF4_data_output.hpp

Timestamp:

10/11/10 16:10:10 (14 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/NetCDF4_data_output.hpp (modified) (11 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/NetCDF4_data_output.hpp

@@ -45 +45 @@
             {
                string domid = ((*itt)->name.hasValue()) ? (string)(*itt)->name : (*itt)->getId();
-               string lonid = string("lon_").append(domid);
-               string latid = string("lat_").append(domid);
+               string lonid = (sdom.size() == 1)? string("lon"): string("lon_").append(domid);
+               string latid = (sdom.size() == 1)? string("lat"): string("lat_").append(domid);
                dims[lonid]  = (*itt)->ni;
                dims[latid]  = (*itt)->nj;
@@ -129 +129 @@
 
             Poco::HashMap<string, string> hm;
+            Poco::HashMap<string, float>  hmf;
 
             const std::set<const CDomain*> sdom = this->getRelFile()->getEnabledDomains();
@@ -137 +138 @@
             {
                string domid = ((*itt)->name.hasValue()) ? (string)(*itt)->name : (*itt)->getId();
-               string lonid = string("lon_").append(domid);
-               string latid = string("lat_").append(domid);
+               string lonid = (sdom.size() == 1)? string("lon"): string("lon_").append(domid);
+               string latid = (sdom.size() == 1)? string("lat"): string("lat_").append(domid);
 
                if (!(latVar = dataFile->add_var(latid.c_str(), ncFloat, dataFile->get_dim(latid.c_str()))))
@@ -151 +152 @@
                hm["units"]         = "degrees_north";
                hm["long_name"]     = "Latitude" ;
-               this->addStringAttributesToVar(latVar, hm);
+               hm["nav_model"]     = domid ;
+               if ((*itt)->yvalue.hasValue())
+               {
+                  hmf["valid_min"] = ((Array<double, 1>)(*itt)->yvalue)(0);
+                  hmf["valid_max"] = ((Array<double, 1>)(*itt)->yvalue)(((Array<double, 1>)(*itt)->yvalue).size()-1);
+                  this->addStringAttributesToVar(latVar, hmf);
+                  hmf.clear();
+               }
+               this->addStringAttributesToVar_str(latVar, hm);
                hm.clear();
 
                // Attribut de longitude.
-               hm["axis"]           = "X" ;
-               hm["standard_name"]  = "longitude" ;
-               hm["units"]          = "degrees_east";
-               hm["long_name"]      = "Longitude" ;
-               this->addStringAttributesToVar(lonVar, hm);
+               hm["axis"]          = "X" ;
+               hm["standard_name"] = "longitude" ;
+               hm["units"]         = "degrees_east";
+               hm["long_name"]     = "Longitude" ;
+               hm["nav_model"]     = domid ;
+               if ((*itt)->xvalue.hasValue())
+               {
+                  hmf["valid_min"] = ((Array<double, 1>)(*itt)->xvalue)(0);
+                  hmf["valid_max"] = ((Array<double, 1>)(*itt)->xvalue)(((Array<double, 1>)(*itt)->xvalue).size()-1);
+                  this->addStringAttributesToVar(lonVar, hmf);
+                  hmf.clear();
+               }
+               this->addStringAttributesToVar_str(lonVar, hm);
                hm.clear();
 
@@ -179 +196 @@
                   throw XMLIOUndefinedValueException("Impossible d'ajouter la variable "+ (*it)->getId() +" !");
 
-               hm["axis"] = "Z" ;
+               hm["axis"]     = "Z" ;
+               hm["title"]    = axisid ;
+               hm["positive"] = "unknown" ;
+
                if ((*it)->standard_name.hasValue())hm["standard_name"] = (*it)->standard_name ;
                if ((*it)->long_name.hasValue())    hm["long_name"]     = (*it)->long_name ;
                if ((*it)->unit.hasValue())         hm["units"]         = (*it)->unit;
-               this->addStringAttributesToVar(othvar, hm);
+               if ((*it)->value.hasValue())
+               {
+                  hmf["valid_min"] = ((Array<double, 1>)(*it)->value)(0);
+                  hmf["valid_max"] = ((Array<double, 1>)(*it)->value)(((Array<double, 1>)(*it)->value).size()-1);
+                  this->addStringAttributesToVar(othvar, hmf);
+                  hmf.clear();
+               }
+               this->addStringAttributesToVar_str(othvar, hm);
                hm.clear();
 
@@ -197 +224 @@
             NcVar *var  = NULL;
             Poco::HashMap<string, string> hm;
+            Poco::HashMap<string, float>  hmf;
             bool lonlat = false, wtime = true;
             const std::vector<CField*>& enabledFields = getRelFile()->getEnabledFields();
+            const std::set<const CDomain*> sdom = this->getRelFile()->getEnabledDomains();
 
             std::vector<CField*>::const_iterator it;
@@ -204 +233 @@
             for ( it = enabledFields.begin() ; it != enabledFields.end(); it++ )
             {
-                     CField*  field = (*it);
-               const CField* bfield = (*it)->getBaseObject();
-               const CDomain*  rdom = field->getGrid()->getRelDomain();
-               const CAxis*   raxis = field->getGrid()->getRelAxis();
+                     CField  *  field = (*it);
+               const CField  * bfield = (*it)->getBaseObject();
+               const CDomain *   rdom = field->getGrid()->getRelDomain();
+               const CAxis   *  raxis = field->getGrid()->getRelAxis();
+               FieldOperation*   fope = field->operation.getValue();
+               Duration      *  ffope = field->freq_op.getValue();
 
                string fieldid = (field->name.hasValue()) ? (string)field->name : bfield->getId();
@@ -213 +244 @@
                string axisid  = (raxis->name.hasValue()) ? (string)raxis->name : raxis ->getId();
 
-               string lonid = string("lon_").append(domid); // Nom de la coordonnée longitudinale associée.
-               string latid = string("lat_").append(domid); // Nom de la coordonnée latitudinale  associée.
+               string lonid = (sdom.size() == 1)? string("lon"): string("lon_").append(domid); // Nom de la coordonnée longitudinale associée.
+               string latid = (sdom.size() == 1)? string("lat"): string("lat_").append(domid); // Nom de la coordonnée latitudinale  associée.
 
                lonlat = !field->getGrid()->_hasAxis();
 
-               if (field->operation.hasValue())
+
+               ////////////////////////////////////// A DEPLACER
+               if (fope != NULL)
                { // Si une opération sur le champ est définie ...
-                  if (field->operation.getId().compare("once") == 0)
+                  if (fope->getId().compare("once") == 0)
                   { wtime = false; field->freq_op.setValue(NoneDu); }
                }
@@ -231 +264 @@
                // Si la fréquence d'opération n'est pas définie, on l'initialise à 0s.
                // Une fréquence à 0s signifie que l'opération se fera à chaque écriture de données depuis la simulation.
-               if (!field->freq_op.hasValue())
+               if (ffope == NULL)
                   field->freq_op.setValue(NoneDu);
-               ((FieldOperation)field->operation).setFreqOp(Duration(field->freq_op));
+
+               field->operation.getValue()->setFreqOp(field->freq_op);
+               /////////////////////////////////////////////
 
                tvar = ncFloat;
@@ -271 +306 @@
                }
 
-               if (field->standard_name.hasValue())hm["standard_name"] = field->standard_name ;
-               if (field->long_name.hasValue())    hm["long_name"]     = field->long_name ;
-               if (field->unit.hasValue())         hm["units"]         = field->unit;
-               this->addStringAttributesToVar(var, hm);
+               if (field->standard_name.hasValue())hm["standard_name"]     = field->standard_name ;
+               if (field->long_name.hasValue())    hm["long_name"]         = field->long_name ;
+               if (field->unit.hasValue())         hm["units"]             = field->unit;
+
+               if (field->operation.hasValue())
+               {
+                  hm["online_operation"]   = field->operation.getValue()->getId();
+
+                  if (!field->operation.getValue()->getFreqOp().isNone())
+                     hm["interval_operation"] = field->operation.getValue()->getFreqOp().toString();
+                  else
+                     hm["interval_operation"] = ((Duration)this->getRelFile()->output_freq).toString();
+               }
+               hm["interval_write"] = ((Duration)this->getRelFile()->output_freq).toString();
+
+               this->addStringAttributesToVar_str(var, hm);
                hm.clear();
             }
@@ -281 +328 @@
       private :
 
-         void addStringAttributesToVar(NcVar * const var, const Poco::HashMap<string, string>& attr)
+         template <class U>
+            void addStringAttributesToVar(NcVar * const var, const Poco::HashMap<string, U>& attr)
+         {
+            typename Poco::HashMap<string, U>::ConstIterator it;
+
+            for ( it = attr.begin() ; it != attr.end(); it++ )
+               if (!var->add_att((*it).first.c_str(), (*it).second))
+                  throw XMLIOUndefinedValueException("Impossible d'ajouter l'attribut' "+ (*it).first +" Ã  la variable "+ var->name() +" !");
+         }
+
+         void addStringAttributesToVar_str(NcVar * const var, const Poco::HashMap<string, string>& attr)
          {
             Poco::HashMap<string, string>::ConstIterator it;