OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,676 Commits 24 Branches 102 Tags 90 MiB
86fbb36fd2
Commit Graph

2971 Commits

Author SHA1 Message Date
Arne Morten Kvarving
86fbb36fd2 adjustments for imported files 
- adjust include paths
- add new test to build system
- add new example to build system
 2017-02-10 13:02:00 +01:00
Arne Morten Kvarving
109780f62f Import adaptive time stepping and simulator timer from opm-core 
also import associated tests / examples
 2017-02-10 12:04:11 +01:00
Arne Morten Kvarving
c9bd40dccd hot-fix ebos output class 
it's the pointwise addition +, not the append
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
a14f5392ee fixed: pass the fipnum data into the adaptive timer stepper 
summary substep reports requires FIP data
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
b5b42faba4 fixed: handle exceptions in I/O in parallel 
properly exit on all processes, instead of deadlocking.
async output will still deadlock as there is no way to handle this
without syncronization which would defeat the purpose of async.
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
1cb81c12e8 changed: pass fipnum array into adaptive time stepping loop 
needed as substep summary reports requires FIP data to be available.
add calculation of this data if output is requested and summary
config holds relevant keywords.
 2017-02-09 09:33:32 +01:00
Andreas Lauser
ec1f136f37 fix the build 
and also, do not std::move a unique_ptr. (that's a quite strange
thing, semantically.)
 2017-01-27 13:23:32 +01:00
Atgeirr Flø Rasmussen
511a934323 Merge pull request #1042 from andlaus/refactor_well_permeability 
do not explicitly pass the permeability to the well model anymore
 2017-01-27 13:15:59 +01:00
Andreas Lauser
42ec0ca3c3 do not explicitly pass the permeability to the well model anymore 
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
detail (ordering of the permeability matrices) of the simulator on the
well model. If this needs to be done for performance reasons, IMO it
would be smarter to pass an array of matrices instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.
 2017-01-27 13:06:09 +01:00
Atgeirr Flø Rasmussen
1b8dbd9411 Merge pull request #1040 from GitPaean/group_ebos_vrep 
Group ebos vrep
 2017-01-27 13:04:16 +01:00
Joakim Hove
270e5f9c0e Passing keys to the restart load function. 
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
 2017-01-25 23:16:08 +01:00
Kai Bao
c3f3fed47a applying the efficiency factor to all the Jacobians 
of the cq_s when entering the reservoir mass balance equations.
 2017-01-25 15:56:15 +01:00
Kai Bao
68558bec76 moving the update the well_state at the end of the updatewellCotnrols 
in StandardWellsDense.

The reason is that the update the well controls can change the well
controls. It is better to update the well states after all the control
checking is done.
 2017-01-25 14:11:27 +01:00
Kai Bao
26785597b9 putting the update of the well states to one function 
in StandardWellsDense to simplify the updateWellControls() function.
 2017-01-25 14:11:27 +01:00
Kai Bao
19eb0d96c8 adding applyVREPGroupControl() to StandardWellsDense. 2017-01-25 14:11:27 +01:00
Kai Bao
849dae8ec5 adding computeWellVoidageRates() to StandardWellsDense 2017-01-25 14:11:27 +01:00
Kai Bao
f53bf6f957 adding a pointer to rate_converter in BlackoilModelEbos 
in StandardWellsDense.
 2017-01-25 14:11:27 +01:00
Kai Bao
af26b70fc9 adding a rate converter to BlackoilModelEbos 
and also function updateRateConverter() to update its state.
 2017-01-25 14:11:27 +01:00
Atgeirr Flø Rasmussen
f4ea6c0781 Merge pull request #1034 from GitPaean/fixing_ebos_lrat 
fixing the LRAT control for StandardWellsDense
 2017-01-23 13:06:39 +01:00
Kai Bao
2dd4fa5bb2 fixing the LRAT control for StandardWellsDense 2017-01-23 11:30:23 +01:00
Andreas Lauser
7d5c5f8acc Merge pull request #1029 from totto82/bugfix_swatinit 
BUGFIX Pass solution from flowEbos to ebos initially
 2017-01-20 15:02:50 +01:00
Tor Harald Sandve
ce2aa77cbd BUGFIX Pass solution from flowEbos to ebos initially 
The initial solution in ebos and  in flowebos are different in cases where
swatinit is present. Pass the initial solution and recalculate the
intensive quantities make sure that the flowEbos initial solution is
used.
 2017-01-19 09:18:55 +01:00
Kai Bao
31e7dec018 removing a few blank lines. 
and adding a assertion that bhp != 0 when calculating well potentials.
 2017-01-17 15:33:45 +01:00
Kai Bao
9e93ebcc64 check whether the group targets are converged. 2017-01-16 16:18:35 +01:00
Kai Bao
65a3fff6f2 moving computeWellPotentials to be earlier in assemble() 
in StandardWellsDense.

solveWellEq then have access to the updated well potentials.

does not change the result.
 2017-01-16 16:18:35 +01:00
Kai Bao
01322b740e fixing the mistakes in the code due to rebasing. 2017-01-16 16:18:35 +01:00
Kai Bao
a95977e716 making the group control works for StandardWellsDense 2017-01-16 16:18:35 +01:00
Kai Bao
b0e2bd9221 adding well perforation efficiency factor to StandardWellsDense 
And also calculateEfficiencyFactor to initialize the values.
 2017-01-16 16:18:35 +01:00
Kai Bao
4b47fa52ca adding well collection to StandardWellsDense 
to make StandardWellsDense have access to the group information.
 2017-01-16 16:18:35 +01:00
Kai Bao
941689722f adding functioin computeWellPotentials to StandardWellsDense 2017-01-16 16:18:35 +01:00
Kai Bao
92a4d8687f adding bhp as a parameter of computeWellFlux in StandardWellsDense 
To make the function usable for computing well potentionals.
 2017-01-16 16:18:35 +01:00
Atgeirr Flø Rasmussen
5955cb07ba Merge pull request #1026 from andlaus/flow_ebos-sync-with-flow_legacy 
Flow ebos sync with flow legacy
 2017-01-16 15:56:20 +01:00
Andreas Lauser
ae38de70ef flow_ebos: update the solution of the eWoms model from the reservoir state before each time step 
this is has become necessary by the recent SWATINIT changes and is
needed to calculate the fluid-in-place consistently as well as for
ebos to use the correct initial solution for the initial
linearization.
 2017-01-16 12:42:35 +01:00
Andreas Lauser
30e9d3826d synchronize SimulatorFullyImplicitBlackoilEbos::run() with SimulatorFullyImplicitBlackoil::run() 2017-01-16 12:42:35 +01:00
Andreas Lauser
d87b788d09 BlackoilModelEbos: make computeFluidInPlace() work unconditionally 
i.e. it now works regardless of whether the cache for intensive
quatities is available or not.
 2017-01-16 12:42:35 +01:00
Atgeirr Flø Rasmussen
1d918453c9 Warn instead of throw when missing DIMS keyword. 
Default values will be used for parsing.
 2017-01-13 11:07:02 +01:00
Atgeirr Flø Rasmussen
8534b82c2e Merge pull request #1022 from atgeirr/silence-warning 
Silence unused argument warning.
 2017-01-13 09:26:46 +01:00
Atgeirr Flø Rasmussen
bc35b753b5 Merge pull request #1003 from blattms/merge-only-created-parallel-files 
Only try to merge files from a parallel run if ouptput requested.
 2017-01-12 17:00:12 +01:00
Atgeirr Flø Rasmussen
6ea858b6b9 Silence unused argument warning. 2017-01-12 15:35:13 +01:00
Atgeirr Flø Rasmussen
af3049b5a6 Merge pull request #1016 from andlaus/flow_ebos-remove-redundant-gravity 
flow_ebos: remove the redundant gravity objects
 2017-01-12 12:19:19 +01:00
Andreas Lauser
7a7ebc010f flow_ebos: remove the redundant gravity objects 
the canonical source is now the EclProblem object.

v2: don't change the API of the DerivedGeology class. thanks to
    [at]atgeirr for noticing that this can be avoided.
 2017-01-12 11:20:02 +01:00
Atgeirr Flø Rasmussen
0028b35e03 Merge pull request #1018 from andlaus/simplify_isParallel 
simplify BlackoilModelEbos::isParallel()
 2017-01-12 10:41:15 +01:00
Tor Harald Sandve
28bbe20344 Merge pull request #1012 from andlaus/cleanup_StandardWellsDense 
small improvements to StandardWellsDense
 2017-01-12 10:27:18 +01:00
Atgeirr Flø Rasmussen
af2c9a8200 Merge pull request #1015 from andlaus/flow_ebos-remove-redundancy 
FlowMainEbos: remove the redundant pointer to the MaterialLawManager
 2017-01-12 10:25:47 +01:00
Atgeirr Flø Rasmussen
eb8132453f Merge pull request #1017 from andlaus/remove_allcells 
SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute
 2017-01-12 09:59:41 +01:00
Andreas Lauser
3a9146866a simplify BlackoilModelEbos::isParallel() 2017-01-11 18:57:47 +01:00
Andreas Lauser
f808c5b681 SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute 2017-01-11 18:53:06 +01:00
Andreas Lauser
8c76bf5b9b FlowMainEbos: remove the redundant pointer to the MaterialLawManager 2017-01-11 17:16:46 +01:00
Andreas Lauser
f2115b44ac BlackoilModelEbos: remove the last traces of "SolutionState" 
it was not used for real for a while anyway.
 2017-01-11 17:07:08 +01:00
Andreas Lauser
b324d17003 small improvements to StandardWellsDense 
the most significant change is that only a "PhaseUsage" object must be
passed to its constructor instead of a full "fluid object". also, the
pointers to the vector of "active" phases has been converted into a
full object. (this helps to avoid potential use-after-free errors.)
 2017-01-11 17:02:20 +01:00