OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,582 Commits 18 Branches 75 Tags 73 MiB
3f1a89069d
Commit Graph

10582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torbjørn Skille
3f1a89069d fixing bug in ExtESmry 
- segfault when loading more that one vector
 - test ExtESmry updated, now failing without this fix
 2021-08-16 19:47:59 +02:00
Joakim Hove
2cf17408e9
Merge pull request #2605 from bska/report-siunits-guiderates 
Add Guiderate Value Accessor for SI Units
 2021-08-16 16:51:30 +02:00
Bård Skaflestad
2a374fc53b Add Guiderate Value Accessor for SI Units 
This is mostly for reporting purposes if the calling code knows that
the values stored in the GuideRate container are in output units.
The output layer, and particularly the Summary facility, expects
that its input values are strictly SI.
 2021-08-16 12:26:09 +02:00
Bård Skaflestad
612cbf749c
Merge pull request #2607 from akva2/janitoring 
Some more SCA warning cleanup
 2021-08-16 12:24:56 +02:00
Joakim Hove
52acaa3757
Merge pull request #2603 from bska/protect-import-container-from-multiple-inclusion 
Add Include Guards to Protect From Multiple Inclusion
 2021-08-16 11:34:27 +02:00
Arne Morten Kvarving
f7a143c604 pass by const ref 2021-08-16 11:06:00 +02:00
Bård Skaflestad
210e09f981 Add Include Guards to Protect From Multiple Inclusion 
While here, also use a more efficient way of forming a
vector<double> from a vector<float> source.
 2021-08-16 11:03:38 +02:00
Arne Morten Kvarving
e25667dc71 mark constructor explicit 2021-08-16 10:57:22 +02:00
Arne Morten Kvarving
7560d7fd7c make EclipseState constructor explicit 
and adjust test code
 2021-08-16 10:57:22 +02:00
Arne Morten Kvarving
155c8fbcdb make Aquifer constructors explicit 
and adjust test code
 2021-08-16 10:57:22 +02:00
Arne Morten Kvarving
1463266ba6 initialize member 2021-08-16 10:57:22 +02:00
Bård Skaflestad
92b1c6cb45
Merge pull request #2606 from tskille/cleanup_esmry 
cleanup after renaming from LODSMRY -> ESMRY
 2021-08-16 10:40:26 +02:00
Torbjørn Skille
c6ff9bba00 cleanup after renaming from LODSMRY -> ESMRY 2021-08-16 09:10:00 +02:00
Bård Skaflestad
f89d3fe75a
Merge pull request #2590 from tskille/write_lodsmry 
Support for writing ESMRY file
 2021-08-12 21:29:45 +02:00
Bård Skaflestad
6801ac1a3d
Merge pull request #2604 from akva2/janitoring 
Quell some static analysis warnings
 2021-08-12 20:36:21 +02:00
Torbjørn Skille
46693aec47 Adding support for writing esmry 
- command line option --enable-esmry, default = false
 - complete re-write of esmry file for every time step

Updating of class ESmry
 - remove automatic loading from ESMRY
 2021-08-12 19:17:07 +02:00
Arne Morten Kvarving
f44e56d101 use std::copy 2021-08-12 15:42:34 +02:00
Arne Morten Kvarving
ad9de78253 mark some constructors explicit 2021-08-12 15:36:25 +02:00
Arne Morten Kvarving
a3ca314832 use initializer list 2021-08-12 15:34:55 +02:00
Bård Skaflestad
d9dc2f3dd8
Merge pull request #2602 from tskille/egrid_update 
Adding member function getXYZ_layer to EGrid
 2021-08-12 12:19:02 +02:00
Torbjørn Skille
9a5937ae29 Adding member function getXYZ_layer to EGrid 
- getting xyz values from EGrid file
 - partially loading ZCORN array, loading only z-values associated with selected layer
 - will be used by resinsight, user interface discussed with Ceetron
 2021-08-12 08:47:31 +02:00
Bård Skaflestad
8bcd1b8f83
Merge pull request #2600 from asnyv/import_paths 
Support PATHS in IMPORT keyword
 2021-08-11 21:33:40 +02:00
Bård Skaflestad
4aafd43871
Merge pull request #2601 from akva2/janitoring 
Some janitoring
 2021-08-11 21:02:17 +02:00
Asgeir Nyvoll
1a2f6cae46 Support PATHS in IMPORT keyword 2021-08-11 15:02:32 +02:00
Arne Morten Kvarving
a76cf5cdb3 replace NULL with nullptr 2021-08-11 14:46:49 +02:00
Arne Morten Kvarving
8b539a46fc trim some whitespace and fix a typo 2021-08-11 14:46:48 +02:00
Bård Skaflestad
f373afd526
Merge pull request #2596 from bska/refactor-sumthin 
Refactor SUMTHIN Implementation
 2021-08-09 18:18:10 +02:00
Bård Skaflestad
509878eb49 Refactor SUMTHIN Implementation 
Report steps do not influence the SUMTHIN intervals and the special
value

    SUMTHIN
    0.0 /

turns off the "thinning" process.  This refactoring introduces a new
helper variable, sumthin_active_, which caches whether SUMTHIN is
active (i.e., exists and has strictly positive value).

While here, also ensure that the ministep IDs have non-unit steps
when SUMTHIN ends up skipping an output event.
 2021-08-09 17:59:13 +02:00
Joakim Hove
e6d7081950
Merge pull request #2582 from joakim-hove/igrp-simplification2 
Igrp simplification2
 2021-08-05 08:55:08 +02:00
Joakim Hove
edb4100457
Merge pull request #2580 from joakim-hove/zudl-roundtrip 
Normalise input data in UDQ definitions
 2021-08-05 08:54:39 +02:00
Joakim Hove
3502bbdc7f
Merge pull request #2595 from goncalvesmachadoc/enablePrecSalt 
add enable PRECSALT
 2021-08-05 00:15:56 +02:00
Cintia Goncalves Machado
c5a5bb2f1d add enable PRECSALT 2021-08-04 16:24:58 +02:00
Bård Skaflestad
ee4987bf20
Merge pull request #2592 from akva2/janitoring 
changed: use std::vector<char> instead of raw char arrays
 2021-08-04 15:53:52 +02:00
Bård Skaflestad
fc378d510e
Merge pull request #2591 from goncalvesmachadoc/VAPWAT 
Add enable WATVAP
 2021-08-04 15:50:13 +02:00
Cintia Goncalves Machado
0427f45163 fix; 2021-08-04 13:35:21 +02:00
Arne Morten Kvarving
328882e820 changed: use std::vector<char> instead of raw char arrays 
also fixes a harmless error where delete was used instead of delete[]
 2021-08-04 13:03:31 +02:00
Joakim Hove
cbe2ba52fc Use common function injectionGroup for both gas and water 2021-08-04 12:24:02 +02:00
Cintia Goncalves Machado
830cb81620 addEnableWATVAP 2021-08-04 12:23:17 +02:00
Joakim Hove
af3679980d More shuffling about 2021-08-04 12:05:56 +02:00
Joakim Hove
a6ba80068b Split out if (cgroup) { ... } 2021-08-04 12:05:56 +02:00
Joakim Hove
579463c2a0 Introduce local bool variable 2021-08-04 12:05:56 +02:00
Joakim Hove
01b93b15ec Remove extra assignment 2021-08-04 12:05:56 +02:00
Joakim Hove
5369e4021b Minor white space shuffle about 2021-08-04 12:05:56 +02:00
Joakim Hove
2c6f37bd88
Merge pull request #2587 from joakim-hove/guiderat-delay-throw 
Delay error condition to GuideRateModel::eval() time
 2021-08-04 11:52:52 +02:00
Joakim Hove
89d41ec087
Merge pull request #2585 from joakim-hove/validate-compord 
Support 'DEPTH' ordering in COMPORD
 2021-08-04 11:52:32 +02:00
Joakim Hove
3db1cfd8e5
Merge pull request #2584 from joakim-hove/irrevers-thpres 
Support EQLOPTS option IRREVER in THPRES keyword
 2021-08-04 10:07:04 +02:00
Joakim Hove
2fa5c48679 Support EQLOPTS option IRREVER in THPRES keyword 2021-08-04 07:55:36 +02:00
Joakim Hove
4a415e7ebf Support DEPTH ordering in COMPDAT 2021-08-04 07:54:54 +02:00
Joakim Hove
c0601e183b Do not trap invalid COMPORD input 2021-08-04 07:54:54 +02:00
Joakim Hove
1726ad8090 Delay error condition to GuideRateModel::eval() time 2021-08-04 07:54:12 +02:00