Commit Graph

14001 Commits

Author SHA1 Message Date
goncalvesmachadoc
3e08afeafd delete makeState 2023-03-21 14:24:23 +01:00
Bård Skaflestad
94283ee43e
Merge pull request #3453 from hnil/missing_quadinclude
fixed missing include
2023-03-17 18:21:27 +01:00
hnil
352e2a8316 -fixed missing include 2023-03-17 17:06:30 +01:00
goncalvesmachadoc
7c29f6c2a5 test read name 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
4c93e18971 integration test framework 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
ca08609810 rebase 2023-03-17 14:26:25 +01:00
Bård Skaflestad
c5d25fa663
Merge pull request #3436 from hnil/fem-withpolygrid
fixed error if dune-fem is buildt with polygongrid
2023-03-17 13:46:26 +01:00
Bård Skaflestad
fcf02b639a
Merge pull request #3447 from bska/enable-inplace-solution-insert
Enable In-Place Element Construction in Insert()
2023-03-16 18:11:41 +01:00
Bård Skaflestad
f1b4ae527a Enable In-Place Element Construction in Insert() 2023-03-16 16:15:41 +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
Tor Harald Sandve
5f438d19cc fix sign bug in thermal Brine density calculations 2023-03-16 15:26:54 +01:00
Tor Harald Sandve
94c738538f use mass fraction not mole fractions 2023-03-16 15:26:03 +01:00
Bård Skaflestad
5f55ffe21a
Merge pull request #3442 from goncalvesmachadoc/co2store
CO2STORE + GASWAT parsing
2023-03-16 15:22:09 +01:00
Arne Morten Kvarving
9adb6d2586
Merge pull request #3450 from bska/restore-non-default-dune-install-builds
Restore Builds With Dune in Non-Default Installed Locations
2023-03-16 13:00:30 +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
dec47944e3
Merge pull request #3446 from bska/celldata-ctor
Add Constructors for CellData Objects
2023-03-16 12:22:53 +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
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
goncalvesmachadoc
f6402e2bc8 extra keywords 2023-03-16 10:50:59 +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
Tor Harald Sandve
932ed862d5 add moles unit to unitsystem 2023-03-16 09:18:39 +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
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
goncalvesmachadoc
728d021e3d parse and do nothing, schedule keywords 2023-03-15 18:54:17 +01:00
goncalvesmachadoc
c7b80ccc72 fix parsing 2023-03-15 17:03:52 +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
goncalvesmachadoc
f32a4d6837 fix the mess 2023-03-14 17:19:56 +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
hnil
29e35211de fixed extra comment 2023-03-14 10:13:13 +01:00
goncalvesmachadoc
863fd0786d parse co2store + gaswat 2023-03-13 19:13:28 +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
Paul Egberts
8f90d7fe89 Removal of unused files 2023-03-10 14:20:57 +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
Paul Egberts
8467d82eb6 Placed ResInsight code in separate namespace called external 2023-03-10 10:06:04 +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