Changeset 1544 for XIOS/dev/branch_openmp/src/io
- Timestamp:
- 06/14/18 13:42:14 (6 years ago)
- Location:
- XIOS/dev/branch_openmp/src/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/branch_openmp/src/io/nc4_data_input.cpp
r1491 r1544 193 193 */ 194 194 195 //if (!SuperClassWriter::isRectilinear(fieldId)) 196 if (true) 197 { 198 for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it) 195 for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it) 199 196 listDimSize.push_front(*dimSizeMap.find(*it)); 200 }201 else202 {203 std::list<StdString> coords = SuperClassWriter::getCoordinatesIdList(fieldId);204 std::list<StdString>::const_iterator itCoord = coords.begin();205 for (; itCoord != coords.end(); itCoord++)206 {207 const StdString& coord = *itCoord;208 if (SuperClassWriter::hasVariable(coord) && !SuperClassWriter::isTemporal(coord))209 {210 std::map<StdString, StdSize> dimsTmp = SuperClassWriter::getDimensions(&coord);211 StdString dimNameTmp = dimsTmp.begin()->first;212 StdSize dimSizeTmp = dimsTmp.begin()->second;213 listDimSize.push_front(make_pair(coord, dimSizeTmp));214 dimSizeMap.erase(dimNameTmp);215 dimList.remove(dimNameTmp);216 }217 }218 for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it)219 listDimSize.push_front(*dimSizeMap.find(*it));220 }221 197 222 198 // Now process domain and axis -
XIOS/dev/branch_openmp/src/io/netCdfInterface_impl.hpp
r1334 r1544 86 86 { 87 87 int status; 88 #pragma omp critical (_netcdf)89 88 status = ncGetVaraType(ncid, varId, start, count, data); 90 89 if (NC_NOERR != status)
Note: See TracChangeset
for help on using the changeset viewer.