Changeset 1272 for XIOS/dev/XIOS_DEV_CMIP6/src
- Timestamp:
- 09/21/17 17:54:45 (7 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/filter/temporal_filter.cpp
r1158 r1272 15 15 , isInstantOperation(functor->timeType() == func::CFunctor::instant) 16 16 // If we can optimize the sampling when dealing with an instant functor we do it 17 , sampling Freq((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq : samplingFreq)18 , sampling Offset((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset)17 , samplingOffset((isInstantOperation && samplingFreq == NoneDu && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset) 18 , samplingFreq((samplingFreq == NoneDu ? (isInstantOperation ? opFreq : initDate.getRelCalendar().getTimeStep()) : samplingFreq)) 19 19 , opFreq(opFreq) 20 20 , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep()) -
XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp
r1263 r1272 1145 1145 1146 1146 if (freq_op.isEmpty()) 1147 freq_op.setValue(TimeStep); 1147 // freq_op.setValue(TimeStep); 1148 freq_op.setValue(NoneDu); 1148 1149 if (freq_offset.isEmpty()) 1149 1150 freq_offset.setValue(NoneDu);
Note: See TracChangeset
for help on using the changeset viewer.