Commit Graph

8830 Commits

Author SHA1 Message Date
Joakim Hove
4bd9b7212f Add serialization of FieldProps TRAN calculators 2020-09-17 11:46:17 +02:00
Joakim Hove
ecee4a7d36 Adds a calculator for modifying field properties in the edit section.
Previously modifications were applied directly to the field
properties. Unfortunately, for unset TRANX this resulted in
modifying 1.0 even if the simulator is calculating
transmissibilities itself. This was one of the reasons
why we got wrong results (others are in the simulator code).

Now these operations recorded in a calculator which can later be
applied to compressed arrays using apply_tran.
2020-09-17 11:40:56 +02:00
Bård Skaflestad
98ec42f472 Merge pull request #1874 from totto82/fixwsaltunit
Fix unit for salt concentration in WSALT
2020-09-14 15:40:48 +02:00
Bård Skaflestad
764149182d Merge pull request #1917 from akva2/janitoring
Some janitoring
2020-09-14 13:26:09 +02:00
Arne Morten Kvarving
518c219838 remove unused variable 2020-09-14 12:23:31 +02:00
Arne Morten Kvarving
80b98934c3 add missing initializers 2020-09-14 12:13:04 +02:00
Arne Morten Kvarving
2c2f848c54 remove unused function 2020-09-14 12:05:34 +02:00
Joakim Hove
5557debd9c Merge pull request #1916 from joakim-hove/summary-config-keywords
Add method SummaryConfig::keywords( pattern )
2020-09-14 10:55:27 +02:00
Joakim Hove
791726398e Fix warning 2020-09-14 09:17:53 +02:00
Joakim Hove
db64c858d1 Add method SummaryConfig::keywords( pattern ) 2020-09-14 09:17:53 +02:00
Tor Harald Sandve
02031a00e6 add salinity to unitSystem 2020-09-14 08:22:21 +02:00
Tor Harald Sandve
32a47bf79a Fix unit for salt concentration in WSALT 2020-09-14 08:22:21 +02:00
Joakim Hove
20a6a522dc Merge pull request #1891 from joakim-hove/summary-region
Add basic support for xxx_REG summary keywords
2020-09-10 09:23:33 +02:00
Joakim Hove
c3f94834c3 Add wildcard matching of keywords in SummaryConfig 2020-09-10 08:23:42 +02:00
Joakim Hove
dad067835c RegionCache object can manage multiple fip regions 2020-09-10 08:23:42 +02:00
Joakim Hove
d5a21427b4 Add fip_region to summary context argument 2020-09-10 08:23:42 +02:00
Joakim Hove
3587c0c6b7 Add fip_region member to SummaryNode 2020-09-10 08:23:42 +02:00
Joakim Hove
5976efa953 Add fip regioin name to summaryconfig node 2020-09-10 08:23:42 +02:00
Bård Skaflestad
53ce21cf9e Merge pull request #1911 from joakim-hove/udq-assign
Udq assign
2020-09-09 23:29:09 +02:00
Bård Skaflestad
d4ae7e706d Merge pull request #1905 from joakim-hove/fp-global2
Enable some support for global keywords
2020-09-09 23:26:51 +02:00
Joakim Hove
03d387c12d Enable global storage for keywords 2020-09-09 21:41:08 +02:00
Joakim Hove
5a060910a3 Differentiate better between UDQ ASSIGN and UDQ DEFINE
A quite typical situation is that a UDQ keyword is first initialized with UDQ
ASSIGN statement, and then subsequently a formula for updates every timestep is
entered with UDQ DEFINE:

  UDQ
     ASSIGN FU_VAR1 0 /
     DEFINE FU_VAR1 FU_VAR1 + 1 /
  /

Then the assign statement should be run once, and the define formula should be
evaluated for every subsequent timestep.
2020-09-09 21:39:29 +02:00
Bård Skaflestad
49460edf39 Merge pull request #1914 from joakim-hove/add-timestep
Add TIMESTEP as context variable in summary eval
2020-09-09 21:19:31 +02:00
Joakim Hove
fc1e245ea4 Add TIMESTEP as context variable in summary eval 2020-09-09 19:42:42 +02:00
Bård Skaflestad
5553b36c7d Merge pull request #1912 from joakim-hove/fmwpa
Add functionality for FMWPA - number of abondoned wells
2020-09-09 18:26:43 +02:00
Joakim Hove
a4d8379687 Support abondoned well keyword FMWPA in Summary 2020-09-09 17:10:53 +02:00
Joakim Hove
943e3a656d Request FMWPA output in test deck 2020-09-09 16:44:57 +02:00
Joakim Hove
8c2d74f348 Change to msim: set rates explicitly to zero for closed wells 2020-09-09 16:44:57 +02:00
Bård Skaflestad
eb5787fd54 Merge pull request #1913 from joakim-hove/first-production
First production
2020-09-09 16:15:58 +02:00
Joakim Hove
2f3ba50ca6 Add boolean flag to indicate whether a well has been an open producer 2020-09-09 15:07:55 +02:00
Joakim Hove
660d5ae3a7 Fix error message 2020-09-09 15:06:51 +02:00
Joakim Hove
c82be02ef8 Merge pull request #1910 from joakim-hove/udq-misc
Udq misc
2020-09-08 11:05:21 +02:00
Joakim Hove
fa70d457f3 Merge pull request #1909 from atgeirr/remove-unused-function
The distribute_toplayer() is unused.
2020-09-08 10:58:56 +02:00
Joakim Hove
4a9ec1403e UDQ: get from an unknown summary variable throws std::out_of_range 2020-09-08 08:23:45 +02:00
Joakim Hove
aeb55ec72e Pass global process parameters as mutable value 2020-09-08 08:23:45 +02:00
Joakim Hove
8d11a04033 Add report_step argument to UDQConfig::eval() 2020-09-08 08:23:45 +02:00
Atgeirr Flø Rasmussen
859182f7f0 The distribute_toplayer() is unused.
Note that there is still a member function of the same name.
2020-09-07 15:51:35 +02:00
Bård Skaflestad
b22304b7ba Merge pull request #1906 from joakim-hove/correct-default
Fieldprops: Correct default
2020-09-06 18:30:46 +02:00
Bård Skaflestad
05dde86f55 Merge pull request #1908 from joakim-hove/udq-fixup
Udq fixup
2020-09-06 18:22:12 +02:00
Joakim Hove
7969dfd721 Fix bug with init/create of FIP keywords 2020-09-05 13:54:17 +02:00
Joakim Hove
42fcb4507f FieldProps::get_global<T> will fill with correct default value 2020-09-05 11:52:22 +02:00
Joakim Hove
0a9babfa9a Move get_global functionality down to FieldProps 2020-09-05 11:52:01 +02:00
Joakim Hove
109a87e4ee Update user_defined regexp to allow '?U_?' 2020-09-05 11:46:41 +02:00
Joakim Hove
1bb96ffed2 Set up default stdout logging for msim simulator 2020-09-05 11:33:03 +02:00
Joakim Hove
c7308381d0 Merge pull request #1907 from joakim-hove/remove-designated
Remove use of designated initializer
2020-09-05 11:32:47 +02:00
Joakim Hove
4d29b2921a Remove use of designated initializer 2020-09-05 10:41:52 +02:00
Joakim Hove
1989eac79d Merge pull request #1900 from joakim-hove/fp-global
Reorganize field properties metadata
2020-09-05 08:46:49 +02:00
Joakim Hove
a765cd26ea Reorganised metadata for field properties 2020-09-04 14:31:40 +02:00
Bård Skaflestad
1b7fab4bd1 Merge pull request #1904 from joakim-hove/box-global-list
Box global list
2020-09-03 23:51:08 +02:00
Joakim Hove
ae049a927f Add accessor method for *all* cells in a Box 2020-09-03 21:12:29 +02:00