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

Merge pull request #1423 from andlaus/fix_icc

Browse Source 
Fix icc
This commit is contained in:
Atgeirr Flø Rasmussen 2018-03-05 09:20:46 +01:00 committed by GitHub
commit 13b7a4a426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -369,7 +369,7 @@ namespace Opm {
// the reservoir equations as a source term. // the reservoir equations as a source term.
wellModel().assemble(iterationIdx, dt); wellModel().assemble(iterationIdx, dt);
} }
catch ( const Dune::FMatrixError& e ) catch ( const Dune::FMatrixError& )
{ {
OPM_THROW(Opm::NumericalIssue,"Error encounted when solving well equations"); OPM_THROW(Opm::NumericalIssue,"Error encounted when solving well equations");
} }

17
opm/autodiff/VFPHelpers.hpp
View File

@ -324,12 +324,6 @@ inline VFPEvaluation operator*(
/** /**
* Helper function which interpolates data using the indices etc. given in the inputs. * Helper function which interpolates data using the indices etc. given in the inputs.
*/ */
#ifdef __GNUC__
#pragma GCC push_options
#pragma GCC optimize ("unroll-loops")
#endif
inline VFPEvaluation interpolate( inline VFPEvaluation interpolate(
const VFPProdTable::array_type& array, const VFPProdTable::array_type& array,
const InterpData& flo_i, const InterpData& flo_i,
@ -502,17 +496,6 @@ inline VFPEvaluation interpolate(
return nn[0][0]; return nn[0][0];
} }
#ifdef __GNUC__
#pragma GCC pop_options //unroll loops
#endif
inline VFPEvaluation bhp(const VFPProdTable* table, inline VFPEvaluation bhp(const VFPProdTable* table,
const double& aqua, const double& aqua,
const double& liquid, const double& liquid,