OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #910 from atgeirr/fix-twophase-sim

Browse Source 
Fix twophase sim
This commit is contained in:
Andreas Lauser committed 2015-10-21 17:39:04 +02:00
2 parents d94e0fc0f7 62f59fa624
commit 3dea26ece4
2 files changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/sim_2p_incomp.cpp
+6 -4
View File
@@ -249,15 +249,17 @@ try
// Use timer for last epoch to obtain total time.
simtimer.init(timeMap);
const double total_time = simtimer.totalTime();
for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) {
// for (size_t reportStepIdx = 0; reportStepIdx < timeMap->numTimesteps(); ++reportStepIdx) {
size_t reportStepIdx = 0; // Only handle a single, unchanging well setup.
{
// Update the timer.
simtimer.setCurrentStepNum(step);
simtimer.setTotalTime(total_time);
// Report on start of report step.
std::cout << "\n\n-------------- Starting report step " << reportStepIdx << " --------------"
<< "\n (number of time steps: "
<< simtimer.numSteps() - step << ")\n\n" << std::flush;
// std::cout << "\n\n-------------- Starting report step " << reportStepIdx << " --------------"
// << "\n (number of time steps: "
// << simtimer.numSteps() - step << ")\n\n" << std::flush;
// Create new wells, well_state
WellsManager wells(eclipseState , reportStepIdx , *grid->c_grid(), props->permeability());
opm/core/props/satfunc/SaturationPropsFromDeck.cpp
+3 -3
View File
@@ -82,7 +82,7 @@ namespace Opm
{
assert(cells != 0);
const int np = BlackoilPhases::MaxNumPhases;
const int np = numPhases();
if (dkrds) {
ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_);
fluidState.setSaturationArray(s);
@@ -141,7 +141,7 @@ namespace Opm
{
assert(cells != 0);
const int np = BlackoilPhases::MaxNumPhases;
const int np = numPhases();
if (dpcds) {
ExplicitArraysSatDerivativesFluidState fluidState(phaseUsage_);
typedef ExplicitArraysSatDerivativesFluidState::Evaluation Evaluation;
@@ -196,7 +196,7 @@ namespace Opm
int gpos = phaseUsage_.phase_pos[BlackoilPhases::Vapour];
int opos = phaseUsage_.phase_pos[BlackoilPhases::Liquid];
const int np = phaseUsage_.num_phases;
const int np = numPhases();
for (int i = 0; i < n; ++i) {
const auto& scaledDrainageInfo =
materialLawManager_->oilWaterScaledEpsInfoDrainage(cells[i]);