Commit Graph

16034 Commits

Author SHA1 Message Date
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
86edaeae77 dont store history of inactive gpmaint rates 2023-05-23 11:02:22 +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
Atgeirr Flø Rasmussen
ce0c75b8b6 Update timeIdx 1 intensive quantities if necessary. 2023-05-22 17:40:27 +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
Kjetil Olsen Lye
0ca3c4f959 Added more detail header files. 2023-05-16 10:06:54 +02:00
Kjetil Olsen Lye
70310160c0 Updated documentation to reflect limitations on int. 2023-05-16 10:01:39 +02:00
Kjetil Olsen Lye
b4aa427bbe Fixed documentation for vector_operations.hpp. 2023-05-16 09:56:21 +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
Kjetil Olsen Lye
bc3cb8c1db Fixed typo in documentation. 2023-05-15 11:32:25 +02:00
Kjetil Olsen Lye
1a6720996a Switched from size_t to std::size_t in safe_conversion.hpp. 2023-05-15 11:23:33 +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
Kjetil Olsen Lye
171a205125 Set gpu_cuda labels for cuistl tests. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
a703e9f7bd Removed exceptions from destructors. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
133a8897a0 Fixed indexing mistake in cuistl/vector_operations 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
046ef6cdc0 Replaced some macro size checks with function calls. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
e32b6ac0a8 Removed use of macro to check equal size. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
42b6a74ce5 Made CuSparseMatrix non-copyable. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
67f94ce8a3 Now handling sparsity pattern copying in a more elegant way. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
e14da5e053 Formatting fixes. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
f006b0b4f5 Removed unused type variable. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
cc8db08e83 Fixed unsafe type conversion. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
3f1cbbe1b8 Used safe conversion in CuVector 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
5fee5cece8 Inlined safe conversion functions. 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
b6a67275c9 Rename to to_int and to_size_t 2023-05-12 08:23:18 +02:00
Kjetil Olsen Lye
5373fb7a9c Added int to size_t conversion. Added some static_asserts. 2023-05-12 08:23:18 +02:00