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

11768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
61e68dccb6 fixing running when only analytical aquifer connections defined 
without this, the restart writer will trigger a segmentation fault
error.

And also, some minor refactoring and function development so that the
simulator can check whether there are valid connections defined for
aquifers with certain id.
 2022-08-24 09:31:20 +02:00
Atgeirr Flø Rasmussen
e4346da3ea
Merge pull request #3101 from atgeirr/use-portable-timegm 
Add and use portable_timegm().
 2022-08-18 09:58:06 +02:00
Atgeirr Flø Rasmussen
49262ae96d Add and use portable_timegm(). 
This function converts a std::tm to a std::time_t, assuming UTC
and not local timezone. This is used instead of relying on
repeated calls to mktime(), which can fail on some system (BSD)
for dates before 1900.
 2022-08-18 09:21:52 +02:00
Bård Skaflestad
cbab4e50c0
Merge pull request #3100 from tskille/smspec_bug 
fixing bug in IO class ESmry
 2022-08-17 17:48:40 +02:00
Torbjørn Skille
94150f1a0c fixing bug in IO class ESmry 2022-08-17 15:54:45 +02:00
Bård Skaflestad
ff13f8c091
Merge pull request #3099 from GitPaean/extend_default_aqutab 
extend the range of default AQUTAB table (table 1)
 2022-08-17 13:35:43 +02:00
Kai Bao
0dadf54a23 extend the range of default AQUTAB table (table 1) 
for better accuracy of the extrapolation
 2022-08-16 23:43:43 +02:00
Bård Skaflestad
17a08ddcd9
Merge pull request #3098 from atgeirr/modify-aquancon-inactive-cell-warnings 
AQUANCON: Add a summarizing warning stating the number of inactive connection ignored
 2022-08-16 18:18:09 +02:00
Atgeirr Flø Rasmussen
8e636f22a1 Add a summarizing warning stating the number of inactive connections ignored. 
Also add tags to the Aquancon inactive connection warnings.
 2022-08-16 15:39:17 +02:00
Bård Skaflestad
e5fdfb16df
Merge pull request #3097 from bska/restore-build 
Remove Consistency Checks for SPE10 Models
 2022-08-16 14:37:57 +02:00
Bård Skaflestad
cc48ad4632 Remove Consistency Checks for SPE10 Models 
The input decks were removed from the opm-tests repository.  We
*may* consider readding them from a new location at a later time.
 2022-08-16 14:01:33 +02:00
Bård Skaflestad
dacd635c38
Merge pull request #3092 from atgeirr/fix-wpimult-actionx 
Enable using WPIMULT in ACTIONX.
 2022-08-12 17:56:20 +02:00
Bård Skaflestad
9660189290
Merge pull request #3096 from akva2/remove_empty_well_header 
changed: remove (basically) empty Well(Injection|Production)Properties.hpp
 2022-08-11 12:55:00 +02:00
Arne Morten Kvarving
5df933460b changed: remove (basically) empty Well(Injection|Production)Properties.hpp 2022-08-11 11:47:54 +02:00
Bård Skaflestad
e4129cf826
Merge pull request #3080 from totto82/add_unit_gas_oil_ratio_rate 
add unit gas oil ratio rate for output of drsdt
 2022-08-11 11:29:26 +02:00
Tor Harald Sandve
189a043c6d add unit gas oil ratio rate for output of drsdt 2022-08-10 15:42:50 +02:00
Atgeirr Flø Rasmussen
7e8a91b81f Enable using WPIMULT in ACTIONX. 2022-08-04 09:19:44 +02:00
Bård Skaflestad
eb7476e0cf
Merge pull request #3089 from atgeirr/add-missing-include 
Add <cstddef> include for std::size_t.
 2022-08-01 00:05:10 +02:00
Atgeirr Flø Rasmussen
f96290e1df Add <cstddef> include for std::size_t. 2022-07-31 21:24:30 +02:00
Bård Skaflestad
9af8c785b2
Merge pull request #3085 from akva2/cleanup_schedule 
Cleanup Schedule.hpp usage
 2022-07-30 00:42:06 +02:00
Arne Morten Kvarving
e82ec7a274 clean up includes in Schedule.hpp 2022-07-29 18:37:57 +02:00
Markus Blatt
6561138236
Merge pull request #3067 from GitPaean/fixing_multiple_wpimult 
fixing multiple WPIMULT records
 2022-07-29 10:24:50 +02:00
Markus Blatt
26886bf4fa
Merge pull request #3087 from akva2/small_buildsys_fixes 
Small buildsystem fixes
 2022-07-28 09:03:48 +02:00
Bård Skaflestad
9ec5680915
Merge pull request #3086 from akva2/remove_unused 
remove unused file
 2022-07-28 00:58:29 +02:00
Arne Morten Kvarving
0b0f9cab33 remove faulty brace 2022-07-27 18:08:52 +02:00
Arne Morten Kvarving
90f27b58cd fixed: use proper case in find_package_handle_standard_args 2022-07-27 18:08:52 +02:00
Arne Morten Kvarving
1012e15711 remove unused file 2022-07-27 17:51:17 +02:00
Arne Morten Kvarving
ec57a4d10b changed: remove include of Schedule.hpp in header 
and deal with the consequences
 2022-07-27 17:13:45 +02:00
Markus Blatt
92ebef3bc9
Merge pull request #3084 from akva2/cleanup_stream_includes 
clean up stream includes
 2022-07-27 17:08:28 +02:00
Markus Blatt
5532176af4
Merge pull request #3083 from akva2/cleanup_deck 
changed: remove include of Deck.hpp in header
 2022-07-27 17:06:26 +02:00
Markus Blatt
c5b0cd6f61
Merge pull request #3082 from akva2/clean_eclipsestate 
changed: remove include of EclipseState.hpp in header
 2022-07-27 17:03:17 +02:00
Arne Morten Kvarving
068bff1ebc clean up stream includes 2022-07-27 16:05:01 +02:00
Arne Morten Kvarving
5e7191c79e changed: remove include of Deck.hpp in header 
and deal with the consequences
 2022-07-26 18:42:39 +02:00
Arne Morten Kvarving
ef6d448077 changed: remove include of EclipseState.hpp in header 
and deal with the consequences
 2022-07-26 16:03:52 +02:00
Arne Morten Kvarving
10dcb8945f
Merge pull request #3081 from Diullei/patch-1 
Fix eclipse SOLWNUM json file
 2022-07-25 08:33:08 +02:00
Diullei Gomes
cf0eb66009
Fix eclipse SOLWNUM json file property name 2022-07-24 11:11:29 +02:00
Bård Skaflestad
247547355c
Merge pull request #3074 from OPMUSER/NNC 
Update NNC
 2022-07-14 14:13:12 +02:00
OPMUSER
1ea89ab140 Update NNC 
Remove erroneous warning messages:

  NNC: invalid value '' in record 1 for item 12
  In file: RON-P50-A01-OPM.DATA, line 3387
  NNC(FACE1): not supported use 1* - will continue

For NNC(FACE1) and NNC(FACE2) by deleting the default "" value in the JSON file.

Client model had hundreds of these messages.
 2022-07-14 18:20:39 +08:00
Bård Skaflestad
5cca4b0be0
Merge pull request #3071 from OPMUSER/MINPORV 
Support MINPORV
 2022-07-12 14:12:34 +02:00
OPMUSER
a8a1d140d5 Update EclipseGrid and JSON Definitions 
Update EclipseGrid with checks for MINPVFIL. For JSON definitions: remove MINPVFIL check in MINPV and MINPORV, and all checks from MINPVFIL.
 2022-07-12 11:07:10 +08:00
OPMUSER
4fe559ba3c Remove C++ Code and Place Conditions in JSON Files 
Remove the C++ code checks and instead place the logic in the keyword JSON files. This is a cleaner approach.
Note we force that only one of the keywords is allowed in the deck to avoid confusion on what cut-off is actually being applied.
 2022-07-11 15:02:10 +08:00
OPMUSER
a5cfafe4de Support MINPORV 
Add support for MINPORV, which is an alias for MINPV. Also added additional checks, such that only one of MINPV, MINPORV and MINPVFIL can be active in the deck
 2022-07-11 14:05:34 +08:00
Markus Blatt
bad915fdf5
Merge pull request #3069 from bska/decouple-box-from-grid 
Decouple Opm::Box From EclipseGrid
 2022-07-06 15:15:51 +02:00
Kai Bao
96ab0e036d addressing some reviewing comments for PR#3067 2022-07-06 14:32:59 +02:00
Bård Skaflestad
a79ee15082 Decouple Opm::Box From EclipseGrid 
This commit switches to constructing Box instances from a GridDims
and two call-back functions instead of taking an EclipseGrid
directly.  The two call-back functions are a predicate for active
cells and a translation from Cartesian to active cell indices
respectively.

This is intended to simplify working with nested boxes, such as
those that occur for local grid refinement.
 2022-07-05 14:27:49 +02:00
Markus Blatt
7dd56d2bde
Merge pull request #3070 from bska/simplify-griddims-ijk 
Streamline GridDims::getIJK()
 2022-07-05 14:23:41 +02:00
Kai Bao
b87867d144 multple MPIMULT keywords within one report step is handled 
and ScheduleTests is updated with tests
 2022-07-05 10:52:25 +02:00
Bård Skaflestad
5377ff3442 Streamline GridDims::getIJK() 
This commit switches the Cartesian -> IJK decomposition in GridDims
from K->J->I into the I->J->K order.  The latter is simpler.

While here, also consistently use 'std::size_t' instead of 'size_t'.
 2022-07-04 15:06:07 +02:00
Bård Skaflestad
336f7a4159
Merge pull request #3064 from bska/refactor-numerical-aquifer-handling 
Handle Active Cell/Numerical Aquifers In Constructor Body
 2022-07-04 15:04:55 +02:00
Bård Skaflestad
c740b3705d Handle Active Cell/Numerical Aquifers In Constructor Body 
The constructor did implicitly assume that no cell in a numerical
aquifer would be declared inactive in ACTNUM, and this restriction
still applies.  Moving numerical aquifer property and connection
processing into the constructor body enables using existing member
functions for non-neighbouring connections and removes a branch that
obscured the fact that we should have ACTNUM be as close to
finalised as possible before creating analytic aquifer connections.
 2022-07-04 14:08:11 +02:00