Changeset 1319
- Timestamp:
- 10/26/17 11:02:16 (7 years ago)
- Location:
- XIOS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp
r1318 r1319 981 981 if (!isReferenceSolvedAndTransformed) solveAllEnabledFieldsAndTransform(); 982 982 983 checkAttributes();984 985 983 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 986 984 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 1054 1052 else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read) 1053 { 1054 checkAttributes(); 1055 1055 instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true, 1056 1056 detectMissingValues, defaultValue)); 1057 } 1057 1058 else // The data might be passed from the model 1058 1059 { … … 1131 1132 if (!selfReferenceFilter) 1132 1133 { 1133 checkAttributes();1134 1135 1134 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 1136 1135 const double defaultValue = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0); … … 1139 1138 { 1140 1139 if (!serverSourceFilter) 1140 { 1141 checkAttributes(); 1141 1142 serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true, 1142 1143 detectMissingValues, defaultValue)); 1144 } 1143 1145 1144 1146 selfReferenceFilter = serverSourceFilter; -
XIOS/trunk/src/node/field.cpp
r1318 r1319 827 827 if (!areAllReferenceSolved) solveAllReferenceEnabledField(false); 828 828 829 checkAttributes();830 831 829 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 832 830 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 863 861 else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read) 862 { 863 checkAttributes(); 864 864 instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, freq_offset, true, 865 865 detectMissingValues, defaultValue)); 866 } 866 867 else // The data might be passed from the model 867 868 { … … 939 940 if (!selfReferenceFilter) 940 941 { 941 checkAttributes();942 943 942 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 944 943 const double defaultValue = detectMissingValues ? default_value : (!default_value.isEmpty() ? default_value : 0.0); … … 947 946 { 948 947 if (!serverSourceFilter) 948 { 949 checkAttributes(); 949 950 serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, freq_offset, true, 950 951 detectMissingValues, defaultValue)); 952 } 951 953 952 954 selfReferenceFilter = serverSourceFilter;
Note: See TracChangeset
for help on using the changeset viewer.