Changeset 1280

Timestamp:

09/25/17 16:48:44 (6 years ago)

Author:

oabramkina

Message:

Changing default value of freq_op in case of non-instant operations.

Location:

XIOS/dev/XIOS_DEV_CMIP6

Files:

• bld.cfg (modified) (1 diff)
• src/node/field.cpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/bld.cfg

@@ -31 +31 @@
 bld::lib xios
 bld::target libxios.a 
-bld::target test_remap.exe
+#bld::target test_remap.exe
 bld::target xios_server.exe 
-bld::target test_regular.exe
-bld::target test_xios2_cmip6.exe
+#bld::target test_regular.exe
+#bld::target test_xios2_cmip6.exe
 #bld::target test_new_features.exe test_unstruct_complete.exe 
-bld::target test_remap.exe
-bld::target test_complete.exe
-bld::target test_client.exe
+#bld::target test_remap.exe
+#bld::target test_complete.exe
+#bld::target test_client.exe
 #bld::target test_unstruct_complete.exe
 #bld::target test_unstructured.exe

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

@@ -1572 +1572 @@
        else
        {
-         CContext* context = CContext::getCurrent();
          if (operation.getValue()=="instant")
          {
            freq_op.setValue(file->output_freq.getValue());
-           freq_offset.setValue(file->output_freq.getValue() - TimeStep);
+           freq_offset.setValue(file->output_freq.getValue()-TimeStep);
          }
          else
          {
            freq_op.setValue(TimeStep);
-           freq_op.setValue(NoneDu);
+           freq_offset.setValue(freq_op.getValue()-TimeStep);
          }
        }
@@ -1588 +1587 @@
      {
        if (freq_offset.isEmpty())
-         freq_offset.setValue(NoneDu);
+         freq_offset.setValue(freq_op.getValue()-TimeStep);
      }
    }