OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 13:32:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,974 Commits 24 Branches 102 Tags 90 MiB
23c0126095
Commit Graph

15974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
23c0126095
Merge pull request #4640 from steink/ms_pressure_eq_derivatives 
Update of multisegment well pressure equations - testing
 2023-05-26 22:57:23 +02:00
Kai Bao
84cb77a870
Merge pull request #4520 from bska/load-aquflux-rst-info 
Add Support for Initialising Constant Flux Aquifers from Restart
 2023-05-26 22:00:46 +02:00
Bård Skaflestad
f156bc9b7d Enable Restart Tests for Constant Flux Aquifers 
Uses the example models AQUFLUX-01 and AQUFLUX-02 from OPM-Tests.
Both sequential and parallel modes activated for both models.
 2023-05-26 20:21:52 +02:00
Bård Skaflestad
7a77f28b71 Add Support for Initialising Constant Flux Aquifers from Restart 
In particular, form constant flux aquifer objects from the restart
step's collection if available and properly initialise their total
produced volume.
 2023-05-26 20:21:52 +02:00
Bård Skaflestad
3b11aba5f2
Merge pull request #4670 from bska/remove-unused-members 
Don't Provide Deck Accessors in FlowMainEbos
 2023-05-26 19:25:33 +02:00
Bård Skaflestad
3c643dba13 Don't Provide Deck Accessors in FlowMainEbos 
Following commits f4f8c033d and c7016854d (PR #4286), the "vanguard"
no longer maintains an internal Deck data member.  Don't pretend
that it does by providing member functions to access that data
member.  If someone tries to actually call these member functions
then they will get an unfriendly diagnostic message and a build
failure.
 2023-05-26 17:12:30 +02:00
Atgeirr Flø Rasmussen
ed2827235e
Merge pull request #4668 from totto82/remove_ucl 
remove duplicated code
 2023-05-26 15:04:33 +02:00
Tor Harald Sandve
45d0679a19 remove duplicated code 2023-05-26 11:30:50 +02:00
Kai Bao
675ce03e52
Merge pull request #4576 from bska/face-area-fraction 
Calculate Local Face Area Fraction for Aquifer's Connections
 2023-05-25 13:25:51 +02:00
Bård Skaflestad
14a63a4636 Synchronise Face-Area Fractions Between All Processes 
We need a global view of face-area fractions if aquifer connections
happen to be shared between processes.  Add a new helper function,

    BlackoilAquiferModel::computeConnectionAreaFraction()

that performs a collective operation to compute the total face areas
and then defers to the local aquifer objects to compute their face
area fractions.

While here, also split the initialisation of analytic aquifers into
two parts, one for the face area and connection mappings, and one
for the connection depths.  Run the former as part of the object
constructor and the latter as part of 'initQuantities()'.  This
ensures that we can computeConnectionAreaFraction() for all analytic
aquifers before assigning solution quantities from the restart file.
 2023-05-25 09:50:51 +02:00
Bård Skaflestad
5586ce63a0 Calculate Local Face Area Fraction for Aquifer's Connections 
This is in preparation of reinitialising the total produced volume
from the constant flux aquifer from the restart file in the case
that the aquifer's connections are split across multiple MPI ranks.
 2023-05-25 09:50:51 +02:00
Kai Bao
35621058c6
Merge pull request #4654 from totto82/solvent_foam 
Add solvent + foam simulator
 2023-05-24 22:50:20 +02:00
Tor Harald Sandve
8c9220c8e9 add solvent+foam test 2023-05-24 16:03:09 +02:00
Tor Harald Sandve
1592ef8bd2 solvent + foam simulator 2023-05-24 16:03:09 +02:00
Markus Blatt
851e4b5731
Merge pull request #4665 from akva2/avoid_unused_ndebug 
avoid unused variable warning with NDEBUG
 2023-05-24 15:35:10 +02:00
Stein Krogstad
3beef758e4
Merge branch 'OPM:master' into ms_pressure_eq_derivatives 2023-05-24 13:35:11 +02:00
Arne Morten Kvarving
2630522d7f avoid unused variable warning with NDEBUG 2023-05-24 12:39:24 +02:00
Tor Harald Sandve
cf169167d0
Merge pull request #4591 from totto82/fix_rswrvw_well 
Fixes related to rsw/rvw handling in standard well
 2023-05-24 08:27:06 +02:00
Stein Krogstad
5c0b76f337 Revert to original segment density computations 
(keep average version as option)
 2023-05-23 12:44:06 +02:00
Tor Harald Sandve
c4d083890e
Merge pull request #4661 from totto82/addDisgasToThermal 
enable disgasw and vapwat for thermal model
 2023-05-23 08:49:21 +02:00
Tor Harald Sandve
6b9b0e3f0f enable disgasw and vapwat for thermal model 2023-05-22 15:33:58 +02:00
Bård Skaflestad
9c13992e15
Merge pull request #4642 from totto82/outputTrappedHyst 
take into account trapped saturation from hysteresis
 2023-05-19 10:33:37 +02:00
Bård Skaflestad
0d9df0ff47
Merge pull request #4646 from totto82/outputTEMP 
output temperature if TEMP is set in RPTRST or THERMAL is set in RUNSPEC
 2023-05-19 09:49:31 +02:00
Markus Blatt
73d79b4010
Merge pull request #4603 from blattms/mark-nogap-as-supported 
Mark PINCH option 2 NOGAP as fully supported.
 2023-05-17 08:20:11 +02:00
Stein Krogstad
51604e5956 Move hydro p-loss assembly to end of function 2023-05-16 13:26:58 +02:00
Stein Krogstad
a3860e7d0c Updates as requested PR review 2023-05-16 12:58:19 +02:00
Stein Krogstad
0417f101bf Use average density for hydro p-drop 2023-05-16 12:58:19 +02:00
Stein Krogstad
8ee3493aed don't upwind densitiy 2023-05-16 12:58:19 +02:00
Stein Krogstad
e5ac9f9dec Inluding all derivatives for reversed flow 2023-05-16 12:58:19 +02:00
Tor Harald Sandve
f5b44ad26d
Merge pull request #4650 from totto82/addPrecEnergy 
Add energy + precipitation of salt in brine-gas simulator
 2023-05-16 12:17:35 +02:00
Kai Bao
809f6d19ef
Merge pull request #4630 from akva2/unify_mobility 
changed: unify getMobility(Eval|Scalar)
 2023-05-16 00:07:35 +02:00
Arne Morten Kvarving
0406a033a2 introduce getMobility in WellInterface 
we now share implementation between StandardWell and MultisegmentWell
 2023-05-15 21:39:59 +02:00
Arne Morten Kvarving
e406d2f0a1 StandardWell::getMobility: use if constexpr 2023-05-15 21:38:39 +02:00
Arne Morten Kvarving
c0bc0abc73 StandardWell::getMobility: use Scalar relperms when possible 2023-05-15 21:38:39 +02:00
Arne Morten Kvarving
5126097d7b changed: unify MultisegmentWell::getMobility(Eval|Scalar) 2023-05-15 21:38:39 +02:00
Arne Morten Kvarving
35c56e4ce4 changed: unify StandardWell::getMobility(Eval|Scalar) 2023-05-15 21:38:37 +02:00
Kai Bao
6021388045
Merge pull request #4655 from akva2/fix_stdwell_mobilility_scalar 
fixed: copy the mobility values into the temporary Eval vector
 2023-05-15 15:34:29 +02:00
Arne Morten Kvarving
1b073185a1 fixed: copy the mobility values into the temporary Eval vector 2023-05-12 15:13:34 +02:00
Bård Skaflestad
a145cdfcc8
Merge pull request #4651 from akva2/fix_restart_test_directory 
fixed: need a separate directory for each restart test
 2023-05-12 13:24:11 +02:00
Arne Morten Kvarving
effec3544a fixed: need a separate directory for each restart test 
if not parallel execution of tests fail
 2023-05-12 12:12:57 +02:00
Tor Harald Sandve
ee39117771 Add energy + precsalt simulator 2023-05-12 10:49:17 +02:00
Tor Harald Sandve
23e9bf599d Fixes related to rsw/rvw handling in standard well 2023-05-12 09:44:11 +02:00
Tor Harald Sandve
56c6507664
Merge pull request #4623 from totto82/addDisgasw 
Add disgasw to gas water saltprec vapwat simulator
 2023-05-12 09:14:20 +02:00
Atgeirr Flø Rasmussen
dc3316a103
Merge pull request #4648 from GitPaean/not_call_alq_value_for_injectors 
we should not request alq_value for injectors
 2023-05-11 17:15:42 +02:00
Kai Bao
49a327f372 we should not request alq_value for injectors 
through the function { return well_.wellEcl().alq_value(); }.

It will throw a runtime_error which is not properly caught.
 2023-05-11 15:23:25 +02:00
Tor Harald Sandve
c62e6ab5cd output temperature if TEMP is set in RPTRST or THERMAL is set in RUNSPEC 2023-05-11 11:56:02 +02:00
Bård Skaflestad
ca0c650110
Merge pull request #4644 from tskille/wgrupcon 
start regression testing of WGRUPCON tests
 2023-05-10 21:44:07 +02:00
Torbjørn Skille
d5100fac23 start regression testing of WGRUPCON tests 2023-05-10 20:52:50 +02:00
Bård Skaflestad
c24f2b33b0
Merge pull request #4641 from akva2/no_sequential_parallel_tests 
changed: use ctest mechanism for specifying number of processors required
 2023-05-10 15:19:50 +02:00
Tor Harald Sandve
3dad2c909b take into account trapped saturation from hysteresis 2023-05-10 14:05:00 +02:00