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

Make output work the same as in other sims.

Browse Source 
I.e. putting each field in its own directory, adding the
output_vtk parameter etc.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-10-03 16:02:27 +02:00
parent dc3b0dd6f4
commit 25e528df0d
1 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
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_);
@ -289,13 +295,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 {
@ -416,7 +422,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 +450,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 +475,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 +518,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)
{ {