Arne Morten Kvarving
3fddcc0dd8
split out timing macros to separate header
2023-03-01 13:17:00 +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
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
Kai Bao
fceb3515b7
let AquiferConfig handle the AQUFLUX aquifer existence
...
for summary and restart file output.
2023-02-17 15:44:08 +01:00
Kai Bao
00ff5b41de
creating dummy AQUFLUX aquifers in AquiferConfig
...
for the ones that were not specified in the SOLUTION section
2023-02-17 15:44:08 +01:00
Kai Bao
f081ee5826
using AquiferConfig to handle AQUFLUX aquifers
2023-02-17 15:44:08 +01:00
Kai Bao
d412158cf7
WIP in handling the summary output for AQUFLUX
...
AAQR, AAQP, AAQT works fine while FAQR and FAQT are not handled yet.
2023-02-17 15:44:08 +01:00
Kai Bao
83457f679e
prototyping for the AQUFLUX parsing implementation
...
at the end, SOLUTIONSection() function is used to handle the
keywords in the SOLUTION section.
2023-02-17 15:44:08 +01:00
Kai Bao
1e4b33317b
correcting the definition of keyword AQUFLUX
2023-02-17 15:44:08 +01:00
Atgeirr Flø Rasmussen
55efa07fe9
Merge pull request #3403 from totto82/fixJfunc
...
BUGFIX JFUNC, use the correct config file when getting the endpoints
2023-02-17 11:49:12 +01:00
Tor Harald Sandve
0c1e891d0a
BUGFIX JFUNC, use the correct config file when getting the endpoints
2023-02-17 11:04:47 +01:00
Bård Skaflestad
d439ef9b91
Merge pull request #3402 from akva2/gpmaint_state_comp_op
...
GPMaint::State: add comparison operator
2023-02-15 20:54:18 +01:00
Arne Morten Kvarving
c5a2807b44
GPMaint::State: add comparison operator
...
while at it, move some code to cpp file and add missing headers
2023-02-15 20:04:20 +01:00
Bård Skaflestad
708964721d
Merge pull request #3400 from hnil/add_timing_block
...
added timingblocks most important functions
2023-02-15 12:37:03 +01:00
Bård Skaflestad
652713b0ef
Merge pull request #3397 from GitPaean/aquct_fetp_not_schedule
...
throw when AQUCT and AQUFETP are used as SCHEDULE keywords
2023-02-15 11:37:25 +01:00
Kai Bao
812d119363
give error messages for AQUCT and AQUFETP in SCHEDULE section
2023-02-15 10:12:01 +01:00
hnil
a3e025290f
added timingblocks most important functions
2023-02-15 09:39:14 +01:00
Bård Skaflestad
63bfa8e47c
Merge pull request #3399 from akva2/serialization_test_mark_const
...
test_Serialization: mark variables const
2023-02-14 14:38:42 +01:00
Arne Morten Kvarving
735bca1d8f
test_Serialization: mark variables const
2023-02-14 13:49:51 +01:00
Bård Skaflestad
a8a2e0f317
Merge pull request #3398 from hnil/nicer_comments
...
Removed unnecessary comment
2023-02-14 12:28:20 +01:00
hnil
502b0df428
Removed unnecessary comment
2023-02-14 11:07:52 +01:00
Kai Bao
a89136f1f2
only using the AQUCT and AQUFETP in SOLUTION section
...
to generate the aquifers in AquiferConfig.
2023-02-14 10:44:17 +01:00
Bård Skaflestad
093ead5946
Merge pull request #3353 from bska/summary-state-seg-var
...
Add Separate SummaryState Data Member for Segment Level Values
2023-02-10 16:12:02 +01:00
Bård Skaflestad
93b340cede
Store Per-Segment Summary Vectors Separately
...
Enables easier access for UDQ/ACTIONX purposes.
While here, also move the serializationTestObject() member
function's implementation to the .cpp file.
2023-02-10 15:26:27 +01:00
Bård Skaflestad
a76768cf75
Reorder SummaryState Member Functions
...
This way the implementation file matches the declared order in the
header file.
2023-02-10 15:26:27 +01:00