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

Use operator[] to populize unordered_map with string as the key

Browse Source 
g++-4.4 has problems converting const char* to char*
which it thinks is needed for constructing std::string.
Using operator[] circumvents this problem.

The compiler error fixed here was:
/usr/include/c++/4.4/bits/stl_pair.h: In constructor ‘std::pair<_T1, _T2>::pair(std::pair<_U1, _U2>&&) [with _U1 = const char*, _U2 = const char*, _T1 = const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, _T2 = char*]’:
/home/mblatt/src/dune/opm/opm-core/opm/core/linalg/LinearSolverPetsc.cpp:40:   instantiated from here
/usr/include/c++/4.4/bits/stl_pair.h:107: error: invalid conversion from ‘const char*’ to ‘char*’
make[2]: *** [CMakeFiles/opmcore.dir/opm/core/linalg/LinearSolverPetsc.cpp.o] Fehler 1
This commit is contained in:
Markus Blatt 2015-04-13 10:58:31 +02:00
parent d0820dcb3f
commit b791d0743b
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
opm/core/linalg/LinearSolverPetsc.cpp
View File

@ -37,20 +37,23 @@ namespace{
KSPTypeMap(const std::string& default_type = "gmres") KSPTypeMap(const std::string& default_type = "gmres")
: default_type_(default_type) : default_type_(default_type)
{ {
type_map_.insert(std::make_pair("richardson", KSPRICHARDSON)); // g++-4.4 has problems converting const char* to char*
type_map_.insert(std::make_pair("chebyshev", KSPCHEBYSHEV)); // which it thinks is needed for constructing std::string.
type_map_.insert(std::make_pair("cg", KSPCG)); // Using operator[] circumvents this problem.
type_map_.insert(std::make_pair("bicgs", KSPBICG)); type_map_["richardson"] = KSPRICHARDSON;
type_map_.insert(std::make_pair("gmres", KSPGMRES)); type_map_["chebyshev"] = KSPCHEBYSHEV;
type_map_.insert(std::make_pair("fgmres", KSPFGMRES)); type_map_["cg"] = KSPCG;
type_map_.insert(std::make_pair("dgmres", KSPDGMRES)); type_map_["bicgs"] = KSPBICG;
type_map_.insert(std::make_pair("gcr", KSPGCR)); type_map_["gmres"] = KSPGMRES;
type_map_.insert(std::make_pair("bcgs", KSPBCGS)); type_map_["fgmres"] = KSPFGMRES;
type_map_.insert(std::make_pair("cgs", KSPCGS)); type_map_["dgmres"] = KSPDGMRES;
type_map_.insert(std::make_pair("tfqmr", KSPTFQMR)); type_map_["gcr"] = KSPGCR;
type_map_.insert(std::make_pair("tcqmr", KSPTCQMR)); type_map_["bcgs"] = KSPBCGS;
type_map_.insert(std::make_pair("cr", KSPCR)); type_map_["cgs"] = KSPCGS;
type_map_.insert(std::make_pair("preonly", KSPPREONLY)); type_map_["tfqmr"] = KSPTFQMR;
type_map_["tcqmr"] = KSPTCQMR;
type_map_["cr"] = KSPCR;
type_map_["preonly"] = KSPPREONLY;
} }
KSPType KSPType
@ -81,19 +84,19 @@ namespace{
PCTypeMap(const std::string& default_type = "jacobi") PCTypeMap(const std::string& default_type = "jacobi")
: default_type_(default_type) : default_type_(default_type)
{ {
type_map_.insert(std::make_pair("jacobi", PCJACOBI)); type_map_["jacobi"] = PCJACOBI;
type_map_.insert(std::make_pair("bjacobi", PCBJACOBI)); type_map_["bjacobi"] = PCBJACOBI;
type_map_.insert(std::make_pair("sor", PCSOR)); type_map_["sor"] = PCSOR;
type_map_.insert(std::make_pair("eisenstat", PCEISENSTAT)); type_map_["eisenstat"] = PCEISENSTAT;
type_map_.insert(std::make_pair("icc", PCICC)); type_map_["icc"] = PCICC;
type_map_.insert(std::make_pair("ilu", PCILU)); type_map_["ilu"] = PCILU;
type_map_.insert(std::make_pair("asm", PCASM)); type_map_["asm"] = PCASM;
type_map_.insert(std::make_pair("gamg", PCGAMG)); type_map_["gamg"] = PCGAMG;
type_map_.insert(std::make_pair("ksp", PCKSP)); type_map_["ksp"] = PCKSP;
type_map_.insert(std::make_pair("composite", PCCOMPOSITE)); type_map_["composite"] = PCCOMPOSITE;
type_map_.insert(std::make_pair("lu", PCLU)); type_map_["lu"] = PCLU;
type_map_.insert(std::make_pair("cholesky", PCCHOLESKY)); type_map_["cholesky"] = PCCHOLESKY;
type_map_.insert(std::make_pair("none", PCNONE)); type_map_["none"] = PCNONE;
} }
PCType PCType