Changeset 2389 for XIOS3/trunk/src/io/nc4_data_output.cpp
- Timestamp:
- 07/27/22 11:49:51 (2 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS3/trunk/src/io/nc4_data_output.cpp
r2387 r2389 20 20 , SuperClassWriter(filename, exist) 21 21 , filename(filename) 22 , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), rel Elements_()22 , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relAxis_(), relDomains_() 23 23 { 24 24 SuperClass::type = MULTI_FILE; … … 34 34 , filename(filename) 35 35 , isCollective(isCollective) 36 , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), rel Elements_()36 , file(file),hasTimeInstant(false),hasTimeCentered(false), timeCounterType(none), relAxis_(), relDomains_() 37 37 { 38 38 SuperClass::type = (multifile) ? MULTI_FILE : ONE_FILE; … … 79 79 { 80 80 // if yes, associate the same ids to current element 81 domain->name = it->second.second->getDomainOutputName(); 82 domain->lon_name = it->second.second->lon_name; 83 domain->lat_name = it->second.second->lat_name; 84 if (domain->type == CDomain::type_attr::unstructured) 85 { 86 domain->dim_i_name = it->second.second->dim_i_name; 87 domain->dim_j_name = it->second.second->dim_j_name; 88 } 81 domain->renameAttributesBeforeWriting( it->second.second ); 89 82 elementIsInMap = true; 90 83 } … … 93 86 if (!elementIsInMap) // ! in MAP 94 87 { 95 domain->name = domain->getId(); 96 domain->lon_name = "lon_"+domain->getId(); 97 domain->lat_name = "lat_"+domain->getId(); 98 if (domain->type == CDomain::type_attr::unstructured) 99 { 100 domain->dim_i_name = "cell_"+domain->getId(); 101 domain->dim_j_name = "nvertex_"+domain->getId(); 102 } 88 domain->renameAttributesBeforeWriting(); 103 89 relDomains_.insert( make_pair( defaultNameKey, make_pair(globalHash, domain) ) ) ; 104 90 } … … 1056 1042 1057 1043 StdString defaultNameKey = axis->getAxisOutputName(); 1058 if ( !rel Elements_.count ( defaultNameKey ) )1044 if ( !relAxis_.count ( defaultNameKey ) ) 1059 1045 { 1060 1046 // if defaultNameKey not in the map, write the element such as it is defined 1061 rel Elements_.insert( make_pair( defaultNameKey, make_pair(globalHash, defaultNameKey) ) );1047 relAxis_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis) ) ); 1062 1048 } 1063 1049 else // look if a hash associated this key is equal 1064 1050 { 1065 1051 bool elementIsInMap(false); 1066 auto defaultNameKeyElements = rel Elements_.equal_range( defaultNameKey );1052 auto defaultNameKeyElements = relAxis_.equal_range( defaultNameKey ); 1067 1053 for (auto it = defaultNameKeyElements.first; it != defaultNameKeyElements.second; it++) 1068 1054 { … … 1070 1056 { 1071 1057 // if yes, associate the same ids to current element 1072 axis-> name = it->second.second;1058 axis->renameAttributesBeforeWriting( it->second.second ); 1073 1059 elementIsInMap = true; 1074 1060 } … … 1077 1063 if (!elementIsInMap) // ! in MAP 1078 1064 { 1079 axis-> name = axis->getId();1080 rel Elements_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis->getAxisOutputName()) ) ) ;// = axis->getId()1065 axis->renameAttributesBeforeWriting(); 1066 relAxis_.insert( make_pair( defaultNameKey, make_pair(globalHash, axis) ) ) ;// = axis->getId() 1081 1067 } 1082 1068 }
Note: See TracChangeset
for help on using the changeset viewer.