Commit Graph

1576 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
7311618f13 Improve formatting. 2023-04-25 14:43:20 +02:00
Atgeirr Flø Rasmussen
9ca6034388 Remove EclStrictParsing, replace with ParsingStrictness.
The new parameter takes the "high", "normal" (default), or "low" string.
Also implemented behaviour.
2023-04-25 12:03:13 +02:00
Markus Blatt
20e2058333
Merge pull request #4578 from blattms/support-editnncr
Support EDITNNCR keyword
2023-04-19 11:34:04 +02:00
Markus Blatt
20af10e2c6 Apply EDITNNCR information to tranmissibilities. 2023-04-12 14:24:47 +02:00
Markus Blatt
c693f0f50c Refactor applyEditNncToGridTrans for better reuse with EDINNCR. 2023-04-12 14:24:47 +02:00
Arne Morten Kvarving
f2983ac6af minimum dune version required is now 2.7 2023-04-12 09:41:23 +02:00
Bård Skaflestad
c52ab4ccd5
Merge pull request #4347 from atgeirr/afr_well_assemble_separate
Implement functionality to add well source terms to the residual separately
2023-03-31 11:10:01 +02:00
Bård Skaflestad
500a20aaf7
Merge pull request #4570 from hnil/protected_update
-- changed function to protected
2023-03-30 13:44:17 +02:00
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
dc3454f56e
Merge pull request #4562 from totto82/thermalbc
add THERMAL boundary conditions which keeps constant temperature on the boundary
2023-03-30 10:29:48 +02:00
hnil
aeb11beda0 -- changed function to protected 2023-03-29 14:05:20 +02:00
Markus Blatt
ad160d3799
Merge pull request #4569 from hnil/correct_spelling
-- corrected spelling
2023-03-29 14:00:26 +02:00
hnil
389d011385 -- corrected spelling 2023-03-29 12:24:17 +02:00
Tor Harald Sandve
75bfe52611 add THERMAL boundary conditions which keeps constant temperature on the boundary 2023-03-28 12:06:13 +02:00
Tor Harald Sandve
0cfb40d660 compute rock fraction 2023-03-28 08:38:14 +02:00
Bård Skaflestad
599742feab Remove Unused Variables
While here, also include requisite headers.
2023-03-27 10:46:05 +02:00
Bård Skaflestad
8858d725a8
Merge pull request #4551 from totto82/outputGIPL
output gas in water to F(R)GIPL for gas-water systems
2023-03-27 09:58:45 +02:00
Bård Skaflestad
bc44d1f3f0
Merge pull request #4552 from hnil/avoid_depensesy_of_cache
Avoid cache
2023-03-27 09:57:33 +02:00
Tor Harald Sandve
113041c275 output gas in water to F(R)GIPL 2023-03-27 08:11:40 +02:00
hnil
aa40d2f0f3 -- prepared for possibliy of not using cached intentensive quantities 2023-03-24 19:57:31 +01: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
1f8fb5d664 simplify: use std::is_same_v<> 2023-03-24 14:56:49 +01:00
Arne Morten Kvarving
163be007e5 add missing includes 2023-03-24 14:56:39 +01:00
Arne Morten Kvarving
5f28175603 fix whitespace at eol
and some brace placements
2023-03-24 14:56:23 +01:00
Bård Skaflestad
3ea6f714db
Merge pull request #4544 from hnil/faster_beginstep
faster begintimestep
2023-03-24 13:52:25 +01:00
hnil
398077d772 removed unused variable 2023-03-24 13:11:18 +01:00
Bård Skaflestad
d4d46e046b
Merge pull request #4545 from hnil/faster_fip
Faster fip calculation
2023-03-24 13:08:31 +01:00
Bård Skaflestad
d0f8d879df
Merge pull request #4540 from totto82/fpr_co2store
output average pressure in all cells unconditionally with co2store
2023-03-24 13:06:13 +01:00
Tor Harald Sandve
e14f8637f1 output average pressure in all cells unconditionaly for for the co2store option 2023-03-24 12:09:50 +01:00
hnil
7e63dc3096 fixed issue with use of cachedVariables in initialization fase 2023-03-23 22:37:44 +01:00
hnil
bacb4e04d6 fixed for review 2023-03-23 21:26:06 +01:00
hnil
a81f80f4fb fixed error 2023-03-23 13:53:14 +01:00
hnil
9450fc0596 -- removed element context from the update fib loop
-- separated out put in different functions
2023-03-23 13:44:46 +01:00
hnil
8250a815cc - faster updateProperty
- refactored for making local updating in inhereted classes
2023-03-23 10:12:02 +01:00
Bård Skaflestad
0ebcef62e2
Merge pull request #4542 from hnil/optimize_processdata
Optimisation of data processing for actionX and output
2023-03-22 23:13:43 +01:00
hnil
dedda84a2b fixed review comments 2023-03-22 19:17:22 +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
hnil
122a478341 added more timing macros 2023-03-21 22:44:14 +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
af30df5dff
Merge pull request #4532 from hnil/refactor_initiations
Refactoring to be able to use template class/methods even if they are…
2023-03-17 13:45:48 +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
Bård Skaflestad
7113159163
Merge pull request #4535 from totto82/fix_co2_output
convert co2 output from volumes to moles
2023-03-16 14:37:06 +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