Changeset 1306

Timestamp:

10/13/17 17:42:10 (7 years ago)

Author:

oabramkina

Message:

Correcting a check on freq_op and freq_offset: if freq_offset is defined it shouldn't be overwritten.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -827 +827 @@
 
         solveGridReference();
-        grid->solveDomainAxisRefInheritance(true); // make it again to solve grid reading from file
 
         if (context->hasClient && !context->hasServer)
@@ -1578 +1577 @@
      if (freq_op.isEmpty())
      {
-/*
-       if (!freq_offset.isEmpty())
-         ERROR("CField::checkAttributes(void)",
-               << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] "
-               << "Attribute freq_offset cannot be defined if attribute freq_op is not defined. "
-               << "Please define freq_op.") */
        if (operation.getValue()=="instant")
-       {
          freq_op.setValue(file->output_freq.getValue());
-         if (freq_offset.isEmpty()) freq_offset.setValue(file->output_freq.getValue()-TimeStep);
-       }
        else
-       {
          freq_op.setValue(TimeStep);
-         if (freq_offset.isEmpty()) freq_offset.setValue(freq_op.getValue()-TimeStep);
-       }
-     }
-     else
-     {
-       if (freq_offset.isEmpty())
-         freq_offset.setValue(freq_op.getValue()-TimeStep);
-     }
+     }
+     if (freq_offset.isEmpty())
+       freq_offset.setValue(freq_op.getValue()-TimeStep);
    }