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,722 Commits 24 Branches 102 Tags
ef1c8909f20ec3486b46fb9116c9b3197f15d358
Commit Graph

3005 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
508da6689f Change include path for writeVtkData.hpp, or remove include. 2016-12-06 09:48:03 +01:00
Atgeirr Flø Rasmussen
14ab6b6810 Add writeVtkData(), including version for UnstructuredGrid. 2016-12-06 09:26:45 +01:00
Joakim Hove
7ef40b3512 Removed all calls to writeECLData. 2016-12-06 08:34:17 +01:00
Andreas Lauser
f7910af7d7 flow_ebos: do not use (smart) pointers for opm-parser objects anymore 
this patch also includes code to make FlowMainEbos more autonomous
(i.e. it does not derive from FlowMainBase anymore). this allows more
flexibility how and what stuff gets created.
 2016-12-05 20:11:43 +01:00
Kai Bao
8148105ae3 Revert "changing polymer production concentration to be the grid block concnetration." 2016-12-05 15:05:56 +01:00
Tor Harald Sandve
e614c42818 Avoid hard-coded appelyard parameter in flow_ebos 
Start using the parameters in the parameter file instead of the hard-
coded ones.
Unify the restriction of the drs and drv in black-oil and black-oil-
solvent updateState
 2016-12-05 13:44:33 +01:00
Tor Harald Sandve
6e03b9706f Apply Appleyard fixes to solven model 
Tested on SPE5 and Model2 + co2
 2016-12-05 13:44:33 +01:00
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
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
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
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
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
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
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
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
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
Markus Blatt
a6c323c48b Read and write rate and pressure per well perforation when gathering. 2016-11-21 21:19:39 +01:00
Robert Kloefkorn
feea8c1753 Introduce parameter for time step in days when single precision should be used 
in the linear solvers. Also, a parameter was introduced to toggle the use of AMG.
 2016-11-21 17:18:24 +01:00
Markus Blatt
a16bce8785 Fixes unsused parameter warnings for ebos stuff 2016-11-21 15:23:12 +01:00
Atgeirr Flø Rasmussen
720d341c76 Merge pull request #938 from dr-robertk/PR/cleanup-paralleldebugoutput 
ParallelDebugOutput: remove unused variable and tabbing.
 2016-11-21 12:20:32 +01:00
Robert Kloefkorn
a2b2e6dd27 [cleanup][ParallelDebugOutput] remove unused variable and tabbing. 2016-11-21 11:26:08 +01:00
Atgeirr Flø Rasmussen
95cc415fba Merge pull request #937 from akva2/quell_warnings 
Quell some compiler warnings
 2016-11-21 11:11:46 +01:00
Arne Morten Kvarving
caac9d7843 fixed: put variable under ifdef to avoid unused warnings without mpi 2016-11-21 10:21:11 +01:00
Arne Morten Kvarving
b0aae037f6 quell unused variable warning 2016-11-21 10:20:24 +01:00
Atgeirr Flø Rasmussen
e223c03647 Merge pull request #800 from OPM/frankenstein 
Frankenstein V2
 2016-11-18 15:49:31 +01:00
Robert Kloefkorn
5fce54fd44 [bugfix][ISTLSolver] make code compile with AMG when different matrix operator 
is used.
 2016-11-18 12:47:54 +01:00
Robert Kloefkorn
59f40ba14e [cleanup][WellModelMatrixAdapter] use only one implementation of the matrix 
adapter to avoid confusion.
 2016-11-18 12:47:54 +01:00
Robert Kloefkorn
a0da20378c [bugfix][WellModelMatrixAdapter] fix applyscaleadd method. 2016-11-18 12:47:54 +01:00