OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,852 Commits 18 Branches 75 Tags 73 MiB
553688b73e
Commit Graph

13852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
553688b73e
Merge pull request #3424 from bska/write-aquflux-rst-info 
Add Restart File Output Support for Constant Flux Aquifers
 2023-03-16 12:04:14 +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
Arne Morten Kvarving
ff2e8c8333
Merge pull request #3435 from akva2/sync_find_quadmath 
sync FindQuadMath with dune
 2023-03-16 10:00:33 +01:00
Arne Morten Kvarving
215fdae47d changed: remove explicit option to enable/disable quadmath 
not necessary as it is now only used for relevant targets
you can still use the generic -DCMAKE_DISABLE_FIND_PACKAGE_QuadMath=1 if you
so desire
 2023-03-16 09:07:13 +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
Arne Morten Kvarving
27ecbe5c98 fixed: instance CO2Tables for quad if QuadMath was found 2023-03-16 09:07:13 +01:00
Arne Morten Kvarving
1ef0492763 sync FindQuadMath with dune 
while at it, change to FindQuadMath, not FindQuadmath
 2023-03-16 09:07:13 +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
Bård Skaflestad
03ab6356fb
Merge pull request #3444 from akva2/fix_no_fortran_flags 
fixed: quote in case of no existing flags
 2023-03-15 11:32:45 +01:00
Arne Morten Kvarving
d0b6546a38 fixed: quote in case of no existing flags 
this can happen for fortran flags as opm is not
using fortran itself (but it's potentially enabled
by BLAS)
 2023-03-15 10:26:40 +01:00
Markus Blatt
b30fe5fc4a
Merge pull request #3441 from akva2/build_no_examples 
fixed: building without examples
 2023-03-14 16:15:57 +01:00
Arne Morten Kvarving
a6b2d2438b fixed: building without examples 2023-03-14 15:01:18 +01:00
Bård Skaflestad
80ce852f15
Merge pull request #3438 from GitPaean/stopped_wells_should_output_wmctl_zero 
WMCTL is zero for wells with status STOP
 2023-03-14 14:43:57 +01:00
Atgeirr Flø Rasmussen
3b4e5b97f7
Merge pull request #3426 from totto82/fix_gsf_cap 
fix cap-press GSF
 2023-03-14 14:14:41 +01:00
Bård Skaflestad
b59fe0c068
Merge pull request #3439 from daavid00/fixClangbuild 
fix to broken built with clang
 2023-03-10 23:28:08 +01:00
David Landa Marban
8cbefba4c5 fix to broken built with clang 2023-03-10 22:33:08 +01:00
Kai Bao
ded3edd3bf WMCTL is zero for wells with status STOP 2023-03-10 15:12:14 +01:00
Bård Skaflestad
d87ac33791
Merge pull request #3434 from blattms/refactor-parserinit 
Reduce g++-12 resource consumptions for generated parser files.
 2023-03-10 13:02:07 +01:00
Markus Blatt
3824d45f71 Prevent warnings about shadowing function parameters. 
By skipping the parameter and using the class member directly.
 2023-03-10 10:27:40 +01:00
Bård Skaflestad
6f460c3d27
Merge pull request #3409 from bska/revised-active-by-column 
Enumerate Columns According to Horizontal Model Dimensions
 2023-03-09 12:34:06 +01:00
Markus Blatt
995ec609e3 Added missing include to ParserTests.cpp 2023-03-08 22:27:46 +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
Bård Skaflestad
040f0fddd8 Enumerate Columns According to Horizontal Model Dimensions 
The inner loop is always across the model layers while we ensure
that the 'outer' loop always iterates over an index range that is at
least as large as that of the 'middle' loop.  This follows from
recent work on compatibility prompted by real field models with the
constant flux analytic aquifer type.

Thanks to [at]tskille for the additional insight.
 2023-03-08 17:57:10 +01:00
Bård Skaflestad
f30cc5e980 Precompute Columnar Index Sorting Criterion 
Expend memory to derive IJK triples exactly once for each cell.  The
latter is potentially an expensive operation.
 2023-03-08 17:57:10 +01:00
Markus Blatt
b52dc598d3 Refactored ParserInit.cpp to reduce ram needed for compilation 2023-03-08 17:25:35 +01:00
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