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 #1076 from atgeirr/fix-conditional-visc-output

Browse Source 
Fix conditional viscosity output
This commit is contained in:
Atgeirr Flø Rasmussen
2017-02-24 17:55:18 +01:00
committed by GitHub
parent bb56d53150 cef4f5d9e5
commit 930f0ea9a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -1339,7 +1339,7 @@ namespace Opm {
errlog << "Finding the dew point pressure failed for " << failed_cells_pb.size() << " cells ["; errlog << "Finding the dew point pressure failed for " << failed_cells_pb.size() << " cells [";
errlog << failed_cells_pb[0]; errlog << failed_cells_pb[0];
const int max_elems = std::min(max_num_cells_faillog, failed_cells_pb.size()); const int max_elems = std::min(max_num_cells_faillog, failed_cells_pb.size());
for (size_t i = 1; i < max_elems; ++i) { for (int i = 1; i < max_elems; ++i) {
errlog << ", " << failed_cells_pb[i]; errlog << ", " << failed_cells_pb[i];
} }
if (failed_cells_pb.size() > max_num_cells_faillog) { if (failed_cells_pb.size() > max_num_cells_faillog) {
@@ -1353,7 +1353,7 @@ namespace Opm {
errlog << "Finding the dew point pressure failed for " << failed_cells_pd.size() << " cells ["; errlog << "Finding the dew point pressure failed for " << failed_cells_pd.size() << " cells [";
errlog << failed_cells_pd[0]; errlog << failed_cells_pd[0];
const int max_elems = std::min(max_num_cells_faillog, failed_cells_pd.size()); const int max_elems = std::min(max_num_cells_faillog, failed_cells_pd.size());
for (size_t i = 1; i < max_elems; ++i) { for (int i = 1; i < max_elems; ++i) {
errlog << ", " << failed_cells_pd[i]; errlog << ", " << failed_cells_pd[i];
} }
if (failed_cells_pd.size() > max_num_cells_faillog) { if (failed_cells_pd.size() > max_num_cells_faillog) {

6
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@@ -628,21 +628,21 @@ namespace Opm
const bool has_voil = (rstKeywords["VISC"] > 0) || (rstKeywords["VOIL"] > 0); const bool has_voil = (rstKeywords["VISC"] > 0) || (rstKeywords["VOIL"] > 0);
const bool has_vgas = (rstKeywords["VISC"] > 0) || (rstKeywords["VGAS"] > 0); const bool has_vgas = (rstKeywords["VISC"] > 0) || (rstKeywords["VGAS"] > 0);
rstKeywords["VISC"] = 0; rstKeywords["VISC"] = 0;
if (aqua_active) { if (aqua_active && has_vwat) {
output.insert("WAT_VISC", output.insert("WAT_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("WAT_VISC") ), std::move( sd.getCellData("WAT_VISC") ),
data::TargetType::RESTART_AUXILIARY); data::TargetType::RESTART_AUXILIARY);
rstKeywords["VWAT"] = 0; rstKeywords["VWAT"] = 0;
} }
if (liquid_active) { if (liquid_active && has_voil) {
output.insert("OIL_VISC", output.insert("OIL_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("OIL_VISC") ), std::move( sd.getCellData("OIL_VISC") ),
data::TargetType::RESTART_AUXILIARY); data::TargetType::RESTART_AUXILIARY);
rstKeywords["VOIL"] = 0; rstKeywords["VOIL"] = 0;
} }
if (vapour_active) { if (vapour_active && has_vgas) {
output.insert("GAS_VISC", output.insert("GAS_VISC",
Opm::UnitSystem::measure::viscosity, Opm::UnitSystem::measure::viscosity,
std::move( sd.getCellData("GAS_VISC") ), std::move( sd.getCellData("GAS_VISC") ),