OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

ebos: make it compile and run on GCC 4.4 and boost 1.44

Browse Source 
there were some issues with boost::filesystem, some with
std::unordered_map and problems with initializer lists...
This commit is contained in:
Andreas Lauser 2014-12-23 14:04:29 +01:00
parent 3f69e827be
commit e1743929d4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/ebos/eclproblem.hh
View File

@ -992,9 +992,14 @@ private:
if (eclState->hasDoubleGridProperty("MULTZ-"))
multzMinus = eclState->getDoubleGridProperty("MULTZ-")->getData();
// making this specific to clang or gcc > 4.7 is slightly hacky, but this call is
// only an optimization anyway...
#if defined __clang__ || (__GNUC__ > 4 && __GNUC_MINOR__ >= 7)
// resize the hash map to a appropriate size for a conforming 3D grid
float maxLoadFactor = intersectionIntrinsicPermeability_.max_load_factor();
intersectionIntrinsicPermeability_.reserve(numElements * 6 / maxLoadFactor * 1.05 );
#endif
auto elemIt = this->gridView().template begin</*codim=*/0>();
const auto& elemEndIt = this->gridView().template end</*codim=*/0>();