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,805 Commits 24 Branches 102 Tags 90 MiB
553f345670
Commit Graph

4805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
294ca31fc8 Fixes in the Appelyard in updateState and updateWellState 
1) changes dp_max_rel default to 0.2
2) introduces a dbhp_max_rel paramter to restrict the bhp update in the
updateWellState() (instead of using the dp_max_rel) Default is set to
1.0
3) Restrict rs and rv between 0,and the satruation value
4) Set rs and rv to zero for the water only cases
5) Guard against zero rs and rv when calcuating the maximum allowed rs
and rv change.

Tested on norne, model 2 and model 2.2

Number of problems for the different models with and without this fix
Case
this PR master
Norne
10
45
Model 2
21
78
Model 2.2
200
248
 2016-12-05 13:44:33 +01:00
Kai Bao
81a73650de polymer production concentration to be the grid block concnetration. 
To be more consistent with the injection well.
 2016-12-05 12:52:21 +01:00
Andreas Lauser
676af2b00b AdaptiveTimeStepping: fix stupid (but harmless) mistake in the sub-step info message 
that was a copy-and-pasto: newton iterations = linearizations - 1
 2016-12-03 15:04:32 +01:00
Markus Blatt
dcb3a20f7a Specialize direct solver for Dune::MatrixBlock. 
In upstream they expect to be used with FielMatrix as
the block type only. Thus it it is impossible to use AMG
with a direct coarse solver within OPM. With this patch
it would be possible if we did not use field type float.
 2016-12-02 15:34:31 +01:00
Robert Kloefkorn
42ab4d133f [bugfix] add defunct_well_names to BlackoilModelEbos. 2016-12-02 11:13:06 +01:00
Robert Kloefkorn
2eca5d71e6 [bugfix] fix ownerMask for parallel FIP code. 2016-12-01 22:25:46 +01:00
Andreas Lauser
e6acf888cc flow_ebos: tell the ebos in ourselves to not handle SWATINIT 
because the flow part also wants to do this. (and it is quite a bit
more stubborn!)
 2016-12-01 16:50:31 +01:00
Robert Kloefkorn
c5ca9649d7 [bugfix] Make initialization work in parallel for flow_ebos. 2016-12-01 16:50:31 +01:00
Robert Kloefkorn
1c2a2c417c [bugfix] make flow_ebos work when no wells are present. 2016-12-01 16:50:28 +01:00
Andreas Lauser
5ebed2f500 flow_ebos: only instantiate the grid once 
it now uses the grid object which gets created by ebos for everything
which should make the parallelization efforts easier. I also tried to
cut back the use of the legacy property objects (i.e., for the fluid,
geologic and rock properties), but this effort ran aground because of
the initialization and output code. (also, if those two were fixed,
there would probably be issues with the Newton update.)

I ran Norne with this and there did not seem to be any notable
performance regressions or benefits.
 2016-12-01 16:50:06 +01:00
Jørgen Kvalsvik
28c36ef949 Mini deck is reference, not pointer 2016-12-01 16:18:04 +01:00
Atgeirr Flø Rasmussen
2abb2c8144 Merge pull request #914 from GitPaean/test_iterative_wellcontrol 
[WIP] making the updateWellControls an iterative process for StandardWells
 2016-12-01 10:52:03 +01:00
Atgeirr Flø Rasmussen
63b0498843 Merge pull request #951 from andlaus/improve_SimulatorReport 
extend and clean up the SimulatorReport
 2016-11-30 19:34:11 +01:00
Andreas Lauser
6720eb7a75 clean up and extend the SimulationReport class 
it now also accounts for assembly, linear solve, update and output
write time and indicates if an operation has converged.
 2016-11-30 11:27:49 +01:00
Arne Morten Kvarving
f6cf4bfc56 Merge pull request #956 from akva2/multiple_norne_runs 
changed: use a separate output dir for each simulator in norne integration test
 2016-11-30 10:46:45 +01:00
Atgeirr Flø Rasmussen
1ea5440c40 Merge pull request #959 from akva2/update_jenkins_grid 
update jenkins upstream list
 2016-11-29 22:50:06 +01:00
Arne Morten Kvarving
cefc1bb92f update jenkins upstream list 
opm-grid moved in the dependency graph
 2016-11-29 21:47:42 +01:00
Bård Skaflestad
6281d1f090 Merge pull request #958 from andlaus/fix_asserts 
StandardWellsDense: fix two assertations
 2016-11-29 15:05:32 +01:00
Andreas Lauser
69240fe435 StandardWellsDense: fix two assertations 
the compiler suggested braces around the conditions, and by look of
it, it was right: these asserts most likely want express that only the
threephase case or the twophase case without gas are handled...
 2016-11-29 14:29:51 +01:00
Andreas Lauser
eb4e2c9548 Merge pull request #957 from andlaus/flow_ebos-fix-debug-build 
flow_ebos: fix build with debugging flags
 2016-11-29 11:41:18 +01:00
Andreas Lauser
fdb01cb9a3 flow_ebos: fix build with debugging flags 
once more, it seems like we became a victim of the combinatorial
explosion of possibilities.
 2016-11-29 11:36:30 +01:00
Andreas Lauser
5bb23cfe9d Merge pull request #946 from andlaus/implement_two-phase_blackoil 
Implement two phase blackoil
 2016-11-28 15:16:19 +01:00
Atgeirr Flø Rasmussen
3887c584f6 Merge pull request #954 from GitPaean/fixing_wellsactive_checking 
adding localWellsActive() checking for two MSW functions
 2016-11-28 12:16:27 +01:00
Arne Morten Kvarving
41b2dadff5 changed: use a separate output dir for each simulator in norne integration test 2016-11-28 10:15:21 +01:00
Andreas Lauser
8c5f92dbc4 extend and clean up the SimulatorReport 2016-11-25 21:19:57 +01:00
Kai Bao
69d5ec94c9 adding localWellsActive() checking for two MSW functions 
updatePerfPhaseRatesAndPressures() and addWellFluxEq()
 2016-11-25 13:45:38 +01:00
Atgeirr Flø Rasmussen
42eb5e77a5 Merge pull request #952 from akva2/fix_oilkr 
fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless
 2016-11-25 08:00:13 +01:00
Arne Morten Kvarving
312491f349 Merge pull request #2 from andlaus/flow_ebos-fix-kr-units 
also fix the units of the relperm in SimulatorFullyImplicitBlackoilOutputEbos
 2016-11-24 18:19:33 +01:00
Andreas Lauser
12bed02b1e also fix the units of the relperm in SimulatorFullyImplicitBlackoilOutputEbos 2016-11-24 18:13:49 +01:00
Arne Morten Kvarving
f813d829e4 fixed: [WAT|OIL|GAS)KR are ratios and thus dimensionless 2016-11-24 17:43:06 +01:00
Kai Bao
e57da11fbd making the updateWellControls an iterative process for StandardWells 
Seperating the updateWellStateWithTarget from updateWellControls, will
update the controls when any of the control constraints gets broken.

The reason is that the updated well control can still break some of
other the contstaints. We need to choose one control to make sure all the
constraints are honored.
 2016-11-24 11:27:59 +01:00
Arne Morten Kvarving
0429c756ba Merge pull request #944 from akva2/add_init_tests 
New test class: init
 2016-11-23 13:10:09 +01:00
Arne Morten Kvarving
9cae20d6f3 added: new test class: init 
this compares the init file from a simulation run to a reference
in opm-data
 2016-11-23 12:54:21 +01:00
Arne Morten Kvarving
c8fae07be3 Merge pull request #904 from akva2/parallel_io_tests 
add new regression test class: parallel
 2016-11-23 11:26:28 +01:00
Arne Morten Kvarving
d8a829db46 add new regression test class: parallel 
this compares the output of a serial and a parallel
run for a simulation
 2016-11-23 10:59:48 +01:00
Arne Morten Kvarving
31d5d2824c Merge pull request #948 from akva2/move_seq_test 
Redo existing tests
 2016-11-23 10:53:54 +01:00
Arne Morten Kvarving
26ebe27cad convert flow_sequential SPE1CASE1 test to actual regression test 2016-11-22 16:51:39 +01:00
Arne Morten Kvarving
a27e58c0bf changed: remove duplicated test 
no reason to run spe1case2 without checking output as we have
tests checking the output in place
 2016-11-22 16:51:39 +01:00
Arne Morten Kvarving
93f2bfc526 changed: allow specifying simulator to use for tests 
in preparation for adding tests for others
 2016-11-22 16:51:39 +01:00
Atgeirr Flø Rasmussen
bda6a42299 Merge pull request #939 from blattms/fix-ebos-warnings 
Fixes unsused parameter warnings for ebos stuff
 2016-11-22 15:33:34 +01:00
Tor Harald Sandve
d23270c98f Fix the 2p simulator 
Only tested for oil+water case
The blockmatrix and vectors are hardcoded to be 3
and a trivial equation is used for the Gas phase.
 2016-11-22 15:01:48 +01:00
Andreas Lauser
5e0804b39f some twophase fixes for flow_ebos 
this changes the conversion of the results to hopefully make it work
with twophase simulations. Note that flow_ebos still does not work
because there is a crash in the well model that I don't understand
(and also, I've disabled an assertation in the well model plus I'm not
completely sure if the conversion code need to do something about the
primary variables in the twophase case).
 2016-11-22 15:01:48 +01:00
Joakim Hove
21b1b2318d Merge pull request #943 from jokva/write-init-and-egrid-rename 
Rename to EclipseWriter.writeInitial
 2016-11-22 12:59:51 +01:00
Arne Morten Kvarving
ecd0e2c5bd Merge pull request #940 from joakim-hove/remove-python-tests 
Remove python tests.
 2016-11-22 12:07:17 +01:00
Atgeirr Flø Rasmussen
621a72bb25 Merge pull request #941 from blattms/read-write-perforation-rates-and-pressure 
Read write perforation rates, pressure, phase reates, and control of wells.
 2016-11-22 11:16:19 +01:00
Jørgen Kvalsvik
ffc3de0f6e Rename to EclipseWriter.writeInitial 2016-11-22 09:52:41 +01:00
Atgeirr Flø Rasmussen
d075940ccc Merge pull request #924 from dr-robertk/PR/introduce-singleprecision-parameter 
Introduce parameter for time step in days when single precision should be used.
 2016-11-22 07:57:50 +01:00
Markus Blatt
0179a17704 Gather well controll, too. 2016-11-21 21:20:47 +01:00
Markus Blatt
f601ac4013 Gather perforation phase rates, too. 
To do this we needed to switch from WellState to WellStateFullyImplicitBlackoil
as only the latter stores this information.
 2016-11-21 21:19:51 +01:00
Markus Blatt
88e118d76a Consistently use WellStateFullyImplicitBlackoil in output 
Otherwise we cannot write out all the data in a parallel run.
 2016-11-21 21:19:51 +01:00