OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,416 Commits 9 Branches 35 Tags 15 MiB
dec23df301
Commit Graph

80 Commits

Author SHA1 Message Date
Andreas Lauser
547b701a57 implement determining the threshold pressure from the initial condition 
This needs to be done if a equilibration region transition is
mentioned by the THPRES keyword, but no value is given for this record
in the third item. (it seems that this is used quite frequently.)

Also, the approach taken by this patch also does not collide with the
restart machinery as far as I can see. This is because the initial
condition is applied by the simulator before the state at the restart
time is loaded. (I interpreted the code that way, but I could be
wrong, could anyone verify this?)

since it is pretty elaborate to calculate initial condition, this
patch is pretty messy. I also do not know if Eclipse does include
capillary pressure in this calculation or not (this patch does). Huge
kudos go to [at]totto82 for reviewing, testing and debugging this.
 2015-11-05 12:29:19 +01:00
Tor Harald Sandve
8b94e7b0eb Make the code more readable 2015-10-20 16:09:04 +02:00
Tor Harald Sandve
2330cd615a Complete undersaturated PVTG tables by extrapolating from existing data 
This PR copies equivalent code from PvtLiveOil
 2015-10-20 11:29:20 +02:00
Andreas Lauser
c8000272bf use the error macros from opm-common 2015-10-08 11:42:15 +02:00
Joakim Hove
5b15bbdde2 Changed Table code to use TableContainer 2015-10-05 09:59:29 +02:00
babrodtk
96e1a89abe Fixed even more warnings 2015-09-03 15:17:10 +02:00
babrodtk
221d1a3e92 Fixed several warnings 2015-09-03 15:17:10 +02:00
Joakim Hove
f3151a9abe Using TableManager to get tables. 2015-09-01 12:58:09 +02:00
Atgeirr Flø Rasmussen
488e2161dc Suppress sign-comparison warnings. 2015-03-27 15:38:21 +01:00
Andreas Lauser
a386621495 add a wrapper for thermal gas PVT objects 2015-03-17 12:40:14 +01:00
Andreas Lauser
0b85af1bb6 add a wrapper for thermal oil PVT objects 2015-03-17 12:40:09 +01:00
Andreas Lauser
2a52c2926d add a wrapper for thermal water PVT objects 2015-03-17 12:40:07 +01:00
Andreas Lauser
0aa7620a0e PVT classes: do not implement temperature dependence directly anymore 
instead, we will be going with wrapper classes around the PvtInterface
in the next commits. this considerably reduces the amount of
copy-and-paste required for temperature support.
 2015-03-17 12:40:05 +01:00
Atgeirr Flø Rasmussen
13df6b91b7 Suppress unused argument warning. 2015-02-17 10:27:19 +01:00
Andreas Lauser
8dce4982fc PvtConstCompr: initialize the temperature vs viscosity table pointers in all constructors 
this fixes opm-autodiff's "boprops_ad" unit test. thanks to
[at]atgeirr for pointing this out.
 2015-02-03 15:44:25 +01:00
Andreas Lauser
c4ca344026 PVT classes: implement temperature dependent viscosity 
this is implemented such that if the simulation is unchanged,
viscosities are assumed to be not temperature dependent. (only if
pvtObject->set{Oil,Wat}visctTables() is called, temperature dependence
is considered.)
 2015-02-03 12:27:41 +01:00
Markus Blatt
fefd52a8be Fixes some unused variable warnings. 2015-01-23 20:58:37 +01:00
Andreas Lauser
e530ce03d8 PVT properties: allow them to be temperature dependent 
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
 2014-12-01 20:06:31 +01:00
Atgeirr Flø Rasmussen
91baeea8d3 Rename variable to avoid shadowing. 2014-11-24 10:54:30 +01:00
Kai Bao
ef3e524c30 Changing nColumns to nRows. 2014-09-23 13:17:47 +02:00
Kai Bao
175da5450f Changing the location of * in long formula. 2014-09-22 14:29:18 +02:00
Kai Bao
6a43935ea3 Deleting some commented lines. 2014-09-22 14:26:00 +02:00
Kai Bao
09404202da Changing the naming in PvtDead. 
To be consistent with the naming int PvtLive.
 2014-09-22 14:21:33 +02:00
Kai Bao
5d3017e6c6 Merge remote-tracking branch 'upstream/master' into PVT_viscosity_try 2014-09-22 13:01:13 +02:00
Kai Bao
ee73105c95 Using resize to allocate memory for 1/BMu. 2014-09-22 10:28:23 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Kai Bao
2b18b8f27f Finshing changing Pvt_liveGas 
Remains to be verfied.
 2014-09-18 15:28:38 +02:00
Kai Bao
eadbffa99b Changing the PvtLiveOil to use 1/BV for viscosity. 
Pssing the simple 2D test.
 2014-09-18 12:46:45 +02:00
Kai Bao
0b69961d9e A little more comment about B and b. 2014-09-17 11:15:58 +02:00
Kai Bao
d393d147a4 Updating the calculation of mu and dmudp for PvtDead. 2014-09-14 17:33:43 +02:00
Kai Bao
d9acd0f3b8 Rewriting the d_mu_d_p for deadGas. 2014-09-14 16:24:37 +02:00
Kai Bao
d9eb3ea30f Chaning using the new interpolation for viscosity 2014-09-12 13:39:16 +02:00
Atgeirr Flø Rasmussen
5059f66bad Squash warnings by removing or commenting out unused parameters. 2014-08-28 14:14:22 +02:00
Andreas Lauser
db3a616a2f PvtLiveOil: fix ordering of arguments 
the strange thing is that this worked as-is. The only explaination
which I have for this is that these code paths are unused...
 2014-07-07 11:58:54 +02:00
Andreas Lauser
31c97ca172 change item names used to query the PVCDO keyword 
That's similar to having fun with a vodoo doll...
 2014-06-06 13:18:57 +02:00
Andreas Lauser
93f7a47062 add missing include 
for some reason this seems to be only required by GCC 4.4
 2014-06-05 14:32:58 +02:00
Andreas Lauser
2545b423fc handle the case that the compressed to logically cartesian array is NULL 2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93 incorperate the review comments/decisions for multi-region PVT 
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
 2014-06-04 11:11:35 +02:00
Andreas Lauser
fbd8d42e8d Implement multi-region PVT for all property classes 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
 2014-06-04 11:11:35 +02:00
Andreas Lauser
c1c3f9d2e0 remove the table_t type 
that was an artifact only required for the old parser
 2014-05-21 11:22:43 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Andreas Lauser
89f4a6db5b adapt to the renames of the table classes in opm-parser 
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
 2014-04-28 18:47:28 +02:00
Andreas Lauser
7917295923 add opm-parser variants for the incompressible property classes 2014-04-25 14:25:54 +02:00
Atgeirr Flø Rasmussen
049df8bc60 Avoid signed/unsigned mismatch. 2014-04-15 13:39:44 +02:00
Andreas Lauser
693ac17aed fix typo: it's PVCDO, not PVDCO 
(since the parser did not have a definition for this keyword until
_very_ recently, I severly doubt that these code paths have been used
recently...)
 2014-04-11 11:56:27 +02:00
Atgeirr Flø Rasmussen
b07cd277a7 Merge pull request #561 from totto82/fix_viscosity_table 
Fix undersaturated viscosity table
 2014-04-04 22:41:11 +02:00
Tor Harald Sandve
4576917061 Fix undersaturatd viscosity table 
Data is now correctly read from ununderdatTable instead of pvtgTable
 2014-04-04 16:06:19 +02:00
osae
782a5934c9 Fixed Bg versus 1/Bg issue. 2014-03-28 17:14:16 +01:00
Andreas Lauser
5c55fb7341 fix densities for new parser in BlackoilPvtProperties 
that is one of the more subtle differences between the old and the
new parsers. now, valgrind does not seem to complain anymore, so everything
should be All Right (TM) ;)
 2014-03-18 20:42:40 +01:00