OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-24 14:47:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced SimulatorState -> SimulationDataContainer

Browse Source
This commit is contained in:
Joakim Hove committed 2016-03-29 10:48:36 +02:00
1 parent 0e0e92aa71
commit 18c07d5d66
30 files changed
+569 -383
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
+15 -12
View File
@@ -21,6 +21,11 @@
#include "SimulatorFullyImplicitBlackoilOutput.hpp"
#include <opm/common/data/SimulationDataContainer.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/utility/DataMap.hpp>
#include <opm/core/io/vtk/writeVtkData.hpp>
#include <opm/common/ErrorMacros.hpp>
@@ -30,9 +35,6 @@
#include <opm/autodiff/GridHelpers.hpp>
#include <opm/autodiff/BackupRestore.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <sstream>
#include <iomanip>
#include <fstream>
@@ -50,7 +52,7 @@ namespace Opm
void outputStateVtk(const UnstructuredGrid& grid,
const SimulatorState& state,
const SimulationDataContainer& state,
const int step,
const std::string& output_dir)
{
@@ -87,16 +89,15 @@ namespace Opm
void outputStateMatlab(const UnstructuredGrid& grid,
const Opm::SimulatorState& state,
const Opm::SimulationDataContainer& state,
const int step,
const std::string& output_dir)
{
Opm::DataMap dm;
dm["saturation"] = &state.saturation();
dm["pressure"] = &state.pressure();
for( unsigned int i=0; i<state.cellDataNames().size(); ++ i )
{
const std::string& name = state.cellDataNames()[ i ];
for (const auto& pair : state.cellData()) {
const std::string& name = pair.first;
std::string key;
if( name == "SURFACEVOL" ) {
key = "surfvolume";
@@ -111,7 +112,7 @@ namespace Opm
continue;
}
// set data to datmap
dm[ key ] = &state.cellData()[ i ];
dm[ key ] = &pair.second;
}
std::vector<double> cell_velocity;
@@ -204,7 +205,7 @@ namespace Opm
#ifdef HAVE_DUNE_CORNERPOINT
void outputStateVtk(const Dune::CpGrid& grid,
const Opm::SimulatorState& state,
const Opm::SimulationDataContainer& state,
const int step,
const std::string& output_dir)
{
@@ -255,7 +256,7 @@ namespace Opm
void
BlackoilOutputWriter::
writeTimeStep(const SimulatorTimerInterface& timer,
const SimulatorState& localState,
const SimulationDataContainer& localState,
const WellState& localWellState,
bool substep)
{
@@ -271,7 +272,7 @@ namespace Opm
isIORank = parallelOutput_->collectToIORank( localState, localWellState, timer.reportStepNum() );
}
const SimulatorState& state = (parallelOutput_ && parallelOutput_->isParallel() ) ? parallelOutput_->globalReservoirState() : localState;
const SimulationDataContainer& state = (parallelOutput_ && parallelOutput_->isParallel() ) ? parallelOutput_->globalReservoirState() : localState;
const WellState& wellState = (parallelOutput_ && parallelOutput_->isParallel() ) ? parallelOutput_->globalWellState() : localWellState;
// output is only done on I/O rank
@@ -306,6 +307,7 @@ namespace Opm
// write resport step number
backupfile_.write( (const char *) &reportStep, sizeof(int) );
/*
try {
const BlackoilState& boState = dynamic_cast< const BlackoilState& > (state);
backupfile_ << boState;
@@ -317,6 +319,7 @@ namespace Opm
{
}
*/
/*
const WellStateFullyImplicitBlackoil* boWellState =