Commit Graph

58 Commits

Author SHA1 Message Date
Bård Skaflestad
f222fa1d8f Split 3D Vectors into Base and Extended Categories
The 'base' arrays are compatible in both name and interpretation to
those emitted in the 'SOLUTION' section from other simulators
whereas the 'extended' arrays are specific to Flow.  Tag extended
arrays as OPM_EXTENDED instead of AUXILIARY as the latter is
deprecated and will be removed at some point in the future.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
0db9693e9f Retag XMFCO2 and YMFWAT Arrays as OPM_EXTENDED
While here, also switch to using std::transform() instead of a raw
loop.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
359079dae9 Retag TEMP Array as OPM_EXTENDED When Needed
The AUXILIARY category is deprecated and will be removed at some
point.  As of right now, the OPM_EXTENDED category fills the same
role but with a more descriptive name.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
54fc98bfb7 Add Support for Per-Phase RPTRST Density Keys
In particular the DENx (x = G, O, W) keys request that the G,O,W
phase densities per cell be output at a restart step.  These are
the per-phase counterparts to the existing 'DEN' key.
2023-03-30 10:39:30 +02:00
Bård Skaflestad
86cfa6dc3c
Merge pull request #4550 from akva2/janitoring
Some janitoring
2023-03-24 15:48:15 +01:00
Bård Skaflestad
0fb5093807
Merge pull request #4537 from totto82/vapwat_gaswater
add vapwat to gaswater simulators and output mol fractions YMFWAT
2023-03-24 15:15:59 +01:00
Arne Morten Kvarving
5f28175603 fix whitespace at eol
and some brace placements
2023-03-24 14:56:23 +01:00
hnil
e1c4a73c43 -- removed double evaluation of processLocalData
-- separated fluid in place work from other cell based data
-- added some timing macros for better preformance overview
2023-03-22 11:55:37 +01:00
Tor Harald Sandve
369a27e80d use correct molarmass when converting XMFCO2 2023-03-21 10:45:09 +01:00
Tor Harald Sandve
b8032c12bb add vapwat to gaswater simulators and output molfractions YMFWAT 2023-03-21 10:34:54 +01:00
Bård Skaflestad
6ffc8b96a9 Adjust Whitespace in Output Module
Mostly to split long lines and to add a few blank lines for
readability.  While here, also apply 'const' in a few locations and
flip the order of a conditional to (potentially) save a bit of work.

This is in preparation of revising the output destination categories
of numerous 3D result vectors.
2023-03-16 15:50:03 +01:00
Bård Skaflestad
8d756a6add
Merge pull request #4529 from totto82/xmfco2
add molar fraction of CO2 in brine to RST output
2023-03-16 14:37:57 +01:00
Tor Harald Sandve
3fd710668f convert co2 output from volumes to moles 2023-03-16 09:21:12 +01:00
Tor Harald Sandve
ba906fc286 add molar fraction of co2 in brine to RST output 2023-03-16 08:52:52 +01:00
Tor Harald Sandve
d679ecd5a8 Add WCD, GCDI, GCDM, WIPG, WIPL summary for F and R 2023-02-23 09:18:27 +01:00
David Landa Marban
5600d7d9e5 FLOWS and FLORES support 2023-02-02 11:19:49 +01:00
Arne Morten Kvarving
dbcbb15449 EclOutputBlackoilModule: move code using SummaryConfig to compile unit 2023-01-18 14:59:58 +01:00
Arne Morten Kvarving
f4ea11cfba EclGenericOutputBlackoilModule: move destructor definition to compile unit 2023-01-18 14:59:58 +01:00
Arne Morten Kvarving
6a5fcd9d9e eclgenericoutputblackoilmodule.hh: forward SummaryConfig(Node) 2023-01-18 14:59:57 +01:00
Arne Morten Kvarving
6d97ca97a1 add missing Well.hpp includes 2023-01-18 11:24:25 +01:00
Tor Harald Sandve
ec2983df43 come code cleaning in ecloutputblackoilmodule 2023-01-16 08:53:57 +01:00
Arne Morten Kvarving
7f7b373a2d add missing WellConnections.hpp includes 2023-01-12 12:24:32 +01:00
Arne Morten Kvarving
e2b8092894 add missing RFTConfig.hpp includes 2023-01-12 10:39:49 +01:00
Tor Harald Sandve
5854b8a7a1 Support gas dissolution in water (Rsw)
- adapt to interface change in waterPvt()
- add gas + water + disgasw simulator

Note
- MSW is not supported
- EQUIL initialization is not supported
2022-12-21 13:13:52 +01:00
Bård Skaflestad
bbb91effae Report Water Viscosity as WAT_VISC
A misprint led to erroneously reporting the gas viscosity here.

Reported by: [at]EdmundStephens on GitHub.
2022-11-07 11:48:41 +01:00
OPMUSER
10b555ad3f Fix PBUB and PDEW Export to Restart File
The saturation pressures written to the restart used SI units instead of the pressure units for the model. This PR fixes this.
2022-09-27 17:23:35 +08:00
Arne Morten Kvarving
2c0ff6f81e consistently use ParallelCommunication.hpp for communication definition 2022-09-01 12:26:11 +02:00
Bård Skaflestad
27b695d0be Fix Averaged Quantities for Non-HC Simulations
Commit 6d3da3d2e introduced the notion of a "dynamic", pressure
dependent pore-volume and switched the 'PoreVolume' aggregates to
reference condition evaluation for output to the 'PORV' field in the
.PRT file.  We did however fail to update all existing uses of
'PoreVolume' which introduced an inconsistency.  In particular, for
simulation models without hydrocarbons-e.g., a single-phase water
run-the numerator of the volume weighted average would include
pressure effects through the rock compressibility but the
denominator would not.

Thanks to Edmund Stephens for discovering the issue and providing an
example model for analysing the underlying issue.
2022-08-11 16:07:00 +02:00
Tor Harald Sandve
4fd0c24661 output drsdtcon values to restart files 2022-07-21 15:41:30 +02:00
Cintia Goncalves Machado
98d5450ca1
Fix FOE definition 2022-06-13 15:34:19 +02:00
Tor Harald Sandve
967c538da8 output pcow, pcog 2022-04-29 15:35:16 +02:00
Tor Harald Sandve
0c9bb3990e
Merge pull request #3830 from plgbrts/vapwat
Adding explicit input specification of water-gas ratio (RVW) and RVW output plus simulator gas-water system with salt precipitation and water evaporation for
2022-04-07 09:03:26 +02:00
Paul Egberts
d89672e4a3 some clean up 2022-03-06 20:51:57 +01:00
Bård Skaflestad
f6e8a9bfac Report Unique IJK Tuples for Failed Bubble/Dew Point Calculations
This commit switches the debug file's records of "failed" bubble and
dew point pressure calculations from a non-unique list of linearised
Cartesian indices to a unique list of (1-based) (I,J,K) tuples.
This format is hopefully easier to read for humans.

Thanks to [at]blattms for suggesting the gatherv() helper function
which greatly simplifies the communication pattern.

Example from selected time steps in a real field case with Cartesian
dimensions 137-by-236-by-58:

  - Original
  Finding the dew point pressure failed for 2 cells [1467066, 1467066]
  Finding the dew point pressure failed for 8 cells [1467063, 1467063, 1467066, 1467066, 1467066, 1467066, 1467066, 1467066]

  - This commit
  Finding the dew point pressure failed for 1 cell [(71,89,46)]
  Finding the dew point pressure failed for 2 cells [(68,89,46), (71,89,46)]
2022-03-02 22:49:28 +01:00
Paul Egberts
797fdc278b water-gas ratio input and output plus simulator for salt precipitation and water evaporation 2022-03-01 20:52:43 +01:00
Bård Skaflestad
ecec83349b Capture Bulk Connection Fluxes to Accumlate Inter-Region Flows
This commit adds a new grid traversal that computes fluxes-presently
surface level component fluxes-for all bulk connections on the
current MPI rank.  We aggregate those fluxes, if applicable, into a
container for inter-region flows, but this support could be extended
to capturing the full 3D vector flow rates for restart output if
needed.
2022-02-18 10:29:56 +01:00
Paul Egberts
dfe298a424 Allowing for non-eclipse output SALTP and PERMFACT 2022-01-14 11:46:39 +01:00
Joakim Hove
6b92443cb4 Downstream filesystem reorganisation in opm-common 2022-01-02 14:33:34 +01:00
Bård Skaflestad
89dbf807b2
Merge pull request #2584 from goncalvesmachadoc/fixReport
fixReportPRT
2021-12-01 21:39:31 +01:00
goncalvesmachadoc
8b001e2e75 moveLogCall&ProtectField 2021-12-01 16:13:53 +01:00
Joakim Hove
3522118c60 Use function tracer.fname() for name of restart output vector 2021-11-30 11:23:36 +01:00
goncalvesmachadoc
52d096c46a fix NaN and Field Output 2021-11-25 19:44:16 +01:00
Joakim Hove
b4b1045dc2 Flag tracer solution data with data type RESTART_TRACER_SOLUTION 2021-11-17 14:27:46 +01:00
Bård Skaflestad
6bf741502f Fix Incorrect Solution Array Tag
The Flow specific PORV_RC and TMULT_RC solution arrays were tagged
as ECLIPSE compatible.  Mark them as Flow specific so they do not
cause restart problems in the ECLIPSE compatible case.
2021-11-14 15:41:14 +01:00
Tor Harald Sandve
70c9d2e237
Merge pull request #3590 from daavid00/micp-2021-10
micp
2021-10-14 22:28:28 +02:00
daavid00
48b175904a first version of micp implementation in flow 2021-10-14 17:44:57 +02:00
Markus Blatt
6f0461691a [bugfix] Make tracerConcentrations_ valid for non-restart writes.
We decide whether to write tracer concentrations based on the size
of the tracerConcentrations_ container. Hence we need to make sure
that its size is zero after the concentrations have been written
and now resize the container to reflect that.

Before this change only the container inside tracerConcentrations_
were moved (and hence made empty) and next tiem we passed empty
containers to the output writing functions (which in parallel
triggered an assertion).
2021-10-14 11:05:33 +02:00
Markus Blatt
e6c8f6985c Remove some shawowed variable warnings. 2021-09-13 12:08:13 +02:00
Joakim Hove
7cb0bb5ae6 Improve error message for invalid phase id 2021-09-01 14:26:56 +02:00
Cintia Goncalves Machado
637a3431fd outputFSIP 2021-08-26 18:33:49 +02:00