Commit Graph

13944 Commits

Author SHA1 Message Date
Markus Blatt
a407f57df1
Merge pull request #3431 from akva2/allow_ndebug_reconfigure
fixed: allow reconfiguring with a different WITH_NDEBUG value
2023-03-08 11:31:56 +01:00
Arne Morten Kvarving
d5f895901f fixed: allow reconfiguring with a different WITH_NDEBUG value
in particular we have to make sure to remove the -UNDEBUG value from the
flags, as these are cached so any values previously added will still be
used
2023-03-08 09:40:03 +01:00
Bård Skaflestad
38ed82b2ce
Merge pull request #3428 from vkip/use_pvtnum_as_default_rocknum
Using PVTNUM as the default ROCKNUM
2023-03-07 14:57:02 +01:00
Vegard Kippe
576c90d76e Delegating to default constructor, as suggested 2023-03-07 14:08:01 +01:00
Bård Skaflestad
ecac158bb7
Merge pull request #3429 from akva2/avoid_ndebug_warning
MinpvMode: avoid missing return value with NDEBUG
2023-03-07 13:48:18 +01:00
Arne Morten Kvarving
1958e2edf9 MinpvMode: avoid missing return value with NDEBUG 2023-03-07 11:55:59 +01:00
Arne Morten Kvarving
32bcc597e4 add missing include 2023-03-07 11:54:21 +01:00
Vegard Kippe
f48205e5ee Using PVTNUM as the default ROCKNUM 2023-03-06 18:12:05 +01:00
Tor Harald Sandve
351159d772 fix cap-press GSF 2023-03-06 11:45:06 +01:00
Atgeirr Flø Rasmussen
81e15329ee
Merge pull request #3421 from hnil/new_property_small
New property
2023-03-05 10:09:17 +01:00
hnil
c0086e7be8 fixed remaining comments 2023-03-03 16:36:50 +01:00
hnil
e8b87af11a removed segment index from old code to avoid extra diffs 2023-03-03 15:03:16 +01:00
hnil
3cd55b5290 - changed materialsparams to not use shared pointers
- added interface of reusing search in tables

- fixed after modifiying files for minimal diffs

fixed NDEBUG things

fixed from review
2023-03-03 14:43:50 +01:00
Bård Skaflestad
1aaab7ce7c
Merge pull request #3423 from bska/keep-all-schedule-aquflux-objects
Preserve SCHEDULE Section AQUFLUX Objects Across Report Steps
2023-03-03 13:49:14 +01:00
Bård Skaflestad
325228058b Preserve SCHEDULE Section AQUFLUX Objects Across Report Steps
This is in preparation of adding support for writing those objects
to the restart file.  We need a consistent view of active aquifers
for that purpose.
2023-03-03 11:07:13 +01:00
Bård Skaflestad
7b12d23d5d
Merge pull request #3422 from akva2/thresholdpressure_irrevers_accessor
add accessor for m_irreversible in ThresholdPressure
2023-03-03 10:23:39 +01:00
Bård Skaflestad
1a47937b9f
Merge pull request #3420 from akva2/disable_sigint_handler
fixed: disable python SIGINT signal handler for the embedded interpreter
2023-03-03 10:22:59 +01:00
Arne Morten Kvarving
bf7171f7c7 fixed: disable python SIGINT signal handler for the embedded interpreter 2023-03-03 09:30:29 +01:00
Arne Morten Kvarving
4d92298724 add accessor for m_irreversible in ThresholdPressure 2023-03-03 09:23:11 +01:00
Bård Skaflestad
4b7cf09b75
Merge pull request #3418 from akva2/split_timing_macros
split out timing macros to separate header
2023-03-01 15:29:49 +01:00
Arne Morten Kvarving
3fddcc0dd8 split out timing macros to separate header 2023-03-01 13:17:00 +01:00
Markus Blatt
393c42cd4c Do not use FieldVector::data() mehod as it misses from DUNE 2.6.
Instead we use the old fashioned way of checking the size and then
either return the address of the first element or a nullptr.

Closes OPM/opm-simulator#4472
2023-02-28 16:46:06 +01:00
Atgeirr Flø Rasmussen
c757fae0a6
Merge pull request #3416 from akva2/restart_serialize_inplace
Inplace: add restart serialization support
2023-02-28 07:50:48 +01:00
Atgeirr Flø Rasmussen
c6b9310922
Merge pull request #3415 from akva2/add_ioconfig_inputdir
added: getInputDir in IOConfig
2023-02-28 07:47:11 +01:00
Arne Morten Kvarving
eaaf02f51f Inplace: add restart serialization support 2023-02-27 13:57:23 +01:00
Arne Morten Kvarving
ca83776c34 added: getInputDir in IOConfig
returns the input directory
2023-02-27 12:15:47 +01:00
Paul Egberts
bfebe538c2 removal of unused files 2023-02-27 09:50:21 +01:00
Bård Skaflestad
1c0ddf1402
Merge pull request #3413 from daavid00/fixMacOSbuild
Fixing the broken build in macOS
2023-02-25 19:33:59 +01:00
David Landa Marban
a91844ecdb Fixing the build in macOS 2023-02-25 17:42:35 +01:00
Bård Skaflestad
762b43cfda
Merge pull request #3408 from totto82/summary_co2store
Add WCD, GCDI, GCDM, WIPG, WIPL summary output for Field and Region
2023-02-24 16:44:36 +01:00
Bård Skaflestad
61cec09d0a
Merge pull request #3406 from totto82/wsf_gsf
Implement WSF/GSF satfunc familiy for CO2STORE
2023-02-24 16:43:56 +01:00
Tor Harald Sandve
5a3d395482 cleanup and add more logging 2023-02-24 15:34:38 +01:00
Tor Harald Sandve
b5fdf35fbc Implement WSF/GSF satfunc familiy for CO2STORE 2023-02-24 15:07:30 +01:00
Arne Morten Kvarving
da492f8120
Merge pull request #3412 from akva2/serialize_hysteresis
Restart serialization: add hysteresis parameters
2023-02-24 11:41:33 +01:00
Arne Morten Kvarving
59d3619460 EclMaterialLawManager: add restart serialization support 2023-02-24 11:03:02 +01:00
Arne Morten Kvarving
b9a2b3fb86 EclXXXMaterialParams: add restart serialization support 2023-02-24 11:01:55 +01:00
Arne Morten Kvarving
09f1f06404 EclHysteresisTwoPhaseLawParams: add restart serialization support 2023-02-24 10:43:45 +01:00
Arne Morten Kvarving
ce9d8030d6 EclHysteresisTwoPhaseLawParams: header cleanup 2023-02-24 09:59:45 +01:00
Arne Morten Kvarving
11db5ce3af DirectionMaterialLawParams: add missing include
and some reformatting
2023-02-24 09:59:45 +01:00
Atgeirr Flø Rasmussen
60437b94df
Merge pull request #3410 from totto82/addMissingHEATprops
Add missing HEATCR and HEATCRT to props
2023-02-24 08:55:29 +01:00
Tor Harald Sandve
89850adb09 Add WCD, GCDI, GCDM, WIPG, WIPL summary for F and R 2023-02-23 09:17:39 +01:00
Tor Harald Sandve
0f163d22bc Add missing HEATCR and HEATCRT to props 2023-02-23 08:36:12 +01:00
Bård Skaflestad
0feefbbd53
Merge pull request #3346 from totto82/add_void_pr_rate
Add WWVIR to VoidPRRate
2023-02-22 23:45:03 +01:00
Bård Skaflestad
945b2c2e8e
Merge pull request #3407 from akva2/remove_dupe_symbols
fixed: remove duplicated symbols
2023-02-22 09:40:18 +01:00
Arne Morten Kvarving
3d755ea2a9 fixed: remove duplicated symbols
these were moved to Phase.cpp in f8e0319 but
I forgot to remove them from Runspec.cpp
2023-02-22 08:51:02 +01:00
Bård Skaflestad
4825a76b86
Merge pull request #3378 from GitPaean/support_aquflux
supporting the keyword AQUFLUX
2023-02-21 12:48:03 +01:00
Kai Bao
affdea72eb addressing reviewing comments for PR OPM/opm-common#3378 2023-02-21 10:47:42 +01:00
Kai Bao
1d8e92a262 putting AQUFLUX aquifers in one class 2023-02-17 17:32:24 +01:00
Kai Bao
35b095dfbc treat AQUFLUX keyword in SCHEDULE as individual events
We only check these keywords at the report step that the keywords are
specified.

Not totally sure how it will affect the RESTART, while it is not hard to
switch back.
2023-02-17 15:44:08 +01:00
Kai Bao
d3b629a76e AQUFLUX can run in parallel 2023-02-17 15:44:08 +01:00