Joakim Hove
bef5a4c27b
Renamed class Location -> KeywordLocation
2020-09-16 14:06:54 +02:00
Arne Morten Kvarving
44f29eb4f7
add explicit copy-constructors
...
implicitly generated copy constructors are deprecated in C++11,
if the class already has an assignment operator.
quells warnings with modern gcc/clang.
2020-09-01 15:25:44 +02:00
Joakim Hove
4b3304730c
Serializer class: SummaryState & UDQState
2020-09-01 13:15:42 +02:00
Joakim Hove
53f78a02fe
Internalize WSEGITER settings in Tuning implementation
2020-08-31 18:24:09 +02:00
Joakim Hove
71ba9ae6fd
Remove DynamicState<..> access to Tuning class
2020-08-31 17:25:40 +02:00
Joakim Hove
0161f50255
Add UDQState
2020-08-27 17:25:51 +02:00
Joakim Hove
168aa5602d
Make sure DEFINE statements are evaluated in input order
2020-08-27 15:24:32 +02:00
Joakim Hove
718e00ca1f
Correctly parse and handle UADD / UMUL / UMIN / UMAX set operations
2020-08-27 15:24:32 +02:00
Joakim Hove
1cf069c837
Merge pull request #1886 from joakim-hove/udq-tokens
...
Fix UDQ parsing for mix of '*' and *
2020-08-27 15:22:25 +02:00
Joakim Hove
76e8805d92
Merge pull request #1893 from joakim-hove/remove-require-fipnum
...
Remove function SummaryConfig::requireFIPNUM
2020-08-27 13:56:36 +02:00
Joakim Hove
dee69e78c3
Remove function SummaryConfig::requireFIPNUM
2020-08-27 11:55:17 +02:00
Joakim Hove
9ccc9a72e4
Use std::optional<double> in UDQScalar
2020-08-24 06:59:11 +02:00
Joakim Hove
6c2563c5a5
Fix tokenizer bug with mix of '*' and *
...
The token '*' should be interpreted as all wells/groups for a variable like WOPR
or GGPR, whereas the naked * is a multiplication sign. This commit fixes a bug
where the all wells/groups token '*' would be incorrectly interpreted as a
multiplication sign.
2020-08-23 08:31:15 +02:00
Joakim Hove
c84b95ed85
Merge pull request #1875 from joakim-hove/tlmixpar
...
Implement TLMIXPAR as dedicated vector of struct - not table
2020-08-14 12:56:39 +02:00
Joakim Hove
d358d94f58
Merge pull request #1806 from goncalvesmachadoc/salt
...
finalizeSaltTables
2020-08-14 12:55:49 +02:00
Joakim Hove
748c3975fb
Fix salt table tests
2020-08-13 18:44:04 +02:00
Joakim Hove
1b851f03cb
Implement TLMIXPAR as dedicated vector of struct - not table
2020-08-12 14:47:21 +02:00
Joakim Hove
f500adba24
ACTIONX will handle WLIST well arguments
2020-07-09 15:16:33 +02:00
Joakim Hove
f4f993586a
Add method WListManager::wells() which can do WLIST wildcards
2020-07-09 15:12:54 +02:00
Joakim Hove
17c61e1853
Add missing compile guards
2020-07-09 15:12:54 +02:00
Joakim Hove
eb48fb709a
Add SummaryState::get_xxx() overloads with a default argument
2020-06-29 14:14:49 +02:00
Joakim Hove
e65880aafb
Use Schedule::restart_groups()
2020-06-25 14:18:19 +02:00
Bård Skaflestad
2876751fe2
Merge pull request #1839 from joakim-hove/eval-udq
...
Eval udq
2020-06-24 14:15:27 +02:00
Bård Skaflestad
c07aec9c68
Merge pull request #1838 from joakim-hove/schedule-restart-group
...
Schedule restart group
2020-06-24 13:56:32 +02:00
Joakim Hove
f6d160db32
Add convenience method Schedule::restart_groups()
2020-06-24 12:53:09 +02:00
Joakim Hove
633bbb6007
Introduce named constant for UDQ default value in restart files
2020-06-24 01:08:36 +02:00
Joakim Hove
ae5c6fe53e
Made eval_udq into method UDQConfig::eval()
2020-06-24 01:05:59 +02:00
Cintia Goncalves Machado
784abc7069
deleteSolidPhasefromPhases
2020-06-19 13:31:33 +02:00
Joakim Hove
dd1591f1a2
Use Action::State object to keep track of actions being run
2020-06-18 16:45:39 +02:00
Joakim Hove
f54245f1ca
Add class Action::State to keep track of ACTIONX count
2020-06-18 16:45:39 +02:00
Joakim Hove
7d856b4933
Add id member to ActionX objects
2020-06-18 16:45:39 +02:00
Bård Skaflestad
2123884655
Merge pull request #1408 from jalvestad/extend_udq_actx_rst
...
Changes to extend and improve the ECL-compatible restart
2020-06-18 16:29:52 +02:00
Arne Morten Kvarving
8d3680c7b5
anonymize to quell unused parameter warning
2020-06-18 08:27:48 +02:00
Joakim Hove
986f0acad7
Merge pull request #1826 from akva2/add_missing_initializer
...
fixed: add missing initializer
2020-06-17 15:44:22 +02:00
Arne Morten Kvarving
643b8b179d
fixed: add missing initializer
2020-06-17 14:32:42 +02:00
Joakim Hove
3478263de9
Fix: bug in serializer function for GPMaint class
2020-06-17 12:45:23 +02:00
Markus Blatt
8c6cd2f10f
Merge pull request #1810 from blattms/support-pinch-nogap
...
Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
2020-06-15 17:27:15 +02:00
Jostein Alvestad
ec976db684
correction for lift quantity well-data
...
corrections to IUAD and IUAP
various improvements of E100 compatible restart file
add debug output
additonal debug print
corrected loop placement for active prod/inj wells
remove debug print and clean up code
2020-06-15 09:55:34 +02:00
Joakim Hove
985cb279ff
Allow negative rates when evaluating UDA values
...
corrections to iwel[10] open/shut flag
further corrections SWEL for handling udq-restarts correctly
further changes to get correct SWEL in ECL-Restart file
added comment to clarify change
correction to group sequence and group controls for EclRST-file
changes to correct IGRP[NWGMAX+5]
corrected compile errors/warnings
further minor code corrections
initial changes to include group current Prod/inj Constraint in summary file
further changes to currentsStatusGroupControl to Summary output
further corrections and additions of Field current controls
further corrections for IGRP
minor corrections to code style
corrections for tests
changes to correct test_AggregateWellData
a few more initial changes for next version of igrp/sgrp
changes to igrp & sgrp according to tests
changes to handle special conditions at report step 0
corrections due to changes in Summary.cpp
changes to improve code quality and robustness
Add default value to igrp[nwgmax+5]
corrections and code improvements base on testing
corrections to handling of GCONINJE
further corrections for IGRP
even further corrections IGRP
changes to correct SGRP
correction to IGRP defaults
corrections to SWEL and IGRP
further corrections for IGRP
removed some comments
2020-06-15 09:55:27 +02:00
Joakim Hove
84aa2f77f3
Merge pull request #1820 from joakim-hove/udq-nan-values
...
UDQSet will check for nan values
2020-06-12 13:49:24 +02:00
Joakim Hove
0841e4f398
Merge pull request #1797 from joakim-hove/GPMAINT
...
Add code to internalize GPMAINT keyword in Group objects
2020-06-12 12:19:20 +02:00
Joakim Hove
10b2b2ac48
Add caching of well and group names in SummaryState
2020-06-12 12:07:04 +02:00
Joakim Hove
213c6fb6ad
Add function SummaryState::update_udq() to add variables from UDQSet
2020-06-12 09:12:55 +02:00
Joakim Hove
90d1d992e5
Ensure that evaluated UDQSet have the correct name
2020-06-12 09:12:55 +02:00
Joakim Hove
669918547a
Add del() method to SummaryState
2020-06-12 09:12:55 +02:00
Joakim Hove
b07bd377cd
Merge pull request #1819 from joakim-hove/aicd
...
Aicd
2020-06-12 09:12:18 +02:00
Atgeirr Flø Rasmussen
e08a3666e3
Merge pull request #1818 from atgeirr/fix-nupcol-runspec
...
Handle NUPCOL in RUNSPEC correctly
2020-06-11 20:50:30 +02:00
Joakim Hove
224911bd10
Add implementation for autonomous ICD: AutoICD
2020-06-11 11:38:29 +02:00
Joakim Hove
73a244ceda
Templated internalizing of WSEGSICD keyword
2020-06-11 11:38:29 +02:00
Joakim Hove
0f032d6fca
Merge pull request #1801 from joakim-hove/icd-variant
...
Use std::variant<> to hold ICD alternatives
2020-06-11 11:31:58 +02:00