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 remote-tracking branch 'opm/master' into bo_polymer

Browse Source 
Conflicts:
	opm/polymer/PolymerProperties.hpp
This commit is contained in:
Liu Ming
2014-10-20 13:51:37 +08:00
parent 88a1ec6e9f 23ea7cbd11
commit 6b3b90500f
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/polymer/PolymerProperties.hpp
View File

@@ -129,8 +129,6 @@ namespace Opm
c_max_ = plymaxTable.getPolymerConcentrationColumn()[0];
mix_param_ = plmixparRecord->getItem("TODD_LONGSTAFF")->getSIDouble(0);
std::cout << "Debug output:\n";
std::cout << "mix_param: " << mix_param_ <<" cmax: " << c_max_;
// We assume NTSFUN=1
const auto& plyrockTable = eclipseState->getPlyrockTables()[0];
@@ -143,8 +141,6 @@ namespace Opm
ads_index_ = static_cast<AdsorptionBehaviour>(plyrockTable.getAdsorbtionIndexColumn()[0]);
c_max_ads_ = plyrockTable.getMaxAdsorbtionColumn()[0];
std::cout << " IPV: " << dead_pore_vol_ <<" rs: " << res_factor_ << " rock_den: " << rock_density_
<< " ads_index: " << ads_index_ << " cmax_ads: " << c_max_ads_ << std::endl;
// We assume NTPVT=1
const auto& plyviscTable = eclipseState->getPlyviscTables()[0];
@@ -152,23 +148,11 @@ namespace Opm
c_vals_visc_ = plyviscTable.getPolymerConcentrationColumn();
visc_mult_vals_ = plyviscTable.getViscosityMultiplierColumn();
std::cout << "PLYVISC\n";
auto N = c_vals_visc_.size();
for (size_t i = 0; i < N; ++i) {
std::cout << c_vals_visc_[i] << " " << visc_mult_vals_[i] << "\n";
}
// We assume NTSFUN=1
const auto& plyadsTable = eclipseState->getPlyadsTables()[0];
c_vals_ads_ = plyadsTable.getPolymerConcentrationColumn();
ads_vals_ = plyadsTable.getAdsorbedPolymerColumn();
std::cout << "PLYADS\n";
auto M = c_vals_ads_.size();
for (size_t i = 0; i < M; ++i) {
std::cout << c_vals_ads_[i] << " " << ads_vals_[i] << "\n";
}
}
double cMax() const;

5
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@@ -292,7 +292,7 @@ namespace Opm
wellreport.push(props_, *wells_, state.pressure(), state.surfacevol(),
state.saturation(), 0.0, well_state.bhp(), well_state.perfRates());
}
for (; !timer.done(); ++timer) {
// for (; !timer.done(); ++timer) {
// Report timestep and (optionally) write state to disk.
timer.report(std::cout);
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {
@@ -388,6 +388,7 @@ namespace Opm
double stepsize = timer.currentStepLength();
polymer_inflow_.getInflowValues(current_time, current_time + stepsize, polymer_inflow_c);
// Solve transport.
transport_timer.start();
if (num_transport_substeps_ != 1) {
@@ -492,7 +493,7 @@ namespace Opm
state.saturation(), timer.simulationTimeElapsed() + timer.currentStepLength(),
well_state.bhp(), well_state.perfRates());
}
}
// }
if (output_) {
if (output_vtk_) {