OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3959 from blattms/warn-long-fault

Browse Source 
Warn about fault names with more than 8 characters
This commit is contained in:
Bård Skaflestad 2022-06-28 10:29:36 +02:00 committed by GitHub
commit 5b2d1ca5ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/simulators/utils/ParallelRestart.cpp
View File

@ -34,6 +34,7 @@
#include <opm/output/data/GuideRateValue.hpp> #include <opm/output/data/GuideRateValue.hpp>
#include <opm/output/data/Solution.hpp> #include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp> #include <opm/output/data/Wells.hpp>
#include <opm/input/eclipse/EclipseState/Util/OrderedMap.hpp>
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/output/eclipse/RestartValue.hpp> #include <opm/output/eclipse/RestartValue.hpp>
#include <opm/input/eclipse/Schedule/SummaryState.hpp> #include <opm/input/eclipse/Schedule/SummaryState.hpp>
@ -1090,6 +1091,8 @@ INSTANTIATE_PACK(std::map<std::string,double>)
INSTANTIATE_PACK(std::map<int,int>) INSTANTIATE_PACK(std::map<int,int>)
INSTANTIATE_PACK(std::map<int,data::AquiferData>) INSTANTIATE_PACK(std::map<int,data::AquiferData>)
INSTANTIATE_PACK(std::unordered_map<std::string,size_t>) INSTANTIATE_PACK(std::unordered_map<std::string,size_t>)
INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<std::string::npos>, Opm::OrderedMapDetail::TruncatedStringEquals<std::string::npos>>)
INSTANTIATE_PACK(std::unordered_map<std::string,size_t,Opm::OrderedMapDetail::TruncatedStringHash<8>, Opm::OrderedMapDetail::TruncatedStringEquals<8>>)
INSTANTIATE_PACK(std::unordered_map<std::string,std::string>) INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
INSTANTIATE_PACK(std::unordered_set<std::string>) INSTANTIATE_PACK(std::unordered_set<std::string>)
INSTANTIATE_PACK(std::set<std::string>) INSTANTIATE_PACK(std::set<std::string>)

26
opm/simulators/utils/PartiallySupportedFlowKeywords.cpp
View File

@ -82,6 +82,14 @@ partiallySupported()
{2,{false, allow_values<std::string> {"TAB"}, "FOAMOPTS(FOAMOPT2): only the default option of TAB is supported – value ignored"}}, // MODEL {2,{false, allow_values<std::string> {"TAB"}, "FOAMOPTS(FOAMOPT2): only the default option of TAB is supported – value ignored"}}, // MODEL
}, },
}, },
{
"FAULTS",
{
{1, {false, [](const std::string& val){ return val.size()<=8;},
"FAULTS(FLTNAME): Only names of faults up to 8 characters are supported. Will ignore excess characters."
}
},},
},
{ {
"GCONINJE", "GCONINJE",
{ {
@ -123,6 +131,15 @@ partiallySupported()
{3,{false, allow_values<std::string> {"NONE"}, "MISCIBLE(MISOPT): only option NONE is supported – value ignored"}}, // TWOPOINT {3,{false, allow_values<std::string> {"NONE"}, "MISCIBLE(MISOPT): only option NONE is supported – value ignored"}}, // TWOPOINT
}, },
}, },
{
"MULTFLT",
{
{1, {false, [](const std::string& val){ return val.size()<=8;},
"MLTFLT(FLTNAME): Only names of faults up to 8 characters are supported. Will ignore excess characters."
}
},
},
},
{ {
"MULTIREG", "MULTIREG",
{ {
@ -198,6 +215,15 @@ partiallySupported()
{25,{false, allow_values<std::string> {}, "TABDIMS(RESVED): should be defaulted (1*) - ignored as not used"}}, // RESERVED {25,{false, allow_values<std::string> {}, "TABDIMS(RESVED): should be defaulted (1*) - ignored as not used"}}, // RESERVED
}, },
}, },
{
"THPRESFT",
{
{1, {false, [](const std::string& val){ return val.size()<=8;},
"THPRESFT(FLTNAME): Only names of faults up to 8 characters are supported. Will ignore excess characters."
}
},
},
},
{ {
"TRACER", "TRACER",
{ {