OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: make a two-param map template for splitDynMap

Browse Source 
gcc is more forgiving with default template parameters than clang.
This commit is contained in:
Arne Morten Kvarving
2020-03-20 12:33:28 +01:00
parent 438e4b68bf
commit f0a25e4cf3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -295,10 +295,10 @@ namespace Opm
m_tuning.serializeOp(serializer);
m_messageLimits.serializeOp(serializer);
m_runspec.serializeOp(serializer);
auto splitvfpprod = splitDynMap(vfpprod_tables);
auto splitvfpprod = splitDynMap<Map2>(vfpprod_tables);
serializer.vector(splitvfpprod.first);
serializer(splitvfpprod.second);
auto splitvfpinj = splitDynMap(vfpinj_tables);
auto splitvfpinj = splitDynMap<Map2>(vfpinj_tables);
serializer.vector(splitvfpinj.first);
serializer(splitvfpinj.second);
wtest_config.serializeOp(serializer);
@@ -317,12 +317,13 @@ namespace Opm
if (!serializer.isSerializing()) {
reconstructDynMap(splitWells.first, splitWells.second, wells_static);
reconstructDynMap(splitGroups.first, splitGroups.second, groups);
reconstructDynMap(splitvfpprod.first, splitvfpprod.second, vfpprod_tables);
reconstructDynMap(splitvfpinj.first, splitvfpinj.second, vfpinj_tables);
reconstructDynMap<Map2>(splitvfpprod.first, splitvfpprod.second, vfpprod_tables);
reconstructDynMap<Map2>(splitvfpinj.first, splitvfpinj.second, vfpinj_tables);
}
}
private:
template<class Key, class Value> using Map2 = std::map<Key,Value>;
TimeMap m_timeMap;
WellMap wells_static;
GroupMap groups;