Merge pull request #317 from blattms/generic-equil

Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
This commit is contained in:
Atgeirr Flø Rasmussen
2015-02-20 18:24:05 +01:00
3 changed files with 173 additions and 24 deletions

View File

@@ -198,7 +198,10 @@ try
}
}
} else if (deck->hasKeyword("EQUIL") && props->numPhases() == 3) {
OPM_THROW(std::logic_error, "sim_fibo_ad_cp does not support EQUIL initialization.");
state.init(grid->numCells(), grid->numFaces(), props->numPhases());
const double grav = param.getDefault("gravity", unit::gravity);
initStateEquil(*grid, *props, deck, eclipseState, grav, state);
state.faceflux().resize(grid->numFaces(), 0.0);
} else {
initBlackoilStateFromDeck(grid->numCells(), &(grid->globalCell())[0],
grid->numFaces(), UgGridHelpers::faceCells(*grid),