Changeset 1292
- Timestamp:
- 10/04/17 23:16:30 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp
r1280 r1292 1145 1145 1146 1146 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 1147 1147 checkAttributes() ; 1148 1148 boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, 1149 1149 CContext::getCurrent()->getCalendar()->getInitDate(), … … 1183 1183 1184 1184 const bool detectMissingValues = (!detect_missing_value.isEmpty() && !default_value.isEmpty() && detect_missing_value == true); 1185 1185 checkAttributes() ; 1186 1186 boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, 1187 1187 CContext::getCurrent()->getCalendar()->getInitDate(), … … 1565 1565 if (freq_op.isEmpty()) 1566 1566 { 1567 /* 1567 1568 if (!freq_offset.isEmpty()) 1568 1569 ERROR("CField::checkAttributes(void)", 1569 1570 << "[ id = " << this->getId() << " , context = '" << CObjectFactory::GetCurrentContextId() << " ] " 1570 1571 << "Attribute freq_offset cannot be defined if attribute freq_op is not defined. " 1571 << "Please define freq_op.") 1572 << "Please define freq_op.") */ 1573 if (operation.getValue()=="instant") 1574 { 1575 freq_op.setValue(file->output_freq.getValue()); 1576 if (freq_offset.isEmpty()) freq_offset.setValue(file->output_freq.getValue()-TimeStep); 1577 } 1572 1578 else 1573 1579 { 1574 if (operation.getValue()=="instant") 1575 { 1576 freq_op.setValue(file->output_freq.getValue()); 1577 freq_offset.setValue(file->output_freq.getValue()-TimeStep); 1578 } 1579 else 1580 { 1581 freq_op.setValue(TimeStep); 1582 freq_offset.setValue(freq_op.getValue()-TimeStep); 1583 } 1580 freq_op.setValue(TimeStep); 1581 if (freq_offset.isEmpty()) freq_offset.setValue(freq_op.getValue()-TimeStep); 1584 1582 } 1585 1583 }
Note: See TracChangeset
for help on using the changeset viewer.