Changeset 774

Timestamp:

10/30/15 16:33:50 (8 years ago)

Author:

rlacroix

Message:

Fix: Improve the detection of already outputed compressed axis/domain.

Location:

XIOS/trunk/src/io

Files:

• nc4_data_output.cpp (modified) (8 diffs)
• nc4_data_output.hpp (modified) (2 diffs)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -74 +74 @@
          StdString appendDomid  = (singleDomain) ? "" : "_"+domid ;
          if (isWrittenDomain(domid)) return ;
-         else writtenDomains.insert(domid) ;
+         else setWrittenDomain(domid);
 
 
@@ -450 +450 @@
          StdString domid = domain->getDomainOutputName();
          if (isWrittenDomain(domid)) return ;
-         else writtenDomains.insert(domid) ;
+         else setWrittenDomain(domid);
 
          StdString appendDomid  = (singleDomain) ? "" : "_"+domid ;
@@ -637 +637 @@
         StdString axisid = axis->getAxisOutputName();
         if (isWrittenAxis(axisid)) return ;
-        else writtenAxis.insert(axisid) ;
+        else setWrittenAxis(axisid);
 
         try
@@ -830 +830 @@
              {
                CDomain* domain = CDomain::get(domainList[idxDomain]);
+               StdString domId = domain->getDomainOutputName();
+
                if (!domain->isCompressible()
                     || domain->type == CDomain::type_attr::unstructured
-                    || domain->isWrittenCompressed(this->filename))
+                    || domain->isWrittenCompressed(this->filename)
+                    || isWrittenCompressedDomain(domId))
                  continue;
 
-               StdString domId = domain->getDomainOutputName();
                StdString appendDomId  = singleDomain ? "" : "_" + domId;
 
@@ -861 +863 @@
 
                domain->addRelFileCompressed(this->filename);
+               setWrittenCompressedDomain(domId);
                ++idxDomain;
              }
@@ -866 +869 @@
              {
                CAxis* axis = CAxis::get(axisList[idxAxis]);
-               if (!axis->isCompressible() || axis->isWrittenCompressed(this->filename))
+               StdString axisId = axis->getAxisOutputName();
+
+               if (!axis->isCompressible()
+                    || axis->isWrittenCompressed(this->filename)
+                    || isWrittenCompressedAxis(axisId))
                  continue;
 
-               StdString axisId = axis->getAxisOutputName();
                varId = axisId + "_points";
                compress = axisId;
@@ -885 +891 @@
 
                axis->addRelFileCompressed(this->filename);
+               setWrittenCompressedAxis(axisId);
                ++idxAxis;
              }
@@ -1967 +1974 @@
         return it->second;
       }
+
+      ///--------------------------------------------------------------
+
+      bool CNc4DataOutput::isWrittenDomain(const std::string& domainName) const
+      {
+        return (this->writtenDomains.find(domainName) != this->writtenDomains.end());
+      }
+
+      bool CNc4DataOutput::isWrittenCompressedDomain(const std::string& domainName) const
+      {
+        return (this->writtenCompressedDomains.find(domainName) != this->writtenCompressedDomains.end());
+      }
+
+      bool CNc4DataOutput::isWrittenAxis(const std::string& axisName) const
+      {
+        return (this->writtenAxis.find(axisName) != this->writtenAxis.end());
+      }
+
+      bool CNc4DataOutput::isWrittenCompressedAxis(const std::string& axisName) const
+      {
+        return (this->writtenCompressedAxis.find(axisName) != this->writtenCompressedAxis.end());
+      }
+
+      void CNc4DataOutput::setWrittenDomain(const std::string& domainName)
+      {
+        this->writtenDomains.insert(domainName);
+      }
+
+      void CNc4DataOutput::setWrittenCompressedDomain(const std::string& domainName)
+      {
+        this->writtenCompressedDomains.insert(domainName);
+      }
+
+      void CNc4DataOutput::setWrittenAxis(const std::string& axisName)
+      {
+        this->writtenAxis.insert(axisName);
+      }
+
+      void CNc4DataOutput::setWrittenCompressedAxis(const std::string& axisName)
+      {
+        this->writtenCompressedAxis.insert(axisName);
+      }
 } // namespace xios

XIOS/trunk/src/io/nc4_data_output.hpp

@@ -95 +95 @@
             StdString getTimeStamp(void) const;
 
+            bool isWrittenDomain(const std::string& domainName) const;
+            bool isWrittenCompressedDomain(const std::string& domainName) const;
+            bool isWrittenAxis(const std::string& axisName) const;
+            bool isWrittenCompressedAxis(const std::string& axisName) const;
+
+            void setWrittenDomain(const std::string& domainName);
+            void setWrittenCompressedDomain(const std::string& domainName);
+            void setWrittenAxis(const std::string& axisName);
+            void setWrittenCompressedAxis(const std::string& axisName);
+
             /// Propriétés privées ///
             MPI_Comm comm_file;
@@ -100 +110 @@
             std::map<Time, StdSize> timeToRecordCache;
 
-            std::set<std::string> writtenDomains ; 
-            std::set<std::string> writtenAxis ;
-            bool isWrittenDomain(const std::string& domainName) { return this->writtenDomains.find(domainName) != this->writtenDomains.end(); }
-            bool isWrittenAxis(const std::string& axisName) { return this->writtenAxis.find(axisName) != this->writtenAxis.end(); }
+            std::set<std::string> writtenDomains, writtenCompressedDomains;
+            std::set<std::string> writtenAxis, writtenCompressedAxis;
       }; // class CNc4DataOutput