OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 05:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,021 Commits 24 Branches 102 Tags 81 MiB
46bd3499dc
Commit Graph

259 Commits

Author SHA1 Message Date
babrodtk
46bd3499dc Added functions in SaturationProps for hysteresis IO 2017-04-07 14:31:22 +02:00
Andreas Lauser
1ae94c8db3 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
(ordering of the permeability matrices) 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.

in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.

finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
 2017-01-27 12:51:12 +01:00
Atgeirr Flø Rasmussen
e5bb786df2 Merge pull request #1120 from jokva/density-from-eclipsestate 
Use Density from EclipseState
 2017-01-09 10:38:30 +01:00
Atgeirr Flø Rasmussen
95d4a8101d Merge pull request #1125 from jokva/reduce-deck-use-relperm-diagnostics 
Don't rely on Deck for checkTable and checkPhase
 2017-01-09 09:35:25 +01:00
Atgeirr Flø Rasmussen
e88c7df418 Merge pull request #1124 from jokva/read-rock-from-eclipsestate 
Read ROCK from EclipseState, not Deck
 2017-01-09 09:33:47 +01:00
Atgeirr Flø Rasmussen
d81c150bae Remove unused Deck function argument. 2017-01-02 09:47:57 +01:00
Jørgen Kvalsvik
bbb30de74e Don't rely on Deck for checkTable and checkPhase 
Prefer using EclipseState over Deck.
 2016-12-20 14:08:58 +01:00
Jørgen Kvalsvik
98a3a6a3f8 Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
Jørgen Kvalsvik
3bdd674aac Read RS,RV,PRESSURE,SWAT,SGAS from EclipseState 
Prefer reading these values from EclipseState rather than the Deck type.
 2016-12-19 14:26:27 +01:00
Jørgen Kvalsvik
5278a1f193 Use Density from EclipseState 2016-12-15 16:06:46 +01:00
Jørgen Kvalsvik
f8b1bef974 Read PVTW from EclipseState 
Read the PVTW table entries from EclipseState rather than manually
through the Deck object.
 2016-12-06 14:53:41 +01:00
Joakim Hove
a1f31c55ce Merge pull request #1098 from jokva/phase-in-runspec 
Read phase information from EclipseState.runspec
 2016-11-02 11:52:24 +01:00
Andreas Lauser
c910ec11da Merge pull request #1096 from andlaus/Evaluation_accessors 
use accessor methods to access the value and derivatives of Evaluation objects
 2016-11-01 13:16:05 +01:00
Jørgen Kvalsvik
3bde655e12 Read phase information from EclipseState.runspec 2016-11-01 11:37:27 +01:00
Andreas Lauser
ced224378f use accessor methods to access the value and derivatives of Evaluation objects 2016-10-27 16:53:52 +02:00
Atgeirr Flø Rasmussen
5662c32605 Fix saturation family diagnostics for two-phase case. 2016-10-27 11:58:50 +02:00
Atgeirr Flø Rasmussen
a108b0fb72 Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error 
Convergence failure is "problem" not "error"
 2016-10-21 12:49:10 +02:00
Atgeirr Flø Rasmussen
e4faa86973 Add option to enable logging (default true). 
This makes it possible to avoid logging from this class in a parallel setting.
 2016-10-20 22:39:08 +02:00
Andreas Lauser
ce4d7c586e RelpermDiagnostics: fix the build 
this broke because EclEpsScalingPointsInfo::extractScaled() now
requires the deck and the EclipseState as additional parameters.
 2016-10-20 20:01:03 +02:00
Jørgen Kvalsvik
a52724ae97 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Atgeirr Flø Rasmussen
f889306c05 Undo premature API change adaption. 2016-10-18 15:34:53 +02:00
Andreas Lauser
fabdfbafcb consolidate the unit system to opm-parser 
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
 2016-10-10 17:50:26 +02:00
Atgeirr Flø Rasmussen
35ce9f5884 Avoid shadowing warning by using explicit scope. 2016-09-23 15:15:17 +02:00
Tor Harald Sandve
fa16d6c172 use table.size() instead of read from deck. 2016-09-16 10:31:41 +02:00
Tor Harald Sandve
b317124d94 Bugfix: Let NTMISC determine number of MISC tables 
Number of misc tables is given by NTMISC (MISCNUM) and not NTSFUN
(SATNUM)
 2016-09-16 10:31:41 +02:00
Andreas Lauser
2f3cdfd9e0 fix incorrect derivative of rock compressibility w.r.t. pressure 
since

f(x) = 1 + 0.5*g(x)*g(x)

the derivative is

f'(x) = 0 + 2*0.5*g(x) * g'(x) = g(x)*g'(x)

note that the previous incorrect values do not affect the quality of
the obtained results (if the tolerance of the non-linear solver is
chosen to be small enough), but it may have deteriorated convergence
rates.
 2016-07-19 18:19:30 +02:00
Tor Harald Sandve
1d7e4146ed Fixing some nitpicks 2016-06-24 13:36:05 +02:00
Tor Harald Sandve
cc100a6217 Fix bug for OIL-GAS case 
- Differentiate between active and canonical phase index
 2016-06-20 11:14:36 +02:00
Tor Harald Sandve
3247aaa557 Fix reference pressure for oil-water problem 
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
 2016-06-20 10:36:24 +02:00
Bård Skaflestad
e444a03f34 Merge pull request #1037 from atgeirr/add-phasepresence-ops 
Add operator== and operator!= to PhasePresence.
 2016-06-15 19:56:11 +02:00
Atgeirr Flø Rasmussen
d065a2c095 Make new ops const. 2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen
b0c6e43cf8 Add operator== and operator!= to PhasePresence. 
This makes it simpler to write code debugging or inspecting changed phase configurations.
 2016-06-15 08:57:20 +02:00
Liu Ming
3179a1bf5d fix indentation issue. 2016-06-15 11:26:06 +08:00
Liu Ming
f0900e6752 unify output. 2016-06-15 11:24:20 +08:00
Liu Ming
dd26ef620c add "\n" at the end of the message. 2016-06-13 13:55:01 +08:00
Liu Ming
5fe0452bd5 minor format changes 2016-06-13 13:49:58 +08:00
Liu Ming
35f2559b6c Output file name and line number. 2016-06-08 09:45:32 +02:00
Liu Ming
73ed34043e add a blank line. 2016-06-08 09:45:04 +02:00
Andreas Lauser
8a6243962d rename some variables from "*Lad" to "*Eval" 
this was an involuntary omission in the "local AD" to "dense AD"
rename...
 2016-06-07 11:14:11 +02:00
Andreas Lauser
807261b084 rename "local AD" to "dense AD" 2016-06-03 21:57:48 +02:00
Atgeirr Flø Rasmussen
2faff12696 Merge pull request #1019 from qilicun/log-more-messages 
Write more messages into OpmLog.
 2016-05-26 11:20:49 +02:00
Liu Ming
407c7223f6 fix indentation and messages. 2016-05-23 10:47:26 +08:00
Liu Ming
9979c505b3 log the warning messages to OpmLog. 2016-05-20 14:27:38 +08:00
Liu Ming
d2143970fc Cleanup the prefix. 2016-05-20 08:54:12 +08:00
Liu Ming
3e3c028581 remove the prefix from raw string, using OpmLog format. 2016-05-19 10:07:36 +08:00
Liu Ming
8564c7b6e9 remove internal counter. 2016-05-19 09:47:57 +08:00
Liu Ming
78a5afde46 remove internal messages container. 2016-05-19 09:28:34 +08:00
Liu Ming
60256d5976 use tag for terminal output control. 2016-05-19 09:22:03 +08:00
Liu Ming
363b9a3795 unify the format. 2016-05-10 14:52:13 +08:00
babrodtk
eabb2e1f64 Runs first iterations of two-phase test case plausibly 2016-04-26 07:48:58 +02:00