Commit Graph

7574 Commits

Author SHA1 Message Date
Markus Blatt
ea64c29001 Added missing forward declaration to make TransMult.hpp usable standalone. 2023-03-28 15:40:21 +02:00
Markus Blatt
055547c709 EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available
This is needed to prevent creation of NNCs if the the empty gap created
by pinched out cells is larger than this threshold.
2023-03-28 11:55:14 +02:00
hnil
352e2a8316 -fixed missing include 2023-03-17 17:06:30 +01:00
Bård Skaflestad
7f1e56e436 Adjust Whitespace in Data::Solution Implementation
In preparation of enabling in-place construction in insert().
2023-03-16 16:15:41 +01:00
Bård Skaflestad
bdf6951e62 Restore Builds With Dune in Non-Default Installed Locations
In general we'd need to link to dune-common ("target_link_library")
to get the appropriate include directories for Dune in that case,
but in this specific instance we can get by with not specialising
Dune's 'className' function if Dune is not available.

Thanks to [at]akva2 for suggesting this workaround.
2023-03-16 12:44:17 +01:00
Bård Skaflestad
32b104f828 Merge pull request #3449 from totto82/output_moles
add moles unit to unitsystem
2023-03-16 12:33:16 +01:00
Bård Skaflestad
e074054a57 Merge pull request #3448 from totto82/convertRsw
add convertRswToXwg
2023-03-16 12:25:54 +01:00
Bård Skaflestad
ae29bb9101 Add Constructors for CellData Objects
This enables using in-place construction in Solution::insert().
2023-03-16 12:15:44 +01:00
Bård Skaflestad
0adcc7dd07 Add Restart File Output Support for Constant Flux Aquifers
We support constant flux aquifers (AQUFLUX keyword) entered both in
the SOLUTION and in the SCHEDULE sections.  The primary structural
change is that we have to support analytic aquifers being introduced
dynamically, whence the connection information (xCAQ) must be
captured without knowing the full set of analytic aquifers.  We
therefore allocate those output arrays purely from the maximum sizes
entered in the RUNSPEC section whereas we defer determining the
maximum aquifer ID to the point of capturing the dynamic values.

The xAAQ values for constant flux aquifers amount to a new aquifer
type integer value (=2) in IAAQ[11] and the flux value in SAAQ[0].
2023-03-16 10:32:43 +01:00
Bård Skaflestad
53a7c2343a Split Aquifer Type Handling out to Helper Functions
In preparation of adding support for outputting constant flux
aquifer values.
2023-03-16 10:32:43 +01:00
Tor Harald Sandve
932ed862d5 add moles unit to unitsystem 2023-03-16 09:18:39 +01:00
Arne Morten Kvarving
509a018ae7 fixed: fix debug printing with quad
std::to_string(__float128) is not defined
we need to instance the evaluation formatter for __float128
2023-03-16 09:07:13 +01:00
Tor Harald Sandve
1db6e4d7dd add convertRswToXwg 2023-03-16 08:48:56 +01:00
Arne Morten Kvarving
6b71f3d3c2 Merge pull request #3417 from blattms/fix-hdf5-dune-2.6
Do not use FieldVector::data() mehod as it misses from DUNE 2.6.
2023-03-15 21:10:34 +01:00
Markus Blatt
380fd4963e Split Builtin.hpp into multiple compile units for g++-12.
g++-12 needs quite some memory and time to compile it.
We now use several Builtin*.cpp for the imlementations for different
starting letters of eclipse keywords to use less resources for
compiling.
2023-03-08 22:26:34 +01:00
Markus Blatt
b52dc598d3 Refactored ParserInit.cpp to reduce ram needed for compilation 2023-03-08 17:25:35 +01:00
Arne Morten Kvarving
32bcc597e4 add missing include 2023-03-07 11:54:21 +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
Arne Morten Kvarving
4d92298724 add accessor for m_irreversible in ThresholdPressure 2023-03-03 09:23:11 +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
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
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
b5fdf35fbc Implement WSF/GSF satfunc familiy for CO2STORE 2023-02-24 15:07:30 +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
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
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
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