Changeset 1872 for XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.cpp

Timestamp:

04/23/20 16:04:22 (4 years ago)

Author:

ymipsl

Message:

Some update on XIOS_COUPLING branch...

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.cpp (modified) (14 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.cpp

@@ -2144 +2144 @@
 
             if (field->compression_level.isEmpty())
-              field->compression_level = field->file->compression_level.isEmpty() ? 0 : field->file->compression_level;
+              field->compression_level = field->getRelFile()->compression_level.isEmpty() ? 0 : field->getRelFile()->compression_level;
             SuperClassWriter::setCompressionLevel(fieldid, field->compression_level);
 
@@ -2374 +2374 @@
         if (!field->wasWritten())
         {
-          if (appendMode && field->file->record_offset.isEmpty() && 
+          if (appendMode && field->getRelFile()->record_offset.isEmpty() && 
               field->getOperationTimeType() != func::CFunctor::once)
           {
             double factorUnit;
-            if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
+            if (!field->getRelFile()->time_units.isEmpty() && field->getRelFile()->time_units==CFile::time_units_attr::days)
             factorUnit=context->getCalendar()->getDayLengthInSeconds() ;
             else factorUnit=1 ;
@@ -2439 +2439 @@
           }
 
-          if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days)
+          if (!field->getRelFile()->time_units.isEmpty() && field->getRelFile()->time_units==CFile::time_units_attr::days)
           {
             double secByDay=context->getCalendar()->getDayLengthInSeconds() ;
@@ -2678 +2678 @@
 
          StdString strTimeUnits ;
-         if (!field->file->time_units.isEmpty() && field->file->time_units==CFile::time_units_attr::days) strTimeUnits="days since " ;
+         if (!field->getRelFile()->time_units.isEmpty() && field->getRelFile()->time_units==CFile::time_units_attr::days) strTimeUnits="days since " ;
          else  strTimeUnits="seconds since " ;
  
@@ -2685 +2685 @@
 
 
-         if (field->file->time_counter.isEmpty())
+         if (field->getRelFile()->time_counter.isEmpty())
          {
            if (timeCounterType==none) createTimeCounterAxis=true ;
@@ -2699 +2699 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::instant)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::instant)
          {
            if (field->hasTimeCentered)
@@ -2712 +2712 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::centered)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::centered)
          {
            if (field->hasTimeCentered)
@@ -2725 +2725 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::instant_exclusive)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::instant_exclusive)
          {
            if (field->hasTimeCentered)
@@ -2737 +2737 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::centered_exclusive)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::centered_exclusive)
          {
            if (field->hasTimeCentered)
@@ -2749 +2749 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::exclusive)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::exclusive)
          {
            if (field->hasTimeCentered)
@@ -2770 +2770 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::none)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::none)
          {
            if (field->hasTimeCentered)
@@ -2781 +2781 @@
            }
          }
-         else if (field->file->time_counter==CFile::time_counter_attr::record)
+         else if (field->getRelFile()->time_counter==CFile::time_counter_attr::record)
          {
            if (timeCounterType==none) createTimeCounterAxis=true ;
@@ -2852 +2852 @@
                 SuperClassWriter::addAttribute("axis", string("T"), &axisId);
 
-                if (field->file->time_counter.isEmpty() || 
-                   (field->file->time_counter != CFile::time_counter_attr::record))
+                if (field->getRelFile()->time_counter.isEmpty() || 
+                   (field->getRelFile()->time_counter != CFile::time_counter_attr::record))
                 {
                   CDate timeOrigin = cal->getTimeOrigin();
@@ -2865 +2865 @@
 
              // Adding time_counter_bound dimension
-             if (field->file->time_counter.isEmpty() || (field->file->time_counter != CFile::time_counter_attr::record))
+             if (field->getRelFile()->time_counter.isEmpty() || (field->getRelFile()->time_counter != CFile::time_counter_attr::record))
              {
                 if (!SuperClassWriter::varExist(axisBoundId))