Commit Graph

11967 Commits

Author SHA1 Message Date
Arne Morten Kvarving
9d983cb2f3
Merge pull request #3226 from goncalvesmachadoc/patch-7
Repeated includes
2022-11-25 10:33:37 +01:00
Cíntia Gonçalves Machado
1bd79a9999
Repeated includes 2022-11-25 09:51:25 +01:00
Bård Skaflestad
6c21cbe3e0
Merge pull request #2981 from goncalvesmachadoc/saltdensity
Add solid salt density as input
2022-11-24 16:28:56 +01:00
Bård Skaflestad
de24bb9300
Merge pull request #3225 from akva2/internalize_thpresft
Internalize THPRESFT keyword
2022-11-24 11:53:02 +01:00
Arne Morten Kvarving
8ea4d68e7a ThresholdPressure: internalize THPRESFT keyword 2022-11-24 10:47:10 +01:00
Arne Morten Kvarving
e23feb31f1 RockConfig: add missing include 2022-11-23 12:23:26 +01:00
Arne Morten Kvarving
be90d11b3b BCConfig: add missing include 2022-11-23 12:23:10 +01:00
Markus Blatt
0624a04613
Merge pull request #3220 from bska/reduce-astnode-eval-nesting
Reduce Level of Nesting in UDQASTNode::eval
2022-11-22 22:35:03 +01:00
Bård Skaflestad
8e90acf070 Reduce Level of Nesting in UDQASTNode::eval
In particular, introduce a number of helper functions for evaluating
expressions, well variables, group variables, unary and binary
function expressions, and direct number values.  This also, I
believe, fixes a latent error in one group variable case which
appears not to apply the 'sign' correctly.

While here, also wrap some long lines throughout this component.
This is in preparation of adding support for UDQs at the segment
level.
2022-11-22 16:10:28 +01:00
Markus Blatt
845b00c27a
Merge pull request #3218 from totto82/wtemp_all_wells
store temperature for all wells not just injectors
2022-11-22 12:26:17 +01:00
Markus Blatt
5590b3c400
Merge pull request #3173 from bska/write-rft-seg-data
Enable SEG Type RFT File Output
2022-11-22 12:23:32 +01:00
Bård Skaflestad
720a5e0334 Add Unit Tests for Current WRFTPLT SEG Features 2022-11-17 11:36:44 +01:00
Bård Skaflestad
2bacfbb558 Enable SEG Type RFT File Output
We're missing the following quantities

  - Flow velocities (SEGxVEL)
  - Holdup fractions (SEGxHF)
  - Phase viscosity (SEGxVIS)

These require additional dynamic values from the simulator and
will be introduced in upcoming work.
2022-11-17 11:36:44 +01:00
Bård Skaflestad
a592c05766 Expose 'OrderSegments' Sorting Predicate
In preparation of defining branches for SEG-type RFT file output.
2022-11-17 10:34:05 +01:00
Bård Skaflestad
8d24dd9d1e Extract Common Base Class for Phase Quantities
Reimplement 'PLTFlowRate' in terms of base class 'PLTPhaseQuantity'.
This is in preparation of adding other phase quantities, such as
velocity and viscosity, which are needed in SEG output.
2022-11-17 10:34:05 +01:00
Bård Skaflestad
56a53d4bde Add Empty Predicate to WellSegments Collection
Will be useful when deciding whether or not to collect segment
information in the RFT file.
2022-11-17 10:34:05 +01:00
Bård Skaflestad
c7dc6de3b3
Merge pull request #3151 from bska/write-plt-data
Add Basic PLT Information to RFT Output File
2022-11-17 10:27:14 +01:00
Bård Skaflestad
9bb733b69b Add Basic PLT Information to RFT Output File
We support both standard and multisegmented wells, but do not output
every known PLT array.  Notably missing are

  - WELLPLT
  - Brine flow rate (CONSRAT)
  - Phase flow rates through tubing (CONxTUB)

Computing CONNXT for multisegmented wells is somewhat involved, and
requires sorting the connections according to branch number,
segments, and tubing lengths.  We use an ancillary structure, an
array of indices into a WellConnections object, along with a custom
predicate to perform this sorting.

As an implementation detail, we handle PLT data for multisegmented
wells as an extension of the PLT data for regular/standard wells.
This extension is realised through dynamic polymorphism.

Add unit tests to cover PLT data for both well types.
2022-11-17 09:37:54 +01:00
Bård Skaflestad
078b7b2e28 Pull Basic Connection Information Out To Helper
This commit introduces a new helper class, WellConnectionRecord,
which holds the connection IJK and host grid information.  Said
information must be output if the run requests either RFT, PLT, or
both RFT and PLT data and so should not be tied to the RFT writer.

This is in preparation of adding PLT output.
2022-11-17 09:37:54 +01:00
Bård Skaflestad
040e4fd5ef Make 'Setup' Structure Generally Available
In preparation of adding unit tests for PLT data.  While here,
also ensure that we explicitly reference pertinent objects from the
Opm namespace.
2022-11-17 09:37:54 +01:00
Bård Skaflestad
2a1c027296 Split Connection Loop Logic Out to Helper Function
In preparation of adding PLT information.
2022-11-17 09:37:54 +01:00
Bård Skaflestad
4b95d56260 RFT: Pull Connection Depth From Connection Object
We don't need the grid to retrieve this information.
2022-11-17 09:37:54 +01:00
Bård Skaflestad
f08f984db1
Merge pull request #3222 from GitPaean/removing_special_wpolymer
removing SPECIAL from WPOLYMER definition
2022-11-17 00:22:04 +01:00
Markus Blatt
7d6f2084b6
Merge pull request #3219 from akva2/enable_alugrid
enable dune-alugrid on jenkins
2022-11-16 21:35:04 +01:00
Kai Bao
a61eb2732a removing SPECIAL from WPOLYMER definition 2022-11-16 11:51:13 +01:00
Arne Morten Kvarving
3e9ae249c6 enable dune-alugrid 2022-11-14 12:32:50 +01:00
Markus Blatt
dd2999d0af
Merge pull request #3212 from totto82/bc_dirichlet_default
use initial pressure and temperature as default in bc dirichlet
2022-11-11 22:22:44 +01:00
Tor Harald Sandve
0a778c6e19 throw if temperature() is called for non-injectors 2022-11-11 15:26:04 +01:00
Tor Harald Sandve
4bdf1091e8 store temperature for all wells not just injectors 2022-11-11 13:15:37 +01:00
Atgeirr Flø Rasmussen
2b437cbd11
Merge pull request #3205 from blattms/skip-compile-checks
Make sure compilation is not tested when searching for DUNE/OPM module
2022-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
b20234e59c
Merge pull request #3203 from blattms/fix-simple-find-package-calls
[bufix,cmake] Fixes simple find_package(opm-module) calls
2022-11-07 14:48:39 +01:00
Bård Skaflestad
5dc4f7301f
Merge pull request #3202 from tskille/fix_esmry_rename
Cleanup when ESMRY renamle fails
2022-11-05 14:17:15 +01:00
Bård Skaflestad
5aca4f9026
Merge pull request #3201 from tskille/convertECL_grdecl
Update convertECL to support conversion to grdecl files
2022-11-05 14:12:51 +01:00
Torbjørn Skille
9bbdcfd7ee Update convertECL to support conversion to grdecl files
option -g will output a grdecl file. Input file should be formatted or unformatted ECL files. The option -o can be used to specify output file name. Option -o only valid together with -g option.
2022-11-05 09:59:10 +01:00
Torbjørn Skille
8f4c0b4e92 Cleanup when ESMRY renamle fails
Temporary ESMRY file name is now includeing simulation root name
Delete temp esmry file when the rename temp ESMRY file to simulation ESMRY file.
2022-11-04 18:46:30 +01:00
Tor Harald Sandve
17d0ccee83 use initial pressure and temperature as default in bc dirichlet 2022-11-04 12:10:06 +01:00
Markus Blatt
75b78bf659
Merge pull request #3185 from totto82/bc_dirichlet
extend BCType with dirichlet
2022-11-02 19:48:09 +01:00
Markus Blatt
87a4017e06 Make sure compilation is not tested.
This is broken for DUNE >= 2.8 and dune module that use  OPM.
2022-11-01 22:10:16 +01:00
Bård Skaflestad
d1a2063520
Merge pull request #3187 from plgbrts/rwgsalt
RWGSALT table implementation based on PvtxTable
2022-11-01 17:16:04 +01:00
Bård Skaflestad
5549df53ea
Merge pull request #3204 from GitPaean/unit_wsegvale
using SIDouble when creating Valve from a record
2022-11-01 15:23:38 +01:00
Kai Bao
606d6fd73a using SIDouble when creating Valve from a record
to account for the unit conversion.
2022-11-01 14:59:18 +01:00
Markus Blatt
3abeae485a [bufix,cmake] Fixes simple find_package(opm-module) calls
When not using the OPM CMake build system magic a
find_package(opm-module) did fail in some settings as the
CMAKE_MODULE_PATH did not include the location of OpmPackge.cmake and
the likes.

This fixes this by issuing a find_package(opm-common) for modules that
are not opm-common.
2022-11-01 13:22:56 +01:00
Atgeirr Flø Rasmussen
51366c27db
Merge pull request #3198 from blattms/debian-fixes
Spelling fixes and manpage updates from Debian packages
2022-10-31 16:37:37 +01:00
Atgeirr Flø Rasmussen
fae8360d5d
Merge pull request #3199 from atgeirr/fix-find-metis
Fix metis-related warnings
2022-10-31 13:28:18 +01:00
Atgeirr Flø Rasmussen
5b90e56e75 The commented-out part seems to be necessary, uncommenting. 2022-10-31 10:47:41 +01:00
Markus Blatt
49f06f0cb7 Fixed spelling eror in compareECL 2022-10-29 00:10:40 +02:00
Markus Blatt
043050a793 Fix typos: spesific -> specific 2022-10-29 00:09:12 +02:00
Markus Blatt
b76c62a2f1 Updated manpages 2022-10-29 00:09:12 +02:00
Markus Blatt
ed757caa8b
Merge pull request #3179 from bska/segment-dyn-data
Support Additional Dynamic Phase Quantities Per Segment
2022-10-28 14:40:27 +02:00
Bård Skaflestad
4d9ce5b10c Support Additional Dynamic Phase Quantities Per Segment
In particular, provide a container for holding/communicating the
per-phase, per-segment quantities at local flow conditions

    - Flow velocities
    - Holdup fractions
    - Viscosities
2022-10-28 09:30:16 +02:00