Commit Graph

13489 Commits

Author SHA1 Message Date
Bård Skaflestad
b528fd768f
Merge pull request #3231 from akva2/fix_no_input_output
Fix build with ENABLE_ECL_INPUT=0
2022-11-30 15:32:02 +01:00
Bård Skaflestad
e1a9466cac Merge pull request #545 from akva2/fix_build_no_ecl_input
fix build without ENABLE_ECL_INPUT
2022-11-30 14:58:08 +01:00
Arne Morten Kvarving
f4627455e5
Merge pull request #3233 from bska/apply-gridunit-to-output-copies
Apply GRIDUNIT Processing to COORD/ZCORN Output Copies
2022-11-30 14:35:14 +01:00
Bård Skaflestad
5faf7fc088 Apply GRIDUNIT Processing to COORD/ZCORN Output Copies
Needed to reflect the GRIDUNIT transformation in the EGRID output.
2022-11-30 14:09:20 +01:00
Arne Morten Kvarving
8478171d76 fix build without ENABLE_ECL_INPUT 2022-11-30 12:48:32 +01:00
Arne Morten Kvarving
4978329b02 disable mocksim tests without HAVE_ECL_INPUT 2022-11-30 12:44:52 +01:00
Arne Morten Kvarving
11fb11d089 fixed: we need fmt even without ENABLE_ECL_INPUT
used in test_OpmInputError_format
2022-11-30 12:44:17 +01:00
Arne Morten Kvarving
0fc73cad04 ActiveGridCells: disable without ENABLE_ECL_INPUT
depends on eclipse data structures
2022-11-30 12:42:25 +01:00
Tor Harald Sandve
5e054cdec9 allow for co2store + gas + water 2022-11-30 11:28:06 +01:00
Bård Skaflestad
52a694f75a
Merge pull request #3227 from tskille/fix_egrid
Use input COORD and ZCORN if these are available when writing EGRID f…
2022-11-30 11:28:04 +01:00
Bård Skaflestad
e2ccf95972
Merge pull request #3230 from akva2/remove_unused_class
Remove unused class
2022-11-30 11:21:25 +01:00
Arne Morten Kvarving
41d91c4701 remove unused class 2022-11-30 10:55:21 +01:00
Torbjørn Skille
e470a426a3 Use input COORD and ZCORN if these are available when writing EGRID file. 2022-11-30 08:08:25 +01:00
Arne Morten Kvarving
a154a2a49f
Merge pull request #3228 from akva2/remove_rh
remove in-tree redhat packaging
2022-11-29 15:05:43 +01:00
Arne Morten Kvarving
827ac8e02f remove in-tree redhat packaging
now hosted in separate repository
2022-11-29 14:00:38 +01:00
Bård Skaflestad
028ea4c281
Merge pull request #3184 from bska/write-rft-seg-dyndata
Finish Outputting Per Segment Dynamic State to RFT File
2022-11-28 14:26:16 +01:00
Bård Skaflestad
b07b9c714f Extract Common Setup Code to Helper Function
Suggested by [at]blattms
2022-11-28 13:38:56 +01:00
Bård Skaflestad
5749ef1bdc Add Unit Tests for Remaining WRFTPLT SEG Features
In particular, add unit tests for phase velocity, holdup fractions,
and phase viscosities.
2022-11-25 17:46:49 +01:00
Bård Skaflestad
802a401a87 Finish Outputting Per Segment Dynamic State to RFT File
This commit adds support for outputting the flow velocity, the
holdup fraction, and the phase viscosity to the RFT file arrays

  * SEGxVEL
  * SEGxHF
  * SEGxVIS

Values provided directly by simulator so we only need to convert to
output units.
2022-11-25 17:46:49 +01:00
Bård Skaflestad
700d18eb4a
Merge pull request #3215 from bska/segment-summary-free-flow-rate
Recognize Additional Per-Segment Summary Vector Keywords
2022-11-25 17:22:25 +01:00
Bård Skaflestad
2b720bef17 Add Unit Tests for New Summary Vectors. 2022-11-25 13:02:27 +01:00
Bård Skaflestad
dbd2acee71 Recognize Additional Per-Segment Summary Vector Keywords
In particular, add parser and summary output support for the free
vs. solution flow rates of gas and oil as well as the dissolved
gas/oil ratio, the vaporised oil/gas ratio, and the water/gas ratio.
2022-11-25 13:02:27 +01:00
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