Commit Graph

10888 Commits

Author SHA1 Message Date
Joakim Hove
60971f21e8
Merge pull request #2620 from joakim-hove/uda-rst
Uda rst
2021-08-31 16:48:03 +02:00
Markus Blatt
44c612ef7a
Merge pull request #2639 from bska/fix-signed-vs-unsigned
Fix "Signed vs. Unsigned" Comparison Warning
2021-08-31 14:32:16 +02:00
Bård Skaflestad
17e3c9ce63 Fix "Signed vs. Unsigned" Comparison Warning
Use range-for instead of a counted loop.  While here, also mark a
few objects as 'const' to avoid inadvertent modifications.
2021-08-31 12:48:25 +02:00
Joakim Hove
5e2bff42cf Update UDA properties from restart file 2021-08-31 12:48:01 +02:00
Joakim Hove
d8d6749337 Load active UDA's from restart file 2021-08-31 11:20:12 +02:00
Joakim Hove
fd010c1370 Add testdata for UDA restart testing 2021-08-31 11:20:12 +02:00
Joakim Hove
dca7775997
Merge pull request #2633 from joakim-hove/uda-ig-phase
Ensure that UDA is only active for one phase in restart file
2021-08-31 11:19:09 +02:00
Bård Skaflestad
7a2f2bd23a
Merge pull request #2635 from tskille/ecloutput_update
Update of class EclOutput
2021-08-31 10:03:58 +02:00
Joakim Hove
89d7507bfa
Merge pull request #2638 from joakim-hove/summary-action-keys-month-names
Intercept month keywords earlier in Summary creation
2021-08-30 19:43:15 +02:00
Joakim Hove
5b8d24bf2f Intercept month keywords earlier in Summary creation 2021-08-30 17:32:41 +02:00
Markus Blatt
657f04cd28
Merge pull request #2631 from blattms/dune-2.8-metis
Fix FindMETIS for DUNE 2.8.
2021-08-30 16:23:55 +02:00
Torbjørn Skille
a9ba936f6a update of class EclOutput
- significant improvements on performance
 - writing blocks of data from disk, rather that one by one element
2021-08-30 15:57:53 +02:00
Joakim Hove
50cb0b5da2
Merge pull request #2636 from bska/segmet-wct
Support Segment-Level Water Cut Summary Vector
2021-08-30 09:53:07 +02:00
Bård Skaflestad
b251d5dfe6 Support Segment-Level Water Cut Summary Vector 2021-08-29 21:08:42 +02:00
Bård Skaflestad
1858362ce7
Merge pull request #2634 from tskille/eclfile_update
update of base class EclFile
2021-08-27 23:06:31 +02:00
Bård Skaflestad
2e1c65e515
Merge pull request #2565 from goncalvesmachadoc/fsip
add FSIP to summary
2021-08-27 22:43:52 +02:00
Torbjørn Skille
83b5c99135 update of base class EclFile
- significant improvements on performance
 - reading blocks of data from disk, rather that one by one element
 - using block sizes defined in Opm::EclIO::EclIOdata.hpp

updates of EGrid::get_zcorn_from_disk
 - using same approach as for EclFile
 - also minor change in EGrid api
2021-08-27 20:21:46 +02:00
Cintia Goncalves Machado
65017f3855 add FSIP to test 2021-08-27 13:13:48 +02:00
Joakim Hove
bbba7661a1 Ensure that UDA is only active for one phase in restart file 2021-08-27 11:58:09 +02:00
Joakim Hove
de6997847d Add function to check if GroupInjectionProperties is UDA enabled 2021-08-27 11:55:24 +02:00
Joakim Hove
4604c2b0c8
Merge pull request #2632 from joakim-hove/uda-rst-commits
Uda rst commits
2021-08-27 11:36:42 +02:00
Cintia Goncalves Machado
7520e95276 outputFSIP 2021-08-26 18:31:56 +02:00
Joakim Hove
cb6e6164a3 Add operator== to Well::ProductionControls and init struct members 2021-08-26 18:30:29 +02:00
Joakim Hove
8dfa1cdd2b Refactor test 2021-08-26 18:30:29 +02:00
Bård Skaflestad
06ad830769
Merge pull request #2629 from jalvestad/actionrst-improvement
Corrections to Actionx data IACT, SACT
2021-08-26 17:56:11 +02:00
Joakim Hove
bf5e63f8cf Add Group::injectionProperties(Phase) accessor 2021-08-26 17:24:51 +02:00
Markus Blatt
0056e0a2a1 Fix FindMETIS for DUNE 2.8.
With version 2.8 DUNE will specify imported target METIS::METIS for
the linker and introduces a METIS_API_VERSION to distinguish different
versions. This patch introduces these to the find module used by OPM.
2021-08-26 15:08:27 +02:00
Jostein Alvestad
1715bfc4e4 removed comments from UDQ_ACTIONX_TEST1.DATA 2021-08-26 12:22:15 +02:00
Jostein Alvestad
86a85b5b24 added unit tests and modified input data accordingly 2021-08-26 12:17:40 +02:00
Jostein Alvestad
f3fbd44b4b changes to allow for opm/units 2021-08-26 12:17:38 +02:00
Jostein Alvestad
30109c1722 correction of units for SACT[3] 2021-08-26 12:17:36 +02:00
Jostein Alvestad
4705cf7eb9 corrections to IACT[2], SACT[3] 2021-08-26 12:17:35 +02:00
Bård Skaflestad
961190c723
Merge pull request #2628 from goncalvesmachadoc/outputVolume
Add reservoir volumes to Inplace
2021-08-26 10:21:02 +02:00
Bård Skaflestad
87041776ce
Merge pull request #2626 from joakim-hove/normal-summmary-keys
Normal summmary keys
2021-08-25 22:16:17 +02:00
Bård Skaflestad
c2444681d7
Merge pull request #2627 from joakim-hove/udq-units
Make sure to assign UDQ units for udq loaded from restart file
2021-08-25 21:35:25 +02:00
Cintia Goncalves Machado
6e386d6245 add reservoir volumes to Inplace 2021-08-25 18:25:10 +02:00
Joakim Hove
9257610869 Make sure to assign UDQ units for udq loaded from restart file 2021-08-25 16:16:54 +02:00
Joakim Hove
3867cde543
Merge pull request #2616 from akva2/default_asserts
changed: default to asserts enabled in release mode
2021-08-25 09:42:10 +02:00
Joakim Hove
a07ab41a73 Refactor summary configuration of time vectors to reuse from ACTIONX 2021-08-25 07:29:30 +02:00
Joakim Hove
69e1101b35 Remove automatic DAY, YEAR and MONTH from SummaryState 2021-08-25 06:57:17 +02:00
Joakim Hove
cda7bd3740 Use normal summary keys for time related properties 2021-08-25 06:52:47 +02:00
Joakim Hove
31fa88b53e
Merge pull request #2621 from tskille/extesmry
Adding python bindings for class ExtESmry
2021-08-24 23:24:32 +02:00
Joakim Hove
797c1cbde8
Merge pull request #2624 from akva2/janitoring
Some janitoring
2021-08-24 11:02:42 +02:00
Arne Morten Kvarving
41867b55fe reduce scope of variables
also use .empty() instead of comparing strings to ""
2021-08-24 09:33:22 +02:00
Arne Morten Kvarving
2d20087f17 only declare variable when required 2021-08-24 09:33:22 +02:00
Arne Morten Kvarving
add60560ee pass by const reference 2021-08-24 09:33:22 +02:00
Joakim Hove
7b2b58caa8
Merge pull request #2623 from joakim-hove/actionx-pretty-print
Fix prefix with output from schedule parse in ACTIONX mode
2021-08-24 07:39:45 +02:00
Joakim Hove
f4eda06021 Fix prefix with output from schedule parse in ACTIONX mode 2021-08-23 23:01:08 +02:00
Torbjørn Skille
514e3a4a35 Adding python bindings for c++ class ExtESmry
- Used for loading data from summary file ESMRY
 - python class ESmry supporting both SMSPEC/UNSMRY and ESMRY summary files.
2021-08-23 22:15:58 +02:00
Bård Skaflestad
981e977da4
Merge pull request #2495 from bska/walq
Implement WALQ Summary Vector
2021-08-20 21:41:31 +02:00