OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-22 15:33:29 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,208 Commits 24 Branches 102 Tags 84 MiB
0b3217fe6f
Commit Graph

1208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
0b3217fe6f initStateFromDeck(): do not accept potentially contradicting ways to set the initial condition 
i.e. PRESSURE and EQUIL are now considered mutually exclusive...
 2014-03-13 16:33:32 +01:00
Bård Skaflestad
d88a5572b8 Merge pull request #506 from atgeirr/suppress-warnings 
Suppress warnings
 2014-03-06 11:37:17 +01:00
Atgeirr Flø Rasmussen
85a323e7da Remove warning pragmas. 
They are only available on gcc 4.6 and newer, and clang.
 2014-03-05 08:41:53 +01:00
Joakim Hove
8be1f0e8d3 Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status 2014-03-04 20:23:19 +01:00
Atgeirr Flø Rasmussen
ae0464afe3 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen
95a17f847a Suppress warnings from included istl code. 
This is done using #pragma GCC and works also in clang.
 2014-03-04 11:31:16 +01:00
Atgeirr Flø Rasmussen
b40d2e63d0 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Joakim Hove
e5f1e1b0b8 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:16:10 +01:00
Kristian Flikka
a055b529ec Add handling of WGRUPCON to new-parser friendly WellsManager constructor 2014-02-24 15:24:33 +01:00
Atgeirr Flø Rasmussen
50637e1a3b Make linear interpolation default for saturation properties. 
This includes relative permeability and capillary pressure functions.
The default has been to make a monotone spline from the given table
values and use a fine, uniform sampling of that. Now the default
is to use the tables as-is. It is still possible to use the spline
approach. For example in the class BlackoilPropertiesFromDeck one
may pass nonzero values for the 'pvt_tab_size' and 'sat_tab_size'
parameters, corresponding to how fine the spline will be sampled.
 2014-02-21 09:54:47 +01:00
osae
c93c1252e5 Endpoint scaling and hysteresis for gwseg. 
Activation of eps and hysteresis treatment for gwseg. Also some
additional initialization.
 2014-02-18 13:49:35 +01:00
Kristian Flikka
ab42682399 Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing 2014-02-14 15:36:32 +01:00
Joakim Hove
4982a913ee Merge pull request #493 from flikka/wellsmanager-group-refactor 
Adding support for creation of groups from "new style" Wells and Groups (new parser)
 2014-02-14 13:54:24 +01:00
Kristian Flikka
d1494e7daa Removed the previously introduced getAndUnRootChild method 2014-02-14 13:46:54 +01:00
Kristian Flikka
3c93c7a781 Added building of WellsCollection group structure from new opm-parser objects 2014-02-14 13:43:25 +01:00
Kristian Flikka
ae8944f6ea Added an else to avoid unnecessary checking. 2014-02-14 09:01:21 +01:00
Kristian Flikka
d7568b4adf Changed the WellCollection addChild functions to be more specific, and strict 2014-02-13 16:00:39 +01:00
Kristian Flikka
f94f63ff56 Extracted common functionality from the three create functions 2014-02-12 15:45:06 +01:00
Kristian Flikka
1181d1c1bc Create WellsGroupInterface from opm-parser Well/Group objects 2014-02-12 15:39:57 +01:00
Andreas Lauser
24cf0ab99f add back a newline which went MIA 
this confused the heck out of us during review. thanks to @bska for
stumbling over it...
 2014-02-12 15:06:46 +01:00
Andreas Lauser
42f5025c88 add variants of all methods which take a deck of the new parser to the BlackOilPropertiesFromDeck 2014-02-12 15:06:46 +01:00
Joakim Hove
0393a8f87d Merge pull request #467 from andlaus/parser-integrate_rock_properties 
add variants of all methods which take a deck of the new parser to the rock properties
 2014-02-11 18:13:07 +01:00
Kristian Flikka
7ba6431209 Fixed copyright section 2014-02-11 14:21:15 +01:00
Kristian Flikka
b6072e5112 Added support for creation of WellsGroup objects from new parser Well and Group objects 2014-02-11 14:12:36 +01:00
Andreas Lauser
4018bcfc71 make the saturation functions work with opm-parser 2014-02-10 14:50:37 +01:00
Andreas Lauser
1221ea25c1 more typos 
thanks to @bska
 2014-02-10 14:49:58 +01:00
Andreas Lauser
5b77bcd4a0 handle the ROCK keywords using the new opm-parser utility class 2014-02-10 14:49:58 +01:00
Andreas Lauser
e177b657f9 use the (new) RocktabTable class for rock compressibility 
thanks to @bska for pointing this out
 2014-02-10 14:49:58 +01:00
Andreas Lauser
7fdda98213 add variants of all methods which take a deck of the new parser to the rock properties 2014-02-10 14:49:58 +01:00
Joakim Hove
88c99663c6 Merge pull request #469 from andlaus/parser-integrate_phase_usage_from_deck 
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
 2014-02-10 13:30:39 +01:00
Andreas Lauser
f1f801aca5 add back blank line as requested by @bska 2014-02-07 19:35:28 +01:00
Andreas Lauser
a91a6c9484 git add variant of phaseUsageFromDeck() which takes a deck of the new parser 2014-02-07 19:35:28 +01:00
Joakim Hove
5d8c1244db Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2014-02-07 09:23:39 +01:00
Joakim Hove
97bfb0ed82 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-07 09:23:22 +01:00
Kristian Flikka
6632630269 Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad 2014-02-06 21:17:36 +01:00
Kristian Flikka
aa329b8b3e Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses 2014-02-06 16:31:35 +01:00
Joakim Hove
2c05b6a1b4 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 23:06:54 +01:00
Atgeirr Flø Rasmussen
cb99938c62 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Joakim Hove
ca2def2a02 Merged upstream/master 2014-02-04 21:42:07 +01:00
Kristian Flikka
3d215691da Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function 2014-02-03 09:22:28 +01:00
Kristian Flikka
76dff2e326 Extracted well controls setup to separate function 2014-02-03 09:07:58 +01:00
Kristian Flikka
e12ec1b25d Extracted well specification and completion data setup to a function 2014-02-03 08:58:54 +01:00
Atgeirr Flø Rasmussen
5ce1d09370 Merge pull request #478 from osae/endscale 
Saturation table scaling and hysteresis.
 2014-01-31 05:48:56 -08:00
Bård Skaflestad
0fc3571488 Fix fallout from PR #474 
The check introduced in PR #474 (commit ad899fc) means all decks
must supply valid depth data.  Update test decks accordingly to
restore "make test".
 2014-01-31 14:24:02 +01:00
Joakim Hove
30df3cab37 Using well->hasInjectionControl() to check whether a particular control is available. 2014-01-30 16:37:20 +01:00
Joakim Hove
35d0808fbe Implemented WCONPROD support from Parser::Schedule object. 2014-01-30 15:55:17 +01:00
Joakim Hove
3e2df33a65 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates 
Conflicts:
	opm/core/wells/WellsManager.cpp
 2014-01-30 09:50:09 +01:00
Joakim Hove
70e2dd9f12 Implemented well injector properties from opm-parser::Well. 2014-01-30 08:02:13 +01:00
Joakim Hove
0d8b883b8e Added namespace prefix to enum. 2014-01-30 08:00:45 +01:00
Kristian Flikka
d621fdfe79 Removed print statement 2014-01-29 12:30:03 +01:00