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

5534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
130f222cb0 Added regression test for norne PvtLiveOil PVT. 2015-12-03 14:16:04 +01:00
Liu Ming
4790c2a2eb Add simple tests. 2015-12-02 10:59:13 +08:00
Liu Ming
252af19e4b Use OpmLog to output messages. 
return messages and opmLog.
 2015-12-02 10:58:06 +08:00
Atgeirr Flø Rasmussen
fc20fe5be9 Silence some warnings. 2015-12-01 13:36:08 +01:00
Liu Ming
944e1565fd rename variables and remove some unnecessary check and comments. 2015-12-01 13:49:49 +08:00
Liu Ming
780292875a remove unused functions and comments, add documentations to diagnosis(). 2015-11-30 10:52:34 +08:00
Liu Ming
91e14bec36 1. remove eclState from phaseCheck_ function. 
2. rename messager_ to messages_.
3. change 0 and 1 to 0.0 and 1.0
4. change unsigned to int.
 2015-11-30 10:42:57 +08:00
Liu Ming
544c7c24f9 reorder function and make more whitespace. 2015-11-30 10:26:59 +08:00
Liu Ming
5cfc3961db make enum as private members. 2015-11-30 10:20:43 +08:00
Liu Ming
6d06c36f64 1. Move implemtation to .cpp file. 
2. Delete constructors.
3. Add config.h
 2015-11-30 10:11:43 +08:00
Bård Skaflestad
d4ca0d8c00 Merge pull request #931 from andlaus/fix_build 
fix build for newish boost versions
 2015-11-27 16:17:27 +01:00
Andreas Lauser
4cded211b0 fix build for newish boost versions 
my boost is 1.58. once more, boost seemed to have become more picky on
where a semicolon must be placed and where not.
 2015-11-27 16:09:01 +01:00
Atgeirr Flø Rasmussen
ec25abb15f Merge pull request #930 from totto82/cellDepth 
Use cell depths based on averaging cell corners
 2015-11-27 10:17:49 +01:00
Liu Ming
05ebcc2067 Fix bugs and remove reptetitive messagers. 2015-11-27 10:47:04 +08:00
Liu Ming
839d2e0471 Add NEXUS scaled endpoints consistency check. 2015-11-26 16:32:17 +08:00
Liu Ming
e600383589 Check scaled endpoints mobility. 2015-11-26 15:40:40 +08:00
Liu Ming
df6043ace6 add endpoints scaling consistency check. 2015-11-26 15:22:51 +08:00
Tor Harald Sandve
fd0dbe1d48 Use cell depths based on averaging cell corners 2015-11-24 10:17:12 +01:00
Liu Ming
89d688d0f8 make use of fluidSystem. 2015-11-20 11:04:50 +08:00
Liu Ming
9428c829c3 unify the output messages. 2015-11-20 10:57:13 +08:00
Liu Ming
57f4348f6d clear up unused functions. Make some functions ad private member. 2015-11-19 16:24:09 +08:00
Liu Ming
c128e218da use commandline instead of paramGroup. 2015-11-19 16:08:26 +08:00
Liu Ming
8810a47215 fix typo and output message. 2015-11-19 13:51:03 +08:00
Liu Ming
9e7d287212 use more relax ParseMode. 2015-11-19 13:31:19 +08:00
Liu Ming
4d2c656a72 clear message output. 2015-11-19 13:31:02 +08:00
Liu Ming
5938bbc74b solve git cherry-pick conflict. 2015-11-19 11:05:43 +08:00
Liu Ming
26b680970f Use messager container to store error message. 
Conflicts:

	opm/core/props/satfunc/RelpermDiagnostics.hpp
 2015-11-19 11:00:21 +08:00
Liu Ming
1db1bf6fd6 initial RelpermDiagnostics. 2015-11-19 09:21:00 +08:00
Atgeirr Flø Rasmussen
84b3bcc6ea Merge pull request #907 from andlaus/thpress_from_initial 
implement determining the threshold pressure from the initial condition
 2015-11-17 09:03:02 +01:00
Andreas Lauser
e7d57bd0e6 thresholdPressures(): move the code which calculates the maximum gravity corrected pressure difference between EQLNUM regions to its own function 
requested by [at]atgeirr
 2015-11-13 15:36:50 +01:00
Atgeirr Flø Rasmussen
556e24f008 Merge pull request #922 from blattms/return_mask_for_updateOwnerMask 
Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask
 2015-11-13 15:20:35 +01:00
Andreas Lauser
dc9f73e94d thresholdPressures(): split several long lines 
as requested by [at]atgeirr
 2015-11-13 15:13:28 +01:00
Andreas Lauser
ec0f28c176 thresholdPressures(): constify all local variables which can be made constant 
I have doubts if this will change anything in the binaries (and in my
personal opinion, these 'const's look quite ugly and are sometimes a
(small) annoyance when debugging), but I don't mind using the coding
style used by most of the rest of opm-core here.
 2015-11-13 15:13:15 +01:00
Atgeirr Flø Rasmussen
d9dfd852f5 Merge pull request #927 from atgeirr/fix-rename-error 
Follow class renaming.
 2015-11-13 11:39:12 +01:00
Atgeirr Flø Rasmussen
909f62ef4b Follow class renaming. 2015-11-13 11:37:53 +01:00
Atgeirr Flø Rasmussen
9f7a1be749 Merge pull request #921 from dr-robertk/PR/adaptive-timestepping-revision 
AdaptiveTimeStepping: allow for more flexible error computation in the future.
 2015-11-12 17:23:11 +01:00
Bård Skaflestad
14a4b00695 Merge pull request #926 from andlaus/update_cdash_drop_site 
cdash: update dropsite
 2015-11-11 20:28:43 +01:00
Andreas Lauser
e2ec1c8547 cdash: update dropsite 2015-11-11 16:47:09 +01:00
Robert Kloefkorn
e5d3b3e10f timeError --> relativeChange. 2015-11-10 09:53:40 -07:00
Robert Kloefkorn
23c27cc826 AdaptiveTimeStepping: pass object to compute time error to time step control. This 
allows us to shift the computation of the error to the physical model.
 2015-11-10 09:45:07 -07:00
Atgeirr Flø Rasmussen
6ac19ac961 Merge pull request #920 from totto82/interpolation_points 
Change the number of integration points in the initialization
 2015-11-09 16:52:30 +01:00
Andreas Lauser
e49e9bd9b9 THPRES: only update the threshold pressure between regions if the saturation of the upstream cell is larger than the residual saturation 
before it was 0. Again, thanks to [at]totto82 for the suggestion.
 2015-11-05 15:39:29 +01:00
Andreas Lauser
f4fcb616be THPRES: change the sign of the gravity correction 
we're correcting the pressure at the cell center depths to get the
pressure at the face depth, not the other way around. This is
confusing...

thanks to [at]totto82 for discovering this.
 2015-11-05 12:29:19 +01:00
Andreas Lauser
6a9e11a4e1 fix a compressed vs logically Cartesian cell index bug 
PVTNUM is for logically Cartesian indices, but was accessed by
compressed ones.
 2015-11-05 12:29:19 +01:00
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
Markus Blatt
8d253606fc Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask 
Thus we can actually access the mask in external code. This is for
example needed when calculating averages in RateConverter of opm-autodiff.
 2015-11-02 15:02:32 +01:00
Tor Harald Sandve
7542aca827 Change the number of integration points in the initialization 
The number is changed from 100->2000 to increase accuracy.
 2015-10-30 08:14:10 +01:00
Atgeirr Flø Rasmussen
bdd5104bc5 Merge pull request #919 from blattms/fixes-wells-with-perforations-in-overlap 
Fixes well manager for wells crossing into cells that overlap.
 2015-10-28 13:23:35 +01:00
Atgeirr Flø Rasmussen
11cd4d56ad Merge pull request #918 from blattms/allow-zero-initialization-of-rock-properties 
Allow the rock properties to be zero initialized without a deck.
 2015-10-28 13:21:16 +01:00
Markus Blatt
b12708785c Make constructor taking one argument explicit. 2015-10-28 13:19:42 +01:00