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

Merge pull request #455 from totto82/outofbounds_fix

Browse Source 
BUGFIX Fix out of bounds error
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-04 14:15:07 +02:00
commit c2d652a61f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -655,11 +655,11 @@ namespace Opm {
if (std::isnan(mass_balance_residual[Water]) || mass_balance_residual[Water] > maxResidualAllowed() || if (std::isnan(mass_balance_residual[Water]) || mass_balance_residual[Water] > maxResidualAllowed() ||
std::isnan(mass_balance_residual[Oil]) || mass_balance_residual[Oil] > maxResidualAllowed() || std::isnan(mass_balance_residual[Oil]) || mass_balance_residual[Oil] > maxResidualAllowed() ||
std::isnan(mass_balance_residual[Gas]) || mass_balance_residual[Gas] > maxResidualAllowed() || std::isnan(mass_balance_residual[Gas]) || mass_balance_residual[Gas] > maxResidualAllowed() ||
std::isnan(mass_balance_residual[Gas]) || mass_balance_residual[Solvent] > maxResidualAllowed() || std::isnan(mass_balance_residual[Gas]) || mass_balance_residual[MaxNumPhases] > maxResidualAllowed() ||
std::isnan(CNV[Water]) || CNV[Water] > maxResidualAllowed() || std::isnan(CNV[Water]) || CNV[Water] > maxResidualAllowed() ||
std::isnan(CNV[Oil]) || CNV[Oil] > maxResidualAllowed() || std::isnan(CNV[Oil]) || CNV[Oil] > maxResidualAllowed() ||
std::isnan(CNV[Gas]) || CNV[Gas] > maxResidualAllowed() || std::isnan(CNV[Gas]) || CNV[Gas] > maxResidualAllowed() ||
std::isnan(CNV[Solvent]) || CNV[Solvent] > maxResidualAllowed() || std::isnan(CNV[MaxNumPhases]) || CNV[MaxNumPhases] > maxResidualAllowed() ||
std::isnan(well_flux_residual[Water]) || well_flux_residual[Water] > maxResidualAllowed() || std::isnan(well_flux_residual[Water]) || well_flux_residual[Water] > maxResidualAllowed() ||
std::isnan(well_flux_residual[Oil]) || well_flux_residual[Oil] > maxResidualAllowed() || std::isnan(well_flux_residual[Oil]) || well_flux_residual[Oil] > maxResidualAllowed() ||
std::isnan(well_flux_residual[Gas]) || well_flux_residual[Gas] > maxResidualAllowed() || std::isnan(well_flux_residual[Gas]) || well_flux_residual[Gas] > maxResidualAllowed() ||
@ -680,11 +680,11 @@ namespace Opm {
<< std::setw(11) << mass_balance_residual[Water] << std::setw(11) << mass_balance_residual[Water]
<< std::setw(11) << mass_balance_residual[Oil] << std::setw(11) << mass_balance_residual[Oil]
<< std::setw(11) << mass_balance_residual[Gas] << std::setw(11) << mass_balance_residual[Gas]
<< std::setw(11) << mass_balance_residual[Solvent] << std::setw(11) << mass_balance_residual[MaxNumPhases]
<< std::setw(11) << CNV[Water] << std::setw(11) << CNV[Water]
<< std::setw(11) << CNV[Oil] << std::setw(11) << CNV[Oil]
<< std::setw(11) << CNV[Gas] << std::setw(11) << CNV[Gas]
<< std::setw(11) << CNV[Solvent] << std::setw(11) << CNV[MaxNumPhases]
<< std::setw(11) << well_flux_residual[Water] << std::setw(11) << well_flux_residual[Water]
<< std::setw(11) << well_flux_residual[Oil] << std::setw(11) << well_flux_residual[Oil]
<< std::setw(11) << well_flux_residual[Gas] << std::setw(11) << well_flux_residual[Gas]