OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

rebasing

Browse Source
This commit is contained in:
Elyes Ahmed
2022-07-28 20:40:34 +02:00
parent 2e11d7a13a
commit 5c2b60bcd0
35 changed files with 898 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/flow/BlackoilModelEbos.hpp
+2 -2
View File
@@ -229,7 +229,7 @@ namespace Opm {
, well_model_ (well_model)
, terminal_output_ (terminal_output)
, current_relaxation_(1.0)
, dx_old_(UgGridHelpers::numCells(grid_))
, dx_old_(ebosSimulator_.model().numGridDof())
{
// compute global sum of number of cells
global_nc_ = detail::countGlobalCells(grid_);
@@ -350,7 +350,7 @@ namespace Opm {
//residual_.singlePrecision = (unit::convert::to(dt, unit::day) < 20.) ;
// Compute the nonlinear update.
const int nc = UgGridHelpers::numCells(grid_);
unsigned nc = ebosSimulator_.model().numGridDof();
BVector x(nc);
// Solve the linear system.
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
+1 -1
View File
@@ -80,6 +80,7 @@ public:
using MaterialLaw = GetPropType<TypeTag, Properties::MaterialLaw>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using MaterialLawParams = GetPropType<TypeTag, Properties::MaterialLawParams>;
using AquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
typedef AdaptiveTimeSteppingEbos<TypeTag> TimeStepper;
typedef BlackOilPolymerModule<TypeTag> PolymerModule;
@@ -90,7 +91,6 @@ public:
typedef typename Model::ModelParameters ModelParameters;
typedef typename Solver::SolverParameters SolverParameters;
typedef BlackoilWellModel<TypeTag> WellModel;
typedef BlackoilAquiferModel<TypeTag> AquiferModel;
/// Initialise from parameters and objects to observe.