Changeset 1542 for XIOS/trunk/src/node/field.cpp
- Timestamp:
- 06/13/18 16:48:53 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/node/field.cpp
r1524 r1542 219 219 // Gather all data from different clients 220 220 recvDataSrv.resize(storeClient.numElements()); 221 recvFoperationSrv = boost::shared_ptr<func::CFunctor>(new func::CInstant(recvDataSrv));221 recvFoperationSrv = std::shared_ptr<func::CFunctor>(new func::CInstant(recvDataSrv)); 222 222 } 223 223 … … 716 716 //---------------------------------------------------------------- 717 717 718 boost::shared_ptr<COutputPin> CField::getInstantDataFilter()718 std::shared_ptr<COutputPin> CField::getInstantDataFilter() 719 719 { 720 720 return instantDataFilter; … … 984 984 << "An operation must be defined for field \"" << getId() << "\"."); 985 985 986 boost::shared_ptr<func::CFunctor> functor;986 std::shared_ptr<func::CFunctor> functor; 987 987 CArray<double, 1> dummyData; 988 988 … … 1027 1027 { 1028 1028 if (!instantDataFilter) 1029 instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,true));1029 instantDataFilter = clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,true)); 1030 1030 1031 1031 … … 1035 1035 if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write)) 1036 1036 { 1037 fileServerWriterFilter = boost::shared_ptr<CFileServerWriterFilter>(new CFileServerWriterFilter(gc, this));1037 fileServerWriterFilter = std::shared_ptr<CFileServerWriterFilter>(new CFileServerWriterFilter(gc, this)); 1038 1038 instantDataFilter->connectOutput(fileServerWriterFilter, 0); 1039 1039 } … … 1043 1043 { 1044 1044 if (!instantDataFilter) 1045 instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true));1045 instantDataFilter = clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true)); 1046 1046 1047 1047 // If the field data is to be read by the client or/and written to a file … … 1050 1050 if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write)) 1051 1051 { 1052 fileWriterFilter = boost::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));1052 fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this)); 1053 1053 instantDataFilter->connectOutput(fileWriterFilter, 0); 1054 1054 } … … 1064 1064 { 1065 1065 boost::scoped_ptr<IFilterExprNode> expr(parseExpr(getExpression() + '\0')); 1066 boost::shared_ptr<COutputPin> filter = expr->reduce(gc, *this);1066 std::shared_ptr<COutputPin> filter = expr->reduce(gc, *this); 1067 1067 1068 1068 // Check if a spatial transformation is needed … … 1073 1073 if (grid && grid != gridRef && grid->hasTransform()) 1074 1074 { 1075 std::pair< boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue);1075 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = CSpatialTransformFilter::buildFilterGraph(gc, gridRef, grid, detectMissingValues, defaultValue); 1076 1076 1077 1077 filter->connectOutput(filters.first, 0); … … 1089 1089 { 1090 1090 checkTimeAttributes(); 1091 instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,1091 instantDataFilter = serverSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true, 1092 1092 detectMissingValues, defaultValue)); 1093 1093 } … … 1095 1095 { 1096 1096 if (check_if_active.isEmpty()) check_if_active = false; 1097 instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, false, NoneDu, false,1097 instantDataFilter = clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, false, NoneDu, false, 1098 1098 detectMissingValues, defaultValue)); 1099 1099 } … … 1105 1105 if (!read_access.isEmpty() && read_access) 1106 1106 { 1107 storeFilter = boost::shared_ptr<CStoreFilter>(new CStoreFilter(gc, CContext::getCurrent(), grid,1107 storeFilter = std::shared_ptr<CStoreFilter>(new CStoreFilter(gc, CContext::getCurrent(), grid, 1108 1108 detectMissingValues, defaultValue)); 1109 1109 instantDataFilter->connectOutput(storeFilter, 0); … … 1112 1112 if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write)) 1113 1113 { 1114 fileWriterFilter = boost::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));1114 fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this)); 1115 1115 getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0); 1116 1116 } … … 1126 1126 * \return the output pin corresponding to the field reference 1127 1127 */ 1128 boost::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc)1128 std::shared_ptr<COutputPin> CField::getFieldReference(CGarbageCollector& gc) 1129 1129 { 1130 1130 if (instantDataFilter || field_ref.isEmpty()) … … 1135 1135 fieldRef->buildFilterGraph(gc, false); 1136 1136 1137 std::pair< boost::shared_ptr<CFilter>, boost::shared_ptr<CFilter> > filters;1137 std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters; 1138 1138 // Check if a spatial transformation is needed 1139 1139 if (grid && grid != fieldRef->grid && grid->hasTransform()) … … 1144 1144 } 1145 1145 else 1146 filters.first = filters.second = boost::shared_ptr<CFilter>(new CPassThroughFilter(gc));1146 filters.first = filters.second = std::shared_ptr<CFilter>(new CPassThroughFilter(gc)); 1147 1147 1148 1148 fieldRef->getInstantDataFilter()->connectOutput(filters.first, 0); … … 1160 1160 * \return the output pin corresponding to a self reference 1161 1161 */ 1162 boost::shared_ptr<COutputPin> CField::getSelfReference(CGarbageCollector& gc)1162 std::shared_ptr<COutputPin> CField::getSelfReference(CGarbageCollector& gc) 1163 1163 { 1164 1164 if (instantDataFilter || !hasExpression()) … … 1176 1176 { 1177 1177 checkTimeAttributes(); 1178 serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true,1178 serverSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, freq_offset, true, 1179 1179 detectMissingValues, defaultValue)); 1180 1180 } … … 1193 1193 { 1194 1194 if (check_if_active.isEmpty()) check_if_active = false; 1195 clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, NoneDu, false,1195 clientSourceFilter = std::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, NoneDu, false, 1196 1196 detectMissingValues, defaultValue)); 1197 1197 } … … 1213 1213 * \return the output pin corresponding to the requested temporal filter 1214 1214 */ 1215 boost::shared_ptr<COutputPin> CField::getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)1216 { 1217 std::map<CDuration, boost::shared_ptr<COutputPin> >::iterator it = temporalDataFilters.find(outFreq);1215 std::shared_ptr<COutputPin> CField::getTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq) 1216 { 1217 std::map<CDuration, std::shared_ptr<COutputPin> >::iterator it = temporalDataFilters.find(outFreq); 1218 1218 1219 1219 if (it == temporalDataFilters.end()) … … 1226 1226 1227 1227 const bool detectMissingValues = (!detect_missing_value.isEmpty() && detect_missing_value == true); 1228 boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,1228 std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, 1229 1229 CContext::getCurrent()->getCalendar()->getInitDate(), 1230 1230 freq_op, freq_offset, outFreq, detectMissingValues)); … … 1247 1247 */ 1248 1248 1249 boost::shared_ptr<COutputPin> CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq)1249 std::shared_ptr<COutputPin> CField::getSelfTemporalDataFilter(CGarbageCollector& gc, CDuration outFreq) 1250 1250 { 1251 1251 if (instantDataFilter || !hasExpression()) … … 1264 1264 1265 1265 const bool detectMissingValues = (!detect_missing_value.isEmpty() && detect_missing_value == true); 1266 boost::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation,1266 std::shared_ptr<CTemporalFilter> temporalFilter(new CTemporalFilter(gc, operation, 1267 1267 CContext::getCurrent()->getCalendar()->getInitDate(), 1268 1268 freq_op, freq_offset, outFreq, detectMissingValues));
Note: See TracChangeset
for help on using the changeset viewer.