Changeset 1319 for XIOS

Timestamp:

10/26/17 11:02:16 (7 years ago)

Author:

rlacroix

Message:

Fix r1315: The attributes checks were too aggressive and could cause crashes.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (4 diffs)
• trunk/src/node/field.cpp (modified) (4 diffs)

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

@@ -981 +981 @@
     if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform();
 
-     checkAttributes();
-
      const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
      const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
@@ -1053 +1051 @@
          // Check if the data is to be read from a file
          else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
+         {
+           checkAttributes();
            instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,
                                                                                                        detectMissingValues, defaultValue));
+         }
          else // The data might be passed from the model
          {
@@ -1131 +1132 @@
      if (!selfReferenceFilter)
      {
-       checkAttributes();
-
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
        const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
@@ -1139 +1138 @@
        {
          if (!serverSourceFilter)
+         {
+           checkAttributes();
            serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,
                                                                                    detectMissingValues, defaultValue));
+         }
 
          selfReferenceFilter = serverSourceFilter;

XIOS/trunk/src/node/field.cpp

@@ -827 +827 @@
      if (!areAllReferenceSolved) solveAllReferenceEnabledField(false);
 
-     checkAttributes();
-
      const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
      const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
@@ -862 +860 @@
        // Check if the data is to be read from a file
        else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
+       {
+         checkAttributes();
          instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, freq_offset, true,
                                                                                                      detectMissingValues, defaultValue));
+       }
        else // The data might be passed from the model
        {
@@ -939 +940 @@
      if (!selfReferenceFilter)
      {
-       checkAttributes();
-
        const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true);
        const double defaultValue  = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0);
@@ -947 +946 @@
        {
          if (!serverSourceFilter)
+         {
+           checkAttributes();
            serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, freq_offset, true,
                                                                                    detectMissingValues, defaultValue));
+         }
 
          selfReferenceFilter = serverSourceFilter;