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 #1 from atgeirr/master

Browse Source 
Fix mass balance reports and output.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-10-04 03:17:50 -07:00
commit e93c881574
8 changed files with 192 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
opm/polymer/SimulatorCompressiblePolymer.cpp
View File

@ -66,10 +66,14 @@ namespace Opm
namespace namespace
{ {
void outputState(const UnstructuredGrid& grid, void outputStateVtk(const UnstructuredGrid& grid,
const Opm::PolymerBlackoilState& state, const Opm::PolymerBlackoilState& state,
const int step, const int step,
const std::string& output_dir); const std::string& output_dir);
void outputStateMatlab(const UnstructuredGrid& grid,
const Opm::PolymerBlackoilState& state,
const int step,
const std::string& output_dir);
void outputWaterCut(const Opm::Watercut& watercut, void outputWaterCut(const Opm::Watercut& watercut,
const std::string& output_dir); const std::string& output_dir);
void outputWellReport(const Opm::WellReport& wellreport, void outputWellReport(const Opm::WellReport& wellreport,
@ -102,6 +106,7 @@ namespace Opm
// Parameters for output. // Parameters for output.
bool output_; bool output_;
bool output_vtk_;
std::string output_dir_; std::string output_dir_;
int output_interval_; int output_interval_;
// Parameters for transport solver. // Parameters for transport solver.
@ -194,6 +199,7 @@ namespace Opm
// For output. // For output.
output_ = param.getDefault("output", true); output_ = param.getDefault("output", true);
if (output_) { if (output_) {
output_vtk_ = param.getDefault("output_vtk", true);
output_dir_ = param.getDefault("output_dir", std::string("output")); output_dir_ = param.getDefault("output_dir", std::string("output"));
// Ensure that output dir exists // Ensure that output dir exists
boost::filesystem::path fpath(output_dir_); boost::filesystem::path fpath(output_dir_);
@ -259,22 +265,16 @@ namespace Opm
double ttime = 0.0; double ttime = 0.0;
Opm::time::StopWatch total_timer; Opm::time::StopWatch total_timer;
total_timer.start(); total_timer.start();
double init_satvol[2] = { 0.0 }; double init_surfvol[2] = { 0.0 };
double init_polymass = 0.0; double init_polymass = 0.0;
double satvol[2] = { 0.0 }; double inplace_surfvol[2] = { 0.0 };
double polymass = 0.0; double polymass = 0.0;
double polymass_adsorbed = 0.0; double polymass_adsorbed = 0.0;
double injected[2] = { 0.0 };
double produced[2] = { 0.0 };
double polyinj = 0.0;
double polyprod = 0.0;
double tot_injected[2] = { 0.0 }; double tot_injected[2] = { 0.0 };
double tot_produced[2] = { 0.0 }; double tot_produced[2] = { 0.0 };
double tot_polyinj = 0.0; double tot_polyinj = 0.0;
double tot_polyprod = 0.0; double tot_polyprod = 0.0;
Opm::computeSaturatedVol(porevol, state.saturation(), init_satvol); Opm::computeSaturatedVol(porevol, state.surfacevol(), init_surfvol);
std::cout << "\nInitial saturations are " << init_satvol[0]/tot_porevol_init
<< " " << init_satvol[1]/tot_porevol_init << std::endl;
Opm::Watercut watercut; Opm::Watercut watercut;
watercut.push(0.0, 0.0, 0.0); watercut.push(0.0, 0.0, 0.0);
Opm::WellReport wellreport; Opm::WellReport wellreport;
@ -289,13 +289,13 @@ namespace Opm
// Report timestep and (optionally) write state to disk. // Report timestep and (optionally) write state to disk.
timer.report(std::cout); timer.report(std::cout);
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) { if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {
outputState(grid_, state, timer.currentStepNum(), output_dir_); if (output_vtk_) {
} outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
if (rock_comp_props_ && rock_comp_props_->isActive()) { outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
initial_pressure = state.pressure();
} }
initial_pressure = state.pressure();
// Solve pressure. // Solve pressure.
do { do {
@ -333,17 +333,32 @@ namespace Opm
stepsize /= double(num_transport_substeps_); stepsize /= double(num_transport_substeps_);
std::cout << "Making " << num_transport_substeps_ << " transport substeps." << std::endl; std::cout << "Making " << num_transport_substeps_ << " transport substeps." << std::endl;
} }
double injected[2] = { 0.0 };
double produced[2] = { 0.0 };
double polyinj = 0.0;
double polyprod = 0.0;
for (int tr_substep = 0; tr_substep < num_transport_substeps_; ++tr_substep) { for (int tr_substep = 0; tr_substep < num_transport_substeps_; ++tr_substep) {
tsolver_.solve(&state.faceflux()[0], initial_pressure, tsolver_.solve(&state.faceflux()[0], initial_pressure,
state.pressure(), &initial_porevol[0], &porevol[0], state.pressure(), &initial_porevol[0], &porevol[0],
&transport_src[0], stepsize, inflow_c, &transport_src[0], stepsize, inflow_c,
state.saturation(), state.surfacevol(), state.saturation(), state.surfacevol(),
state.concentration(), state.maxconcentration()); state.concentration(), state.maxconcentration());
double substep_injected[2] = { 0.0 };
double substep_produced[2] = { 0.0 };
double substep_polyinj = 0.0;
double substep_polyprod = 0.0;
Opm::computeInjectedProduced(props_, poly_props_, Opm::computeInjectedProduced(props_, poly_props_,
state.pressure(), state.surfacevol(), state.saturation(), state.pressure(), state.surfacevol(), state.saturation(),
state.concentration(), state.maxconcentration(), state.concentration(), state.maxconcentration(),
transport_src, stepsize, inflow_c, injected, produced, transport_src, stepsize, inflow_c,
polyinj, polyprod); substep_injected, substep_produced,
substep_polyinj, substep_polyprod);
injected[0] += substep_injected[0];
injected[1] += substep_injected[1];
produced[0] += substep_produced[0];
produced[1] += substep_produced[1];
polyinj += substep_polyinj;
polyprod += substep_polyprod;
if (gravity_ != 0 && use_segregation_split_) { if (gravity_ != 0 && use_segregation_split_) {
tsolver_.solveGravity(columns_, stepsize, tsolver_.solveGravity(columns_, stepsize,
state.saturation(), state.surfacevol(), state.saturation(), state.surfacevol(),
@ -356,10 +371,10 @@ namespace Opm
ttime += tt; ttime += tt;
// Report volume balances. // Report volume balances.
Opm::computeSaturatedVol(porevol, state.saturation(), satvol); Opm::computeSaturatedVol(porevol, state.surfacevol(), inplace_surfvol);
polymass = Opm::computePolymerMass(porevol, state.saturation(), state.concentration(), poly_props_.deadPoreVol()); polymass = Opm::computePolymerMass(porevol, state.saturation(), state.concentration(), poly_props_.deadPoreVol());
polymass_adsorbed = Opm::computePolymerAdsorbed(grid_, props_, poly_props_, polymass_adsorbed = Opm::computePolymerAdsorbed(grid_, props_, poly_props_,
state, *rock_comp_props_); state, rock_comp_props_);
tot_injected[0] += injected[0]; tot_injected[0] += injected[0];
tot_injected[1] += injected[1]; tot_injected[1] += injected[1];
tot_produced[0] += produced[0]; tot_produced[0] += produced[0];
@ -368,40 +383,44 @@ namespace Opm
tot_polyprod += polyprod; tot_polyprod += polyprod;
std::cout.precision(5); std::cout.precision(5);
const int width = 18; const int width = 18;
std::cout << "\nVolume and polymer mass balance: " std::cout << "\nMass balance: "
" water(pv) oil(pv) polymer(kg)\n"; " water(surfvol) oil(surfvol) polymer(kg)\n";
std::cout << " Saturated volumes: " std::cout << " In-place: "
<< std::setw(width) << satvol[0]/tot_porevol_init << std::setw(width) << inplace_surfvol[0]
<< std::setw(width) << satvol[1]/tot_porevol_init << std::setw(width) << inplace_surfvol[1]
<< std::setw(width) << polymass << std::endl; << std::setw(width) << polymass << std::endl;
std::cout << " Adsorbed volumes: " std::cout << " Adsorbed: "
<< std::setw(width) << 0.0 << std::setw(width) << 0.0
<< std::setw(width) << 0.0 << std::setw(width) << 0.0
<< std::setw(width) << polymass_adsorbed << std::endl; << std::setw(width) << polymass_adsorbed << std::endl;
std::cout << " Injected volumes: " std::cout << " Injected: "
<< std::setw(width) << injected[0]/tot_porevol_init << std::setw(width) << injected[0]
<< std::setw(width) << injected[1]/tot_porevol_init << std::setw(width) << injected[1]
<< std::setw(width) << polyinj << std::endl; << std::setw(width) << polyinj << std::endl;
std::cout << " Produced volumes: " std::cout << " Produced: "
<< std::setw(width) << produced[0]/tot_porevol_init << std::setw(width) << produced[0]
<< std::setw(width) << produced[1]/tot_porevol_init << std::setw(width) << produced[1]
<< std::setw(width) << polyprod << std::endl; << std::setw(width) << polyprod << std::endl;
std::cout << " Total inj volumes: " std::cout << " Total inj: "
<< std::setw(width) << tot_injected[0]/tot_porevol_init << std::setw(width) << tot_injected[0]
<< std::setw(width) << tot_injected[1]/tot_porevol_init << std::setw(width) << tot_injected[1]
<< std::setw(width) << tot_polyinj << std::endl; << std::setw(width) << tot_polyinj << std::endl;
std::cout << " Total prod volumes: " std::cout << " Total prod: "
<< std::setw(width) << tot_produced[0]/tot_porevol_init << std::setw(width) << tot_produced[0]
<< std::setw(width) << tot_produced[1]/tot_porevol_init << std::setw(width) << tot_produced[1]
<< std::setw(width) << tot_polyprod << std::endl; << std::setw(width) << tot_polyprod << std::endl;
std::cout << " In-place + prod - inj: " const double balance[3] = { init_surfvol[0] - inplace_surfvol[0] - tot_produced[0] + tot_injected[0],
<< std::setw(width) << (satvol[0] + tot_produced[0] - tot_injected[0])/tot_porevol_init init_surfvol[1] - inplace_surfvol[1] - tot_produced[1] + tot_injected[1],
<< std::setw(width) << (satvol[1] + tot_produced[1] - tot_injected[1])/tot_porevol_init init_polymass - polymass - tot_polyprod + tot_polyinj - polymass_adsorbed };
<< std::setw(width) << (polymass + tot_polyprod - tot_polyinj + polymass_adsorbed) << std::endl; std::cout << " Initial - inplace + inj - prod: "
std::cout << " Init - now - pr + inj: " << std::setw(width) << balance[0]
<< std::setw(width) << (init_satvol[0] - satvol[0] - tot_produced[0] + tot_injected[0])/tot_porevol_init << std::setw(width) << balance[1]
<< std::setw(width) << (init_satvol[1] - satvol[1] - tot_produced[1] + tot_injected[1])/tot_porevol_init << std::setw(width) << balance[2]
<< std::setw(width) << (init_polymass - polymass - tot_polyprod + tot_polyinj - polymass_adsorbed) << std::endl;
std::cout << " Relative mass error: "
<< std::setw(width) << balance[0]/(init_surfvol[0] + tot_injected[0])
<< std::setw(width) << balance[1]/(init_surfvol[1] + tot_injected[1])
<< std::setw(width) << balance[2]/(init_polymass + tot_polyinj)
<< std::endl; << std::endl;
std::cout.precision(8); std::cout.precision(8);
@ -416,7 +435,10 @@ namespace Opm
} }
if (output_) { if (output_) {
outputState(grid_, state, timer.currentStepNum(), output_dir_); if (output_vtk_) {
outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
outputWaterCut(watercut, output_dir_); outputWaterCut(watercut, output_dir_);
if (wells_) { if (wells_) {
outputWellReport(wellreport, output_dir_); outputWellReport(wellreport, output_dir_);
@ -441,14 +463,22 @@ namespace Opm
namespace namespace
{ {
void outputState(const UnstructuredGrid& grid, void outputStateVtk(const UnstructuredGrid& grid,
const Opm::PolymerBlackoilState& state, const Opm::PolymerBlackoilState& state,
const int step, const int step,
const std::string& output_dir) const std::string& output_dir)
{ {
// Write data in VTK format. // Write data in VTK format.
std::ostringstream vtkfilename; std::ostringstream vtkfilename;
vtkfilename << output_dir << "/output-" << std::setw(3) << std::setfill('0') << step << ".vtu"; vtkfilename << output_dir << "/vtk_files";
boost::filesystem::path fpath(vtkfilename.str());
try {
create_directories(fpath);
}
catch (...) {
THROW("Creating directories failed: " << fpath);
}
vtkfilename << "/output-" << std::setw(3) << std::setfill('0') << step << ".vtu";
std::ofstream vtkfile(vtkfilename.str().c_str()); std::ofstream vtkfile(vtkfilename.str().c_str());
if (!vtkfile) { if (!vtkfile) {
THROW("Failed to open " << vtkfilename.str()); THROW("Failed to open " << vtkfilename.str());
@ -458,15 +488,40 @@ namespace Opm
dm["pressure"] = &state.pressure(); dm["pressure"] = &state.pressure();
dm["concentration"] = &state.concentration(); dm["concentration"] = &state.concentration();
dm["cmax"] = &state.maxconcentration(); dm["cmax"] = &state.maxconcentration();
dm["surfvol"] = &state.surfacevol();
std::vector<double> cell_velocity; std::vector<double> cell_velocity;
Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity); Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity);
dm["velocity"] = &cell_velocity; dm["velocity"] = &cell_velocity;
Opm::writeVtkData(grid, dm, vtkfile); Opm::writeVtkData(grid, dm, vtkfile);
}
void outputStateMatlab(const UnstructuredGrid& grid,
const Opm::PolymerBlackoilState& state,
const int step,
const std::string& output_dir)
{
Opm::DataMap dm;
dm["saturation"] = &state.saturation();
dm["pressure"] = &state.pressure();
dm["concentration"] = &state.concentration();
dm["cmax"] = &state.maxconcentration();
dm["surfvol"] = &state.surfacevol();
std::vector<double> cell_velocity;
Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity);
dm["velocity"] = &cell_velocity;
// Write data (not grid) in Matlab format // Write data (not grid) in Matlab format
for (Opm::DataMap::const_iterator it = dm.begin(); it != dm.end(); ++it) { for (Opm::DataMap::const_iterator it = dm.begin(); it != dm.end(); ++it) {
std::ostringstream fname; std::ostringstream fname;
fname << output_dir << "/" << it->first << "-" << std::setw(3) << std::setfill('0') << step << ".dat"; fname << output_dir << "/" << it->first;
boost::filesystem::path fpath = fname.str();
try {
create_directories(fpath);
}
catch (...) {
THROW("Creating directories failed: " << fpath);
}
fname << "/" << std::setw(3) << std::setfill('0') << step << ".txt";
std::ofstream file(fname.str().c_str()); std::ofstream file(fname.str().c_str());
if (!file) { if (!file) {
THROW("Failed to open " << fname.str()); THROW("Failed to open " << fname.str());
@ -476,7 +531,6 @@ namespace Opm
} }
} }
void outputWaterCut(const Opm::Watercut& watercut, void outputWaterCut(const Opm::Watercut& watercut,
const std::string& output_dir) const std::string& output_dir)
{ {

3
opm/polymer/SimulatorCompressiblePolymer.hpp
View File

@ -83,7 +83,8 @@ namespace Opm
/// This will run succesive timesteps until timer.done() is true. It will /// This will run succesive timesteps until timer.done() is true. It will
/// modify the reservoir and well states. /// modify the reservoir and well states.
/// \param[in,out] timer governs the requested reporting timesteps /// \param[in,out] timer governs the requested reporting timesteps
/// \param[in,out] state state of reservoir: pressure, fluxes, polymer concentration /// \param[in,out] state state of reservoir: pressure, fluxes, polymer concentration,
/// saturations, surface volumes.
/// \param[in,out] well_state state of wells: bhp, perforation rates /// \param[in,out] well_state state of wells: bhp, perforation rates
/// \return simulation report, with timing data /// \return simulation report, with timing data
SimulatorReport run(SimulatorTimer& timer, SimulatorReport run(SimulatorTimer& timer,

84
opm/polymer/SimulatorPolymer.cpp
View File

@ -64,15 +64,18 @@ namespace Opm
namespace namespace
{ {
void outputState(const UnstructuredGrid& grid, void outputStateVtk(const UnstructuredGrid& grid,
const Opm::PolymerState& state, const Opm::PolymerState& state,
const int step, const int step,
const std::string& output_dir); const std::string& output_dir);
void outputStateMatlab(const UnstructuredGrid& grid,
const Opm::PolymerState& state,
const int step,
const std::string& output_dir);
void outputWaterCut(const Opm::Watercut& watercut, void outputWaterCut(const Opm::Watercut& watercut,
const std::string& output_dir); const std::string& output_dir);
void outputWellReport(const Opm::WellReport& wellreport, void outputWellReport(const Opm::WellReport& wellreport,
const std::string& output_dir); const std::string& output_dir);
} // anonymous namespace } // anonymous namespace
@ -100,6 +103,7 @@ namespace Opm
// Parameters for output. // Parameters for output.
bool output_; bool output_;
bool output_vtk_;
std::string output_dir_; std::string output_dir_;
int output_interval_; int output_interval_;
// Parameters for transport solver. // Parameters for transport solver.
@ -191,6 +195,7 @@ namespace Opm
// For output. // For output.
output_ = param.getDefault("output", true); output_ = param.getDefault("output", true);
if (output_) { if (output_) {
output_vtk_ = param.getDefault("output_vtk", true);
output_dir_ = param.getDefault("output_dir", std::string("output")); output_dir_ = param.getDefault("output_dir", std::string("output"));
// Ensure that output dir exists // Ensure that output dir exists
boost::filesystem::path fpath(output_dir_); boost::filesystem::path fpath(output_dir_);
@ -283,7 +288,10 @@ namespace Opm
// Report timestep and (optionally) write state to disk. // Report timestep and (optionally) write state to disk.
timer.report(std::cout); timer.report(std::cout);
if (output_ && (timer.currentStepNum() % output_interval_ == 0)) { if (output_ && (timer.currentStepNum() % output_interval_ == 0)) {
outputState(grid_, state, timer.currentStepNum(), output_dir_); if (output_vtk_) {
outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
} }
// Solve pressure. // Solve pressure.
@ -321,13 +329,24 @@ namespace Opm
stepsize /= double(num_transport_substeps_); stepsize /= double(num_transport_substeps_);
std::cout << "Making " << num_transport_substeps_ << " transport substeps." << std::endl; std::cout << "Making " << num_transport_substeps_ << " transport substeps." << std::endl;
} }
double substep_injected[2] = { 0.0 };
double substep_produced[2] = { 0.0 };
double substep_polyinj = 0.0;
double substep_polyprod = 0.0;
injected[0] = injected[1] = produced[0] = produced[1] = polyinj = polyprod = 0.0;
for (int tr_substep = 0; tr_substep < num_transport_substeps_; ++tr_substep) { for (int tr_substep = 0; tr_substep < num_transport_substeps_; ++tr_substep) {
tsolver_.solve(&state.faceflux()[0], &porevol[0], &transport_src[0], stepsize, inflow_c, tsolver_.solve(&state.faceflux()[0], &porevol[0], &transport_src[0], stepsize, inflow_c,
state.saturation(), state.concentration(), state.maxconcentration()); state.saturation(), state.concentration(), state.maxconcentration());
Opm::computeInjectedProduced(props_, poly_props_, Opm::computeInjectedProduced(props_, poly_props_,
state.saturation(), state.concentration(), state.maxconcentration(), state.saturation(), state.concentration(), state.maxconcentration(),
transport_src, timer.currentStepLength(), inflow_c, transport_src, stepsize, inflow_c,
injected, produced, polyinj, polyprod); substep_injected, substep_produced, substep_polyinj, substep_polyprod);
injected[0] += substep_injected[0];
injected[1] += substep_injected[1];
produced[0] += substep_produced[0];
produced[1] += substep_produced[1];
polyinj += substep_polyinj;
polyprod += substep_polyprod;
if (use_segregation_split_) { if (use_segregation_split_) {
tsolver_.solveGravity(columns_, &porevol[0], stepsize, tsolver_.solveGravity(columns_, &porevol[0], stepsize,
state.saturation(), state.concentration(), state.maxconcentration()); state.saturation(), state.concentration(), state.maxconcentration());
@ -398,7 +417,10 @@ namespace Opm
} }
if (output_) { if (output_) {
outputState(grid_, state, timer.currentStepNum(), output_dir_); if (output_vtk_) {
outputStateVtk(grid_, state, timer.currentStepNum(), output_dir_);
}
outputStateMatlab(grid_, state, timer.currentStepNum(), output_dir_);
outputWaterCut(watercut, output_dir_); outputWaterCut(watercut, output_dir_);
if (wells_) { if (wells_) {
outputWellReport(wellreport, output_dir_); outputWellReport(wellreport, output_dir_);
@ -423,14 +445,22 @@ namespace Opm
namespace namespace
{ {
void outputState(const UnstructuredGrid& grid, void outputStateVtk(const UnstructuredGrid& grid,
const Opm::PolymerState& state, const Opm::PolymerState& state,
const int step, const int step,
const std::string& output_dir) const std::string& output_dir)
{ {
// Write data in VTK format. // Write data in VTK format.
std::ostringstream vtkfilename; std::ostringstream vtkfilename;
vtkfilename << output_dir << "/output-" << std::setw(3) << std::setfill('0') << step << ".vtu"; vtkfilename << output_dir << "/vtk_files";
boost::filesystem::path fpath(vtkfilename.str());
try {
create_directories(fpath);
}
catch (...) {
THROW("Creating directories failed: " << fpath);
}
vtkfilename << "/output-" << std::setw(3) << std::setfill('0') << step << ".vtu";
std::ofstream vtkfile(vtkfilename.str().c_str()); std::ofstream vtkfile(vtkfilename.str().c_str());
if (!vtkfile) { if (!vtkfile) {
THROW("Failed to open " << vtkfilename.str()); THROW("Failed to open " << vtkfilename.str());
@ -444,11 +474,34 @@ namespace Opm
Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity); Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity);
dm["velocity"] = &cell_velocity; dm["velocity"] = &cell_velocity;
Opm::writeVtkData(grid, dm, vtkfile); Opm::writeVtkData(grid, dm, vtkfile);
}
void outputStateMatlab(const UnstructuredGrid& grid,
const Opm::PolymerState& state,
const int step,
const std::string& output_dir)
{
Opm::DataMap dm;
dm["saturation"] = &state.saturation();
dm["pressure"] = &state.pressure();
dm["concentration"] = &state.concentration();
dm["cmax"] = &state.maxconcentration();
std::vector<double> cell_velocity;
Opm::estimateCellVelocity(grid, state.faceflux(), cell_velocity);
dm["velocity"] = &cell_velocity;
// Write data (not grid) in Matlab format // Write data (not grid) in Matlab format
for (Opm::DataMap::const_iterator it = dm.begin(); it != dm.end(); ++it) { for (Opm::DataMap::const_iterator it = dm.begin(); it != dm.end(); ++it) {
std::ostringstream fname; std::ostringstream fname;
fname << output_dir << "/" << it->first << "-" << std::setw(3) << std::setfill('0') << step << ".dat"; fname << output_dir << "/" << it->first;
boost::filesystem::path fpath = fname.str();
try {
create_directories(fpath);
}
catch (...) {
THROW("Creating directories failed: " << fpath);
}
fname << "/" << std::setw(3) << std::setfill('0') << step << ".txt";
std::ofstream file(fname.str().c_str()); std::ofstream file(fname.str().c_str());
if (!file) { if (!file) {
THROW("Failed to open " << fname.str()); THROW("Failed to open " << fname.str());
@ -458,7 +511,6 @@ namespace Opm
} }
} }
void outputWaterCut(const Opm::Watercut& watercut, void outputWaterCut(const Opm::Watercut& watercut,
const std::string& output_dir) const std::string& output_dir)
{ {

3
opm/polymer/SimulatorPolymer.hpp
View File

@ -83,7 +83,8 @@ namespace Opm
/// This will run succesive timesteps until timer.done() is true. It will /// This will run succesive timesteps until timer.done() is true. It will
/// modify the reservoir and well states. /// modify the reservoir and well states.
/// \param[in,out] timer governs the requested reporting timesteps /// \param[in,out] timer governs the requested reporting timesteps
/// \param[in,out] state state of reservoir: pressure, fluxes /// \param[in,out] state state of reservoir: pressure, fluxes, polymer concentration,
/// saturations.
/// \param[in,out] well_state state of wells: bhp, perforation rates /// \param[in,out] well_state state of wells: bhp, perforation rates
/// \return simulation report, with timing data /// \return simulation report, with timing data
SimulatorReport run(SimulatorTimer& timer, SimulatorReport run(SimulatorTimer& timer,

2
opm/polymer/TransportModelCompressiblePolymer.cpp
View File

@ -173,7 +173,7 @@ namespace Opm
tol_(tol), tol_(tol),
maxit_(maxit), maxit_(maxit),
method_(method), method_(method),
adhoc_safety_(1.0), adhoc_safety_(1.1),
concentration_(0), concentration_(0),
cmax_(0), cmax_(0),
fractionalflow_(grid.number_of_cells, -1.0), fractionalflow_(grid.number_of_cells, -1.0),

2
opm/polymer/TransportModelPolymer.cpp
View File

@ -196,7 +196,7 @@ namespace Opm
fractionalflow_(grid.number_of_cells, -1.0), fractionalflow_(grid.number_of_cells, -1.0),
mc_(grid.number_of_cells, -1.0), mc_(grid.number_of_cells, -1.0),
method_(method), method_(method),
adhoc_safety_(1.0) adhoc_safety_(1.1)
{ {
if (props.numPhases() != 2) { if (props.numPhases() != 2) {
THROW("Property object must have 2 phases"); THROW("Property object must have 2 phases");

8
opm/polymer/polymerUtilities.cpp
View File

@ -294,13 +294,17 @@ namespace Opm
const BlackoilPropertiesInterface& props, const BlackoilPropertiesInterface& props,
const Opm::PolymerProperties& polyprops, const Opm::PolymerProperties& polyprops,
const PolymerBlackoilState& state, const PolymerBlackoilState& state,
const RockCompressibility& rock_comp const RockCompressibility* rock_comp
) )
{ {
const int num_cells = props.numCells(); const int num_cells = props.numCells();
const double rhor = polyprops.rockDensity(); const double rhor = polyprops.rockDensity();
std::vector<double> porosity; std::vector<double> porosity;
computePorosity(grid, props.porosity(), rock_comp, state.pressure(), porosity); if (rock_comp && rock_comp->isActive()) {
computePorosity(grid, props.porosity(), *rock_comp, state.pressure(), porosity);
} else {
porosity.assign(props.porosity(), props.porosity() + num_cells);
}
double abs_mass = 0.0; double abs_mass = 0.0;
const std::vector<double>& cmax = state.maxconcentration(); const std::vector<double>& cmax = state.maxconcentration();
for (int cell = 0; cell < num_cells; ++cell) { for (int cell = 0; cell < num_cells; ++cell) {

4
opm/polymer/polymerUtilities.hpp
View File

@ -163,13 +163,13 @@ namespace Opm
/// @param[in] props fluid and rock properties. /// @param[in] props fluid and rock properties.
/// @param[in] polyprops polymer properties /// @param[in] polyprops polymer properties
/// @param[in] state State variables /// @param[in] state State variables
/// @param[in] rock_comp Rock compressibility /// @param[in] rock_comp Rock compressibility (optional)
/// @return total absorbed polymer mass. /// @return total absorbed polymer mass.
double computePolymerAdsorbed(const UnstructuredGrid& grid, double computePolymerAdsorbed(const UnstructuredGrid& grid,
const BlackoilPropertiesInterface& props, const BlackoilPropertiesInterface& props,
const Opm::PolymerProperties& polyprops, const Opm::PolymerProperties& polyprops,
const PolymerBlackoilState& state, const PolymerBlackoilState& state,
const RockCompressibility& rock_comp); const RockCompressibility* rock_comp);
/// @brief Functor giving the injected amount of polymer as a function of time. /// @brief Functor giving the injected amount of polymer as a function of time.