OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
16,385 Commits 24 Branches 102 Tags 90 MiB
b84837fc61
Commit Graph

1666 Commits

Author SHA1 Message Date
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
hnil
3e1fe57e60 Refactoring to be able to use template class/methods even if they are not initiated 2023-03-15 16:46:42 +01:00
Bård Skaflestad
601301355a Switch to Using Constructor Syntax for CellData 
This is in preparation of adding actual constructors to the type.
 2023-03-15 11:33:13 +01:00
hnil
e705dc41c2 modification to to well assembly form well side to avoid asking for wells on all cells 2023-03-08 16:41:36 +01:00
Atgeirr Flø Rasmussen
5979e34b9d Add explicit instantiation of cellZMinMax(). 
Otherwise one may have link problems on clang systems, the
reason for this is not quite clear.
 2023-03-08 11:21:21 +01:00
Arne Morten Kvarving
11bda0de07 added: log ThresholdPressures to PRT file 2023-03-03 10:15:38 +01:00
Atgeirr Flø Rasmussen
e2ce26c031
Merge pull request #4503 from akva2/fix_thpr_parallel 
fixed: output of thresholdpressure to restart file in parallel
 2023-03-02 15:47:01 +01:00
Arne Morten Kvarving
153c4f486a fixed: output of thresholdpressure to restart file in parallel 2023-03-02 13:08:37 +01:00
Bård Skaflestad
468494e801
Merge pull request #4501 from hnil/fixes_ebosinterface 
- small change to corret ebos use of the original interfaces
 2023-03-02 10:38:06 +01:00
hnil
e2df9fa4f9 - fixed wrong timing block 2023-03-02 09:20:07 +01:00
Arne Morten Kvarving
aaaf00f2fd adjust to timing macro header split 2023-03-01 13:18:16 +01:00
hnil
5fb41ad231 - small change to corret ebos use of the original interfaces 2023-02-28 21:59:04 +01:00
Atgeirr Flø Rasmussen
b5678bf5cb
Merge pull request #4495 from atgeirr/add_timing_block 
Add timing block
 2023-02-28 15:00:17 +01:00
Arne Morten Kvarving
a237b2222f fixed: serialize the initial fip values 2023-02-27 13:57:05 +01:00
Bård Skaflestad
cb96be1634
Merge pull request #4477 from totto82/summary_co2store 
WIP add WCD, GCDI, GCDM, WIPG, WIPL summary for F and R
 2023-02-24 22:28:47 +01:00
Arne Morten Kvarving
6e9255ce19 EclProblem: serialize material parameters 
needed for hysteresis variables
 2023-02-24 09:59:37 +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
Arne Morten Kvarving
8c3400f562 added: parallel support to HDF5File / HDF5Serializer 2023-02-16 14:49:38 +01:00
Arne Morten Kvarving
ed170026c1 added: support for saving serialized state to OPMRST file 
uses a HDF5 container
 2023-02-16 13:46:36 +01:00
Arne Morten Kvarving
e665f17269 EclProblem: add serialization support 
no test for this, it's too involved to set one up for
very little extra coverage
 2023-02-16 11:23:53 +01:00
hnil
2037e862b4 More timings 2023-02-15 11:05:45 +01:00
hnil
fd98d8ea27 added timing blocks to most important parts 2023-02-15 09:41:37 +01:00
Arne Morten Kvarving
87c242a468 EclTracerModel: add serialization of dynamic state 2023-02-14 19:15:14 +01:00
Arne Morten Kvarving
24798e68d5 EclGenericTracerModel: add serialization of dynamic state 2023-02-14 19:09:26 +01:00
Arne Morten Kvarving
1bec857445 EclGenericProblem: add serialization support 2023-02-14 15:36:24 +01:00
Atgeirr Flø Rasmussen
ecfd928699
Merge pull request #4432 from akva2/add_hdf5serializer 
added: HDF5 serializer
 2023-02-14 14:25:45 +01:00
Arne Morten Kvarving
a825a060c3 EclGenericVanguard: add serialization support 2023-02-14 13:48:09 +01:00
Arne Morten Kvarving
4b07f6d010 added: HDF5Serializer 
this takes the serialization data and stores it in a hdf5 file,
alternatively reads the data and deserializes.

will be used for restarting purposes
 2023-02-14 13:15:43 +01:00
Arne Morten Kvarving
c33240f5c1 changed: introduce EclGenericVanguard::SimulationModelParams 
this is a struct that holds the information transferred
from the simulator prior to vanguard instantation.
this way we can avoid the static members for state,
which causes issues for serialization (in particular, it makes
it impossible to compare two instances like we do in tests).
 2023-02-13 18:52:38 +01:00
Arne Morten Kvarving
05f92a1133 EclGenericVanguard: rename setParams to defineSimulationModel 
setParams is a rather generic method name, be more specific
 2023-02-13 17:49:59 +01:00
Arne Morten Kvarving
9bbce08bfa EclGenericTracerModel: remove unused tracerResidual_ member 2023-02-09 10:00:23 +01:00
David Landa Marban
b3a5a659f4 Fix to the flores indices 2023-02-07 13:33:44 +01:00
David Landa Marban
5600d7d9e5 FLOWS and FLORES support 2023-02-02 11:19:49 +01:00
Tor Harald Sandve
87a357f77e
Merge pull request #4384 from hakonhagland/imbnum3 
Adds support for directional relative permeabilities with hysteresis
 2023-01-30 12:33:55 +01:00
Arne Morten Kvarving
bb70774902 add missing includes 
and remove some unneeded ones
 2023-01-19 15:16:33 +01:00
Arne Morten Kvarving
c5cfb19ace eclgenericwriter.cc: add missing PAvgCalculatorCollection.hpp include 2023-01-19 13:27:46 +01:00
Arne Morten Kvarving
0a081adb54 ecloutputblackoilmodule.hh: remove unnecessary SummaryConfig.hpp include 2023-01-18 14:59:58 +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
Bård Skaflestad
da4e2deb6a
Merge pull request #4397 from akva2/summarystate_hpp_include 
SummaryState.hpp: add missing and forward where possible
 2023-01-18 14:58:47 +01:00
Arne Morten Kvarving
b29edb67d5 eclgenericoutputblackoilmodule.hh: forward SummaryState 2023-01-18 13:39:17 +01:00
Arne Morten Kvarving
6d97ca97a1 add missing Well.hpp includes 2023-01-18 11:24:25 +01:00
Bård Skaflestad
8dcab4b236
Merge pull request #4392 from akva2/well_hpp_include 
eclgenerictracermodel.cc: add missing Well.hpp include
 2023-01-17 17:08:56 +01:00
Arne Morten Kvarving
36dd657d4f eclgenerictracermodel.cc: add missing Well.hpp include 2023-01-17 16:03:39 +01:00
Arne Morten Kvarving
240c039f53 readDeck: make the ErrorGuard an internal detail 2023-01-17 13:30:39 +01:00
Arne Morten Kvarving
56df430bd6 readDeck: make the ParseContext an internal detail 2023-01-17 09:36:31 +01:00
Arne Morten Kvarving
fd94ca7031 add missing InputErrorAction.hpp includes 2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
3a01e89585 adjust to InputErrorAction change to enum class 2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
da73c6da71 add missing RestartValue.hpp include 2023-01-16 13:51:20 +01:00
Arne Morten Kvarving
3745a4c02d clean up Units.hpp includes 
include it where required instead of relying on other
headers to pull it in
 2023-01-16 12:21:29 +01:00
Arne Morten Kvarving
bf7db7c109 ecloutputblackoilmodule.hh: remove unnecessary Units.hpp include 2023-01-16 12:12:04 +01:00
Bård Skaflestad
2691e6328f
Merge pull request #4372 from totto82/fix_gp 
output gas pressure for gas-water case
 2023-01-16 11:11:39 +01:00
Arne Morten Kvarving
343c7b7e57 add missing Units.hpp includes 2023-01-16 10:17:59 +01:00
Håkon Hægland
536ec73950 Add support for IMBNUMX, IMBNUMY, IMBNUMZ 2023-01-16 09:25:16 +01:00
Tor Harald Sandve
ec2983df43 come code cleaning in ecloutputblackoilmodule 2023-01-16 08:53:57 +01:00
Arne Morten Kvarving
188d19fcf0 EclTracerModel: move code using WellTracerProperties to compile unit 2023-01-13 12:03:46 +01:00
Arne Morten Kvarving
325963fb63 add missing WellTracerProperties.hpp includes 2023-01-13 12:03:46 +01:00
Tor Harald Sandve
0a1210a392 output gas pressure for gas-water case 2023-01-13 10:47:23 +01:00
Tor Harald Sandve
8d37ded703 Suppot EQUIL + WATER + GAS 2023-01-13 10:16:48 +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
Arne Morten Kvarving
30c5069519 add missing UDQConfig.hpp includes 2023-01-12 09:39:36 +01:00
Arne Morten Kvarving
88ece0fdd8 add missing Actions.hpp includes 2023-01-11 13:52:11 +01:00
Arne Morten Kvarving
b320716b17 move UDQ evaluation to EclActionHandler 
thus we can avoid include of WellMatcher.hpp in eclproblem.hh
 2023-01-10 11:31:56 +01:00
Arne Morten Kvarving
a920699e1a add missing WellMatcher.hpp includes 2023-01-10 11:14:38 +01:00
Arne Morten Kvarving
369c76d400 add missing SimulatorUpdate.hpp include 2023-01-10 10:07:35 +01:00
Atgeirr Flø Rasmussen
967378c1d6
Merge pull request #4348 from akva2/small_eclproblem_improvements 
Small eclproblem improvements
 2023-01-06 09:06:24 +01:00
Bård Skaflestad
0c07e27d26
Merge pull request #4350 from akva2/pinchmode_enum_class 
adjust to PinchMode now being an enum class
 2023-01-05 16:44:28 +01:00
Arne Morten Kvarving
e3a4c70da9 adjust to PinchMode now being an enum class 2023-01-05 14:26:17 +01:00
Arne Morten Kvarving
fe09a6cdce replace <Runspec.hpp> with <Phase.hpp> where appropriate 2023-01-05 13:18:32 +01:00
Arne Morten Kvarving
384fff8c46 fix indent 2023-01-05 11:23:54 +01:00
Arne Morten Kvarving
55db8e863a eclproblem: use make_unique 2023-01-05 11:23:46 +01:00
Arne Morten Kvarving
24ac5801a9 eclproblem: move core of handlePositionalParameter 
make it a typetag independent helper function in generic problem source
 2023-01-05 11:12:29 +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
Markus Blatt
f6ae49fec4 Honor MULTZ- when determining TRANSZ over pinched cells (pinch all). 
Previously, a barrier between cells in Z-direction was only honored if
it was done using MULTZ. We disregarded MULTZ- completely when
calculating the TRANZ over pinched cells.

Now we also take into account MULTZ-.
 2022-12-14 15:00:41 +01:00
Arne Morten Kvarving
f17a90170d use exception classes from opm-common 2022-12-13 12:56:13 +01:00
Atgeirr Flø Rasmussen
18f6f5e4e3 Push index map to Damaris for output ordering. 2022-12-07 13:05:44 +01:00
Tor Harald Sandve
bdb82c2f3d Rename PrimaryVarsMeaning{Water/Gas/Pressure/Brine} to {Water/Gas/Pressure/Brine}Meaning 2022-11-25 13:03:26 +01:00
Arne Morten Kvarving
c7016854d9 changed: make the deck an implementation detail in Opm::readDeck 2022-11-24 13:00:38 +01:00
Arne Morten Kvarving
f4f8c033d8 EclGenericVanguard: remove deck member 2022-11-24 12:10:52 +01:00
Bård Skaflestad
aabf00a3ad
Merge pull request #4285 from akva2/use_internalized_thpresft 
Use internalized THPRESFT
 2022-11-24 12:07:19 +01:00
Arne Morten Kvarving
d294bbabac EclGenericThresholdPressure: remove deck member 2022-11-23 12:54:40 +01:00
Arne Morten Kvarving
b325fe65aa make THPRESFT support non-experimental 2022-11-23 12:54:40 +01:00
Arne Morten Kvarving
a7c0661669 changed: use internalized THPRESFT keyword 2022-11-23 12:54:40 +01:00
Arne Morten Kvarving
473598c791 changed: remove EclProblem::checkDeckCompatibility 
these checks are disabled and do not add anything new,
as the checks of value here are also performed elsewhere
 2022-11-23 10:58:33 +01:00
Arne Morten Kvarving
d7c468575b disable flow_alugrid in buildsystem if dune-alugrid was not found 2022-11-15 13:52:02 +01:00
Arne Morten Kvarving
d15c2607f5 fixed: eclalugridvanguard did not build in serial 
while the comm object is implicitly castable to a mpi_comm
with mpi, it is not implicitly castable to a no_comm
without.
 2022-11-15 11:25:54 +01:00
Arne Morten Kvarving
f7de591682 EclOutputBlackoilModule: explicitly cast to int to avoid narrowing warning 2022-11-14 15:40:57 +01:00
Arne Morten Kvarving
4bbb9656b0 EclProblem: use of alugrid is known at compile time 
use the proper define, no need for type gymnastics
 2022-11-14 15:10:59 +01:00
Arne Morten Kvarving
73b6c9fdf8 EclTransmissibility: no need to include alugrid in header 2022-11-14 15:07:34 +01:00
Arne Morten Kvarving
e50aec63d8 EclGenericWriter: no need to include alugrid in header 2022-11-14 15:06:27 +01:00
Markus Blatt
81b296a682
Merge pull request #4182 from totto82/bc_dirichlet 
implement dirichlet boundary conditions
 2022-11-11 22:23:14 +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
Tor Harald Sandve
2af2df3a92 implement dirichlet boundary conditions 2022-11-04 12:12:08 +01:00
Markus Blatt
060dfde864 Fixed typo: acess -> access 2022-11-01 21:45:47 +01:00
Atgeirr Flø Rasmussen
142921e3d5 Ensure linearizer is updated after transmissibility changes. 2022-10-27 09:54:40 +02:00
Bård Skaflestad
9378991243
Merge pull request #4171 from akva2/bcdata_members 
Make related BC data a single class member
 2022-10-18 13:56:45 +02:00
Arne Morten Kvarving
83b7aec1f1 changed: do all assembleTracerEquations_() in one call 
by looping over the tracer batches. this trades memory
for runtime efficiency as we cannot reuse one matrix
but rather need to have one matrix for each phase
 2022-10-18 10:54:57 +02:00
Arne Morten Kvarving
2b2b0b085c changed: avoid updating the whole element context for ghost cells 
a small but obvious optimization
 2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
70a4cdc66b changed: put well assembly for tracer in separate function 2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
cb9d6566d5 changed: put flux assembly for tracer in separate function 2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
b9c397e1ba changed: put volume assembly for tracer in separate function 2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
2c06152086 changed: do all advanceTracerFields in one call 
by looping over the tracer batches
 2022-10-18 08:43:40 +02:00
Arne Morten Kvarving
586b88d3ad changed: use BCData struct for freebc 2022-10-17 15:01:27 +02:00
Arne Morten Kvarving
95ab3427e2 initialize nonTrivialBoundaryConditions inline 
this way you don't have to read the code to find the
default value
 2022-10-17 15:01:27 +02:00
Arne Morten Kvarving
d2a720e40c changed: use a struct for holding BC data 
keeps related data as a single class member.
use this for massratebc_
 2022-10-17 15:01:27 +02:00
Atgeirr Flø Rasmussen
69f2ede363
Merge pull request #4165 from atgeirr/avoid-useless-call 
Do not call assignToSolution() and throw away the result.
 2022-10-14 10:31:26 +02:00
Arne Morten Kvarving
a884e3c1d6 ecltracermodel: use elements range generator 2022-10-13 23:01:35 +02:00
Arne Morten Kvarving
7f21bc55b0 eclthresholdpressure: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
3599e0e5de eclproblem: use elements range generator 2022-10-13 23:00:57 +02:00