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
Joakim Hove
36c1798a38
Merge pull request #1222 from joakim-hove/grid-properties-testdata
...
Update testdata to one element for each cell
2019-11-15 07:54:15 +01:00
Atgeirr Flø Rasmussen
0ea0f07b20
Merge pull request #1225 from atgeirr/fix-abs
...
Fix abs() ambiguity, add copyright headers.
2019-11-14 23:11:01 +01:00
Atgeirr Flø Rasmussen
87a0e0e402
Fix abs() ambiguity, add copyright headers.
2019-11-14 13:09:35 +01:00
Joakim Hove
feec9c150d
Merge pull request #1219 from joakim-hove/box-keyword-constructor
...
Simplify the BOX implementation - prepare to drop the manager
2019-11-14 12:15:53 +01:00
Atgeirr Flø Rasmussen
6d83672f94
Merge pull request #1217 from joakim-hove/rename-well2
...
Rename Well2 -> Well and Group2 -> Group
2019-11-14 10:33:45 +01:00
Joakim Hove
7fbbb6d71a
Add TableManager argument to FieldProps constructor
2019-11-14 07:14:54 +01:00
Joakim Hove
60d3a074b9
Update testdata to one element for each cell
2019-11-13 23:57:59 +01:00
Joakim Hove
613ec70dab
Rename Well2 -> Well and Group2 -> Group
2019-11-13 23:19:26 +01:00
Joakim Hove
3f1cf0bc8a
Changed box implementation
2019-11-13 20:19:47 +01:00
Bård Skaflestad
8cd72f1ff0
Merge pull request #1209 from atgeirr/fix-timemap-restartintervals
...
Fix TimeMap::isTimestepInFirstOfMonthsYearsSequence() method.
2019-11-13 15:00:45 +01:00
Arne Morten Kvarving
dd8c328ca7
Merge pull request #1150 from tskille/summary
...
new program summary
2019-11-12 14:50:37 +01:00
Torbjørn Skille
59e0c39558
New program summary based on OPM I/O classes
2019-11-12 13:27:26 +01:00
Joakim Hove
eda68f74ae
Merge pull request #1191 from joakim-hove/field-properties-regions
...
Field properties regions
2019-11-12 08:37:19 +01:00
Joakim Hove
6afc118c94
Started on region operations in FieldProps implementation
2019-11-12 08:18:13 +01:00
Joakim Hove
3421b25d8e
Merge pull request #1211 from joakim-hove/monkey-patch-rename
...
Minor refactor to monkey-patching
2019-11-11 16:38:43 +01:00
Joakim Hove
d0685c1e6c
Merge pull request #1212 from joakim-hove/item-rename
...
Item rename
2019-11-11 16:38:26 +01:00
Joakim Hove
7356c76c58
Merge pull request #1204 from joakim-hove/summarynode-location
...
Add Location member to SummaryNode instances
2019-11-11 16:37:43 +01:00
Joakim Hove
f17eefcaf7
Add Location member to SummaryNode instances
2019-11-11 15:31:36 +01:00
Joakim Hove
0988f26ad9
Merge pull request #1213 from goncalvesmachadoc/patch-1
...
Add summary keywords FCPR, FCPT and CCPT
2019-11-11 13:26:44 +01:00
Cintia Goncalves Machado
7a274b2717
Add summary keywords FCPR, FCPT and CCPT
2019-11-11 09:26:36 +01:00
Joakim Hove
af4a2d78f9
Update test data to use correct region
2019-11-11 07:48:47 +01:00
Joakim Hove
24469f7a5e
Renamed item in COPYEREG keyword
2019-11-11 07:35:25 +01:00
Joakim Hove
efac465ebd
Minor refactor to monkey-patching
2019-11-10 21:09:35 +01:00
Atgeirr Flø Rasmussen
4fc71e352e
Merge pull request #1205 from totto82/defaultNUPCOL
...
Change default NUPCOL to 12
2019-11-08 17:38:20 +01:00
