Changeset 989 for XIOS/trunk/src

Timestamp:

11/16/16 14:53:20 (7 years ago)

Author:

mhnguyen

Message:

Allowing fields to have its own time_counter value if time_counter is not defined for file
(Credit to Yann)
+) time_counter of field is based on its operation time

Test
+) On Curie
+) Work

Location:

XIOS/trunk/src

Files:

• io/nc4_data_output.cpp (modified) (12 diffs)
• node/field.cpp (modified) (2 diffs)
• node/field.hpp (modified) (1 diff)
• node/file.cpp (modified) (1 diff)

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -21 +21 @@
             , filename(filename)
       {
-    SuperClass::type = MULTI_FILE;
+        SuperClass::type = MULTI_FILE;
       }
 
@@ -33 +33 @@
             , isCollective(isCollective)
       {
-    SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE;
+        SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE;
       }
 
@@ -1760 +1760 @@
        if (SuperClassWriter::useCFConvention)
              this->writeFileAttributes(filename, description,
-                                       StdString("CF-1.5"),
+                                       StdString("CF-1.6"),
                                        StdString("An IPSL model"),
                                        this->getTimeStamp());
@@ -1961 +1961 @@
             time_data_bound(1) = lastWrite;
           }
-
-          if (field->file->time_counter == CFile::time_counter_attr::instant)
+          
+          if (field->file->time_counter.isEmpty())
+            if (field->hasTimeInstant && !field->hasTimeCentered)
+              time_counter(0) = lastWrite;
+            else 
+              time_counter(0) = (lastWrite + lastLastWrite) / 2;
+
+          else if (field->file->time_counter == CFile::time_counter_attr::instant)
             time_counter(0) = lastWrite;
           else if (field->file->time_counter == CFile::time_counter_attr::centered)
@@ -1970 +1976 @@
 
 
-          if (field->file->time_counter == CFile::time_counter_attr::instant)
+          if (field->file->time_counter.isEmpty())
+            if (field->hasTimeInstant && !field->hasTimeCentered)
+              time_counter_bound(0) = time_counter_bound(1) = lastWrite;
+            else 
+            {
+              time_counter_bound(0) = lastLastWrite;
+              time_counter_bound(1) = lastWrite;
+            }          
+          else if (field->file->time_counter == CFile::time_counter_attr::instant)
             time_counter_bound(0) = time_counter_bound(1) = lastWrite;
           else if (field->file->time_counter == CFile::time_counter_attr::centered)
@@ -2019 +2033 @@
                    SuperClassWriter::writeData(time_data, timeAxisId, isCollective, field->getNStep() - 1);
                    SuperClassWriter::writeData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1);
-                   if (field->file->time_counter != CFile::time_counter_attr::none)
+                   if (field->file->time_counter.isEmpty() ||  
+                      (field->file->time_counter != CFile::time_counter_attr::none))
                    {
                      SuperClassWriter::writeData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1);
-                     if (field->file->time_counter != CFile::time_counter_attr::record)
+                     if (field->file->time_counter.isEmpty() || 
+                        (field->file->time_counter != CFile::time_counter_attr::record))
                        SuperClassWriter::writeData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1);
                    }
@@ -2155 +2171 @@
                    SuperClassWriter::writeTimeAxisData(time_data, timeAxisId, isCollective, field->getNStep() - 1, isRoot);
                    SuperClassWriter::writeTimeAxisData(time_data_bound, timeAxisBoundId, isCollective, field->getNStep() - 1, isRoot);
-                   if (field->file->time_counter != CFile::time_counter_attr::none)
+                   if (field->file->time_counter.isEmpty() || 
+                      (field->file->time_counter != CFile::time_counter_attr::none))
                    {
                      SuperClassWriter::writeTimeAxisData(time_counter, getTimeCounterName(), isCollective, field->getNStep() - 1, isRoot);
-                     if (field->file->time_counter != CFile::time_counter_attr::record)
+                     if (field->file->time_counter.isEmpty() ||  
+                        (field->file->time_counter != CFile::time_counter_attr::record))
                        SuperClassWriter::writeTimeAxisData(time_counter_bound, timeBoundId, isCollective, field->getNStep() - 1, isRoot);
                    }
@@ -2199 +2217 @@
          StdString timeid(getTimeCounterName());
          StdString timeBoundId("axis_nbounds");
-
+ 
          if (field->getOperationTimeType() == func::CFunctor::instant)
          {
             axisid = "time_instant";
             axisBoundId = "time_instant_bounds";
-         }
+            field->hasTimeInstant = true;                   
+         }
+
+         if (field->getOperationTimeType() == func::CFunctor::centered)
+         {
+            field->hasTimeCentered = true;            
+         }          
 
          try
@@ -2236 +2260 @@
            }
 
-           if (field->file->time_counter != CFile::time_counter_attr::none)
+           if (field->file->time_counter.isEmpty() ||  
+              (field->file->time_counter != CFile::time_counter_attr::none))
            {
              // Adding time_counter
@@ -2248 +2273 @@
                 SuperClassWriter::addAttribute("axis", string("T"), &axisid);
 
-                if (field->file->time_counter != CFile::time_counter_attr::record)
+                if (field->file->time_counter.isEmpty() || 
+                   (field->file->time_counter != CFile::time_counter_attr::record))
                 {
                   CDate timeOrigin = cal->getTimeOrigin();
@@ -2260 +2286 @@
 
              // Adding time_counter_bound dimension
-             if (field->file->time_counter != CFile::time_counter_attr::record)
+             if (field->file->time_counter.isEmpty() ||  
+                (field->file->time_counter != CFile::time_counter_attr::record))
              {
                 if (!SuperClassWriter::varExist(axisBoundId))
@@ -2435 +2462 @@
            SuperClassWriter::addAttribute("title"      , description);
            SuperClassWriter::addAttribute("Conventions", conventions);
-           SuperClassWriter::addAttribute("production" , production);
+           // SuperClassWriter::addAttribute("production" , production);
            SuperClassWriter::addAttribute("timeStamp"  , timeStamp);
          }

XIOS/trunk/src/node/field.cpp

@@ -37 +37 @@
       , useCompressedOutput(false)
       , isReadDataRequestPending(false)
+      , hasTimeInstant(false)
+      , hasTimeCentered(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 
@@ -48 +50 @@
       , useCompressedOutput(false)
       , isReadDataRequestPending(false)
+      , hasTimeInstant(false)
+      , hasTimeCentered(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 

XIOS/trunk/src/node/field.hpp

@@ -204 +204 @@
          bool useCompressedOutput;
 
+         // Two variable to identify the time_counter meta data written in file, which has no time_counter
+         bool hasTimeInstant;
+         bool hasTimeCentered;
+
          DECLARE_REF_FUNC(Field,field)
 

XIOS/trunk/src/node/file.cpp

@@ -260 +260 @@
       if (allDomainEmpty) MPI_Comm_free(&fileComm);
 
-      if (time_counter.isEmpty()) time_counter.setValue(time_counter_attr::centered);
+      // if (time_counter.isEmpty()) time_counter.setValue(time_counter_attr::centered);
       if (time_counter_name.isEmpty()) time_counter_name = "time_counter";
     }