Changeset 1869 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.cpp

Timestamp:

04/15/20 13:23:39 (4 years ago)

Author:

ymipsl

Message:

Some update...

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.cpp

@@ -145 +145 @@
    TRY
    {
-      if (!this->enabledFields.empty())
-         return (this->enabledFields);
-
-      const int _outputlevel =
-         (!output_level.isEmpty()) ? output_level.getValue() : default_outputlevel;
+      if (!this->enabledFields.empty()) return (this->enabledFields);
+
+      const int _outputlevel = (!output_level.isEmpty()) ? output_level.getValue() : default_outputlevel;
       std::vector<CField*>::iterator it;
       this->enabledFields = this->getAllFields();
@@ -176 +174 @@
 
          newEnabledFields.push_back(*it);
-         // Le champ est finalement actif, on y ajoute la rfrence au champ de base.
-         (*it)->setRelFile(CFile::get(this));
       }
       enabledFields = newEnabledFields;
@@ -256 +252 @@
       {
          CField* field = *it;         
-         std::vector<CAxis*> vecAxis = field->grid->getAxis();
+         std::vector<CAxis*> vecAxis = field->getGrid()->getAxis();
          for (size_t i = 0; i < vecAxis.size(); ++i)
            setAxis.insert(vecAxis[i]->getAxisOutputName());
-         std::vector<CDomain*> vecDomains = field->grid->getDomains();
+         std::vector<CDomain*> vecDomains = field->getGrid()->getDomains();
          for (size_t i = 0; i < vecDomains.size(); ++i)
            setDomains.insert(vecDomains[i]->getDomainOutputName());
@@ -300 +296 @@
       {
          CField* field = *it;
-         bool nullGrid = (0 == field->grid);
-         allZoneEmpty &= nullGrid ? false : !field->grid->doGridHaveDataToWrite();
+         bool nullGrid = (nullptr == field->getGrid());
+         allZoneEmpty &= nullGrid ? false : !field->getGrid()->doGridHaveDataToWrite();
       }