OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,497 Commits 18 Branches 75 Tags 73 MiB
c82286f7d8
Commit Graph

11497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OPMUSER
0c3f2ac64d Delete GRUPRIG from OPM Flow Keyword List 
GRUPRIG was both in the E100 and the OPM Flow keyword definitions. So delete the OPM Flow version. Need to run Jenkins, just in case
 2022-01-12 18:04:58 +08:00
Joakim Hove
089b6bff42
Merge pull request #2926 from joakim-hove/rm-fnmatch 
Remove stale #include <fnamatch.h>
 2022-01-12 08:26:43 +01:00
Joakim Hove
ea5c847c41 Remove stale #include <fnamatch.h> 2022-01-12 07:42:34 +01:00
Joakim Hove
24e58e36aa
Merge pull request #2925 from joakim-hove/fnmatch 
Use std::regex to implement fnmatch()
 2022-01-11 13:36:43 +01:00
Joakim Hove
c50eb01bb0 Implement fnmatch() in Opm::shmatch() with std::regex 2022-01-11 11:14:11 +01:00
Joakim Hove
e43d75aacc
Merge pull request #2871 from bska/continuous-solution-cumulatives-on-restart 
Save and Reload Free/Solution Gas/Oil Cumulatives in Restart
 2022-01-11 10:38:40 +01:00
Bård Skaflestad
8a72cfce36 Save and Reload Free/Solution Gas/Oil Cumulatives in Restart 
This commit ensures that the field, group, and well level cumulative
production curves of solution/free oil and gas are continuous in a
restarted simulation run.

Thanks to Torbjørn Skille for identifying the appropriate locations
in XGRP/XWEL for outputting these items.
 2022-01-10 20:57:59 +01:00
Markus Blatt
c28afa48ee
Merge pull request #2923 from blattms/fix-segfault-parallel-multflt 
Fixes parallel segfault for MULTFLT
 2022-01-10 20:49:53 +01:00
Markus Blatt
955906c411 Improve README 
Make it clear what is in the repository. Might help people
finding it via search engines.
 2022-01-10 16:08:49 +01:00
Markus Blatt
dd88fc45fd Fixes parallel segfault happening when geology is modified for t>0. 
This is a quick fix.
The problem that occurs is the following. After loadbalancing the
FieldPropsManager only has a non-nullptr to the FieldProperties on
the process with rank=0. Therefore most of the calls to it will
segfault. This has not been problem before changeset
2921838895. We did not make any calls to e.g.
FieldProperties::apply_schedule_keywords during a simulation.
Now we do via  [eclproblem.hh#L1021-L1022](/OPM/opm-simulators/blob/3e4e62bc4f6f6f8a02eb2d2e4976dc2e2d956313/ebos/eclproblem.hh#L1021-L1022))
 2022-01-10 15:38:17 +01:00
Joakim Hove
f9ba16d72e
Merge pull request #2919 from totto82/fixMULTXYZ_aquifer 
Add permeability multiplier for connection between reservoir and aquifer
 2022-01-10 12:08:16 +01:00
Bård Skaflestad
20732329f4
Merge pull request #2920 from plgbrts/saltp 
Corrected dimensions of SALTPVD
 2022-01-07 14:37:21 +01:00
Tor Harald Sandve
dcf3c42a33 add perm multiplier aquifer 2022-01-07 10:58:48 +01:00
Markus Blatt
c37203d605
Merge pull request #2918 from bska/fix-solution-gas-summary-unit 
Fix Unit of Measure for Dissolved Gas Flow Rates
 2022-01-07 09:57:35 +01:00
Paul Egberts
0a000dae5a corrected dimensions 2022-01-06 21:38:38 +01:00
Bård Skaflestad
21e067beaa Fix Unit of Measure for Dissolved Gas Flow Rates 
These quantities are reported in surface volume gas flow rate units.
 2022-01-06 15:01:19 +01:00
Joakim Hove
f0b91be7c3
Merge pull request #2884 from bska/dont-access-empty-optional 
Don't Access an Empty Optional Object
 2022-01-06 14:49:03 +01:00
Bård Skaflestad
56539e0453 Don't Access an Empty Optional Object 
The maximum supply of lift gas and/or the maximum total gas flow
rate of a group may be defaulted in the context of lift gas
optimisation.  In that case, the std::optional<> objects will be
empty and we must not access the contained object through the
value() member function.  We output the sentinel value "-10" in this
case.
 2022-01-06 12:34:10 +01:00
Bård Skaflestad
07d69bc1f7
Merge pull request #2910 from bska/use-named-equil-items 
Switch to Using Named Items For Extracting EQUIL Keyword Data
 2022-01-06 12:33:21 +01:00
Bård Skaflestad
f1fd4726e3 Switch to Using Named Items For Extracting EQUIL Keyword Data 
This is more self-documenting that numeric item indices.  While
here, also switch to constructing the EQUIL record in place instead
of forming a temporary and moving it into the vector.
 2022-01-03 14:58:09 +01:00
Joakim Hove
aa77a9c6e9
Merge pull request #2903 from joakim-hove/repo-reorg 
Suggestion: repo reorg
 2022-01-03 10:36:48 +01:00
Joakim Hove
0a59bd8f61 Filesystem rename EclipseState/Schedule/ Schedule/ 2022-01-02 14:32:14 +01:00
Joakim Hove
aede532b9a Filesystem rename parser/eclipse/ input/eclipse 2022-01-02 14:32:14 +01:00
Bård Skaflestad
722a375f1c
Merge pull request #2915 from tskille/esmry_fix 
ESmry - Ignore empty keys
 2021-12-29 00:54:54 +01:00
Torbjørn Skille
3e69167bf9 ignore empty keys 2021-12-28 20:39:45 +01:00
Bård Skaflestad
5cdb5c7a6e
Merge pull request #2912 from tskille/blacklisted 
update list of blacklisted keywords
 2021-12-22 00:53:40 +01:00
Atgeirr Flø Rasmussen
3682e4b67a
Merge pull request #2914 from atgeirr/fix-for-posix-getopt 
Fix driver, as POSIX or BSD getopt() stops on first non-option argument.
 2021-12-21 21:46:57 +01:00
Atgeirr Flø Rasmussen
a8665b77d9 Fix driver, as POSIX or BSD getopt() stops on first non-option argument. 2021-12-21 18:40:38 +01:00
Torbjørn Skille
9255a7831c update list of blacklisted keywords 2021-12-21 10:47:12 +01:00
Markus Blatt
fae1278d82
Merge pull request #2911 from tskille/fix_x_option 
fixing -x option for compareECL program
 2021-12-21 10:22:02 +01:00
Torbjørn Skille
d94b809814 fixing -x option for compareECL program 2021-12-21 09:24:33 +01:00
Joakim Hove
435e7cf146
Merge pull request #2888 from joakim-hove/gconinje-rst 
Gconinje rst
 2021-12-20 10:11:28 +01:00
Jostein Alvestad
0478b91f24 Added correction to IGRP[nwgmax+5] for group control from FIELD level 2021-12-20 09:19:49 +01:00
Joakim Hove
9c54e324e9 Load injection guide rates from restart file 2021-12-20 09:19:49 +01:00
Joakim Hove
6d5ea77bf5 Rename rst::group.guide_rate_def 2021-12-20 09:19:49 +01:00
Joakim Hove
ad420a2b02 Save guiderate injection settings for group injection 2021-12-20 09:19:49 +01:00
Joakim Hove
a945a6fe9b
Merge pull request #2907 from joakim-hove/welsegs-delayed-name 
Handle ACTIONX delayed WELSPECS for keywords WELSEGS and COMPSEGS
 2021-12-19 13:52:19 +01:00
Joakim Hove
1121f03fe6
Merge pull request #2906 from OPMUSER/Actionx-WTMULT 
Update ActionX.cpp with WTMULT
 2021-12-19 13:51:23 +01:00
Joakim Hove
48fa6ecf3a
Merge pull request #2909 from bska/dont-emit-partial-rft-record 
Don't Write RFT Records for Wells With No Connections
 2021-12-19 12:13:44 +01:00
Joakim Hove
d867d63b78
Merge pull request #2908 from bska/dont-access-missing-refdepth 
Don't Access Well BHP Reference Depth If Unavailable
 2021-12-19 12:13:29 +01:00
Bård Skaflestad
17bcea4954 Don't Write RFT Records for Wells With No Connections 
These render Flow's RFT files much more difficult to open in
post-processing software such as ResInsight.
 2021-12-17 16:09:40 +01:00
Bård Skaflestad
cafa759b3d Don't Access Well BHP Reference Depth If Unavailable 
This commit ensures that we do not access the well's BHP reference
depth unless that value is well defined.  If the input deck does not
define an explicit BHP reference depth (WELSPECS(5)), and if the
well does not have any active reservoir connections, then we are
supposed to output the usual sentinel value (-1.0E+20) as the datum
depth in 'SWEL'.

Account for this altered semantics in the restart reader too.
 2021-12-17 15:20:40 +01:00
Bård Skaflestad
8306b7039f Extract Existence Predicate for Well BHP Reference Depth 
This commit adds a new member function,

    bool Well::hasRefDepth() const

that allows the caller to query whether or not a particular well has
an active value for the well BHP reference depth.  The most common
cause of this value being missing is that the depth item of WELSPECS
is defaulted while the well is not connected to any active cells.

This predicate allows client code, e.g., the restart output module,
to safely access reference depth values in the case of potentially
missing reference depths.
 2021-12-17 12:45:55 +01:00
Joakim Hove
b5e3137949 Handle ACTIONX delayed WELSPECS for keywords WELSEGS and COMPSEGS 2021-12-17 11:10:12 +01:00
Bård Skaflestad
25ea975171 Adjust Whitespace in Well::operator==(const Well&) 
In preparation of making the comparator aware that reference depths
might not always be awailable.
 2021-12-17 10:41:27 +01:00
OPMUSER
231066ea22 Update ActionX.cpp 2021-12-17 10:50:38 +08:00
Joakim Hove
0abdac2db6
Merge pull request #2895 from joakim-hove/actionx-welspecs 
Actionx welspecs
 2021-12-16 10:29:38 +01:00
Joakim Hove
aeb4c2bd8a
Merge pull request #2905 from OPMUSER/Actionx-NEXT 
Update ActionX.cpp with NEXT
 2021-12-15 14:25:18 +01:00
OPMUSER
41e2703222 Update ActionX.cpp 2021-12-15 16:36:11 +08:00
Atgeirr Flø Rasmussen
48fdc4fafd
Merge pull request #2896 from atgeirr/add-missing-include-and-copyright 
Add missing include, and copyright header.
 2021-12-14 12:53:16 +01:00