Commit Graph

6918 Commits

Author SHA1 Message Date
Joakim Hove
854b79c280
Merge pull request #1233 from joakim-hove/thpres-refactor
Thpres refactor
2019-11-27 10:46:18 +01:00
Joakim Hove
ca95ff1b86
Merge pull request #1235 from joakim-hove/fp-keys
Add FieldPropsManager::keys<T>() method for iteration
2019-11-27 10:06:23 +01:00
Joakim Hove
0380b9911e
Merge pull request #1261 from joakim-hove/udqtest-data-fixup
Update test fixture to use correct grid
2019-11-27 10:02:58 +01:00
Joakim Hove
94a58e87bf
Merge pull request #1234 from joakim-hove/region-cache-fp
Region cache fp
2019-11-27 09:50:29 +01:00
Joakim Hove
29b5f1e8b6 Use FieldPropsManager for THPRES initialization 2019-11-27 09:48:13 +01:00
Joakim Hove
b2d9e92e25 Update test fixture to use correct grid 2019-11-26 21:34:04 +01:00
Joakim Hove
866aa5c5ca Add alternative FieldPropsManager argument to THPRES constructor 2019-11-26 20:49:15 +01:00
Joakim Hove
8e76b1346a Moved some variables closer to use-site 2019-11-26 20:49:15 +01:00
Arne Morten Kvarving
c2de0e09a3
Merge pull request #1259 from akva2/rename_accessor
changed: rename accessor to data()
2019-11-26 14:28:33 +01:00
Arne Morten Kvarving
0d6ed7cfb6 changed: rename accessor to data()
the two classes EDITNNC and NNC are very similar, which makes templating
useful. this small difference makes it hard to do. unify them.
2019-11-26 13:20:17 +01:00
Joakim Hove
d3cc7303b4
Merge pull request #1256 from akva2/fix_forwards
fixed: forward declared the intended classes
2019-11-26 13:03:37 +01:00
Arne Morten Kvarving
e1e9fb7110 fixed: forward declared the intended classes 2019-11-26 10:40:03 +01:00
Bård Skaflestad
be27bb6154
Merge pull request #1248 from berland/wpotcalc
Change section for WPOTCALC keyword to RUNSPEC
2019-11-21 16:03:33 +01:00
Joakim Hove
91c40e60c6 Add FieldPropsManager::keys<T>() method for iteration 2019-11-21 10:21:01 +01:00
Joakim Hove
b3d28e10cc
Merge pull request #1246 from joakim-hove/fp-default-region
FieldProps::default_region() - public property
2019-11-21 10:19:16 +01:00
Håvard Berland
9cefcaf49b Change section for WPOTCALC keyword to RUNSPEC 2019-11-21 09:59:50 +01:00
Arne Morten Kvarving
049ddf74f4
Merge pull request #1247 from akva2/fix_rh_regression
fixed: a regression snuck in while enabling redhat 8
2019-11-21 09:55:19 +01:00
Arne Morten Kvarving
9bb8a35f8f fixed: a regression snuck in while enabling redhat 8
for some reason, rh7 does not link cmake3 to cmake,
while rh6 and rh8 does. cmake3 works everywhere
2019-11-21 09:01:39 +01:00
Joakim Hove
be895ce0b1 FieldProps::default_region() - public property 2019-11-21 08:43:48 +01:00
Joakim Hove
3672a29b0a
Merge pull request #1237 from joakim-hove/fp-defaulted
Fp defaulted
2019-11-21 08:39:04 +01:00
Joakim Hove
5d588fd56e
Merge pull request #1242 from akva2/add_rh8_packaging
added: support rhel8
2019-11-20 19:33:19 +01:00
Joakim Hove
eb1c9a71c7
Merge pull request #1241 from stefoss23/reorganize_krangle
added some 'special' keywords. Reorganized list of 'special' keywords.
2019-11-20 19:12:29 +01:00
Arne Morten Kvarving
3f6097bf16 added: support rhel8 2019-11-20 15:50:01 +01:00
Steinar Foss
bebcdbc43c added some 'special' keywords. Reorganized list of 'special' keywords.
added kw GCONPRI.

added kw GIALL.

added kw MASSFLOW.

added keywords MESSAGE.

RPTRST: deckname OUTSOL.

added keyword PARAOPTS.

FOAMDCN: changed structure ofg keyword.

added keywords PVG32D, PCW32D.

keyword_list.cmake: reaorginzed list of 'special' keywords.
2019-11-20 15:19:22 +01:00
Joakim Hove
f0547009fd
Merge pull request #1232 from joakim-hove/get-fp
Add EclipseState::fieldProps() method
2019-11-20 11:43:59 +01:00
Joakim Hove
f4cd0c4052
Merge pull request #1231 from joakim-hove/fp-value-status
Fp value status
2019-11-20 11:43:02 +01:00
Joakim Hove
42757a02fd Add FieldPropsManager::defaulted() property 2019-11-20 11:29:47 +01:00
Joakim Hove
11ca1194b0 Use enum value::status to keep track of value status in FieldProps 2019-11-20 10:40:51 +01:00
Joakim Hove
517dbfddc5 Use FieldProps to get FIPNUM for region cache 2019-11-20 08:38:26 +01:00
Joakim Hove
8bd9aeaf9d Change RegionCache constructor to accept std::vector<int> fipnum 2019-11-20 08:36:03 +01:00
Joakim Hove
52fabf37c7
Merge pull request #1230 from joakim-hove/deckitem-size-rename
Remove / rename DeckItem::size()
2019-11-19 20:39:33 +01:00
Joakim Hove
d8bb92b7b2 Add EclipseState::fieldProps() method 2019-11-18 10:14:59 +01:00
Joakim Hove
6cc3b578f5 Use value::status to keep track of data status in DeckItem
With this commit the DeckItem::push_backDummyDefault() function will push back a
default value T( ). This will give a change in behaviour in downstream code
which has used getData<T> to get DeckItem data unchecked.
2019-11-17 17:23:42 +01:00
Joakim Hove
3156448f99 Add enum value::status to handle the set/unset status of items 2019-11-17 11:18:05 +01:00
Joakim Hove
6dbbc8c037 Remove / rename DeckItem::size() 2019-11-16 18:31:12 +01:00
Joakim Hove
da625838b6
Merge pull request #1229 from joakim-hove/minor
Minor step in default rewrite ...
2019-11-16 12:15:04 +01:00
Joakim Hove
e15dcb216d Improved error message 2019-11-16 10:38:16 +01:00
Joakim Hove
3982e6a8c9 Renamed variables 2019-11-16 00:44:20 +01:00
Joakim Hove
4514955778
Merge pull request #1227 from stefoss23/ACTIONXtests_reinstate_tests
testfile ACTIONC.cpp: removed 'if 0'.
2019-11-16 00:39:47 +01:00
Steinar Foss
239d562581 testfile ACTIONC.cpp: removed 'if 0'.
test ACTIONX, uncommented TestActions.

ACTIONX tests: uncommented all.
2019-11-15 15:24:16 +01:00
Joakim Hove
c309c6a7e6
Merge pull request #1226 from blattms/fix-type-more-info-compareECL
Fixed typos and included more info into compareECL's exceptions
2019-11-15 11:41:11 +01:00
Markus Blatt
6761f3dc57 Fixed typos and included more info into compareECL's exceptions 2019-11-15 10:20:33 +01:00
Joakim Hove
6388fbe584
Merge pull request #1224 from joakim-hove/satfunc-init-refactor
Satfunc lookup: prepare for only active cells
2019-11-15 09:59:48 +01:00
Joakim Hove
d99d1dfcc3
Merge pull request #1220 from joakim-hove/COPYREG
More 3D Property changes
2019-11-15 09:59:33 +01:00
Joakim Hove
05e006e7a9 Changed SatfuncPropertyInitializers to use references internally 2019-11-15 08:03:03 +01:00
Joakim Hove
63f4b5494d Prepare saturation function lookup to only consider active cells 2019-11-15 08:03:03 +01:00
Joakim Hove
c8e2925134 Split saturation functions satnumApply and imbnumApply 2019-11-15 08:03:03 +01:00
Joakim Hove
7b2048ec22 Add assign(const std::vector<T>&) to FieldProps::FieldData 2019-11-15 07:55:29 +01:00
Joakim Hove
ffc67f05cf Reorganise in FieldProps 2019-11-15 07:55:29 +01:00
Joakim Hove
5d852bf3f1
Merge pull request #1223 from joakim-hove/fp-tables
Add TableManager argument to FieldProps constructor
2019-11-15 07:54:33 +01:00