Adapted to IncompTpfa needing well input/output.

This commit is contained in:
Atgeirr Flø Rasmussen 2012-04-18 13:35:15 +02:00
parent 346647ca37
commit 4d3a5ccfad

View File

@ -600,6 +600,7 @@ main(int argc, char** argv)
computeTotalMobility(*props, polyprop, allcells, state.saturation(), state.concentration(), computeTotalMobility(*props, polyprop, allcells, state.saturation(), state.concentration(),
totmob); totmob);
} }
std::vector<double> empty_vector_for_wells;
pressure_timer.start(); pressure_timer.start();
if (rock_comp->isActive()) { if (rock_comp->isActive()) {
rc.resize(num_cells); rc.resize(num_cells);
@ -611,8 +612,8 @@ main(int argc, char** argv)
rc[cell] = rock_comp->rockComp(state.pressure()[cell]); rc[cell] = rock_comp->rockComp(state.pressure()[cell]);
} }
state.pressure() = initial_pressure; state.pressure() = initial_pressure;
psolver.solve(totmob, omega, src, bcs.c_bcs(), porevol, rc, simtimer.currentStepLength(), psolver.solve(totmob, omega, src, empty_vector_for_wells, bcs.c_bcs(), porevol, rc, simtimer.currentStepLength(),
state.pressure(), state.faceflux()); state.pressure(), state.faceflux(), empty_vector_for_wells, empty_vector_for_wells);
double max_change = 0.0; double max_change = 0.0;
for (int cell = 0; cell < num_cells; ++cell) { for (int cell = 0; cell < num_cells; ++cell) {
max_change = std::max(max_change, std::fabs(state.pressure()[cell] - prev_pressure[cell])); max_change = std::max(max_change, std::fabs(state.pressure()[cell] - prev_pressure[cell]));
@ -624,7 +625,8 @@ main(int argc, char** argv)
} }
computePorevolume(*grid->c_grid(), *props, *rock_comp, state.pressure(), porevol); computePorevolume(*grid->c_grid(), *props, *rock_comp, state.pressure(), porevol);
} else { } else {
psolver.solve(totmob, omega, src, bcs.c_bcs(), state.pressure(), state.faceflux()); psolver.solve(totmob, omega, src, empty_vector_for_wells, bcs.c_bcs(),
state.pressure(), state.faceflux(), empty_vector_for_wells, empty_vector_for_wells);
} }
pressure_timer.stop(); pressure_timer.stop();
double pt = pressure_timer.secsSinceStart(); double pt = pressure_timer.secsSinceStart();