Commit Graph

17676 Commits

Author SHA1 Message Date
Bård Skaflestad
9b1797e7b7
Merge pull request #5353 from akva2/vfp_template_scalar
VFP classes: template Scalar type
2024-05-21 17:52:10 +02:00
Markus Blatt
15001cbf7e
Merge pull request #5330 from bska/run-udq-assign-after-action
Rerun UDQ Assignments After Action Processing
2024-05-21 17:19:54 +02:00
Arne Morten Kvarving
d5d16eaee4 VFPHelpers: move some functions into a class with static members
and template Scalar type
2024-05-21 17:01:30 +02:00
Arne Morten Kvarving
3747981347 VFPProperties: template Scalar type 2024-05-21 17:01:30 +02:00
Arne Morten Kvarving
29d142b5e4 VFPProdProperties: template Scalar type 2024-05-21 17:01:30 +02:00
Arne Morten Kvarving
099322b0f0 VFPInjProperties: template Scalar type 2024-05-21 17:01:30 +02:00
Bård Skaflestad
0aaa69c6e0 Rerun UDQ Assignments After Action Processing
If an action block happens to run a UDQ ASSIGN operation and,
furthermore, happens to run at the last time step of an episode then
the "clear pending assignments" behaviour of the ScheduleState copy
constructor leads to not performing the UDQ assignment at all.  This
commit works around this problem by invoking the action handler's
UDQ assignment function after processing all active action blocks.

The underlying problem has been present since at least Pull Request
OPM/opm-common#3587 which introduced the "clear pending assignments"
behaviour of ScheduleState's copy constructor.
2024-05-21 13:51:06 +02:00
Bård Skaflestad
9731a84cad Adjust Whitespace in FlowProblem File
In particular, be consistent about four-space indent levels and add
braces to a number of single-statement control blocks.  Add a few
blank lines for readability.

While here, also mark a number of objects as 'const'.
2024-05-21 13:51:06 +02:00
Bård Skaflestad
8a4e78e7c4
Merge pull request #5354 from akva2/various_well_helpers_template_scalar
Various well helpers: template Scalar type
2024-05-21 13:14:50 +02:00
Bård Skaflestad
fd4ac412a6
Merge pull request #5366 from lisajulia/feature/pyAction-insert-kw-GCONSUMP
Add pyaction/PYACTION_GCONSUMP_INSERT_KW.DATA to pyactionComparisons.…
2024-05-21 11:56:49 +02:00
Bård Skaflestad
dc4b5d5934
Merge pull request #5364 from lisajulia/feature/pyAction-insert-kw-COMPSEGS-WELSEGS-WSEGVALV
Add pyaction/PYACTION_WSEGVALV_INSERT_KW.DATA to pyactionComparisons…
2024-05-21 11:38:01 +02:00
Bård Skaflestad
c5810d722b
Merge pull request #5363 from akva2/support_dune_fem_2.9
fixed: build with dune-fem 2.9
2024-05-21 11:22:40 +02:00
Bård Skaflestad
2fe957ca6c
Merge pull request #5368 from multitalentloes/fix_typo_cuda_aware_mpi
fix typo that would cause crash cuda aware openmpi
2024-05-21 11:15:00 +02:00
Tobias Meyer Andersen
9d6dcb00a3 fix typo that would cause crash cuda aware openmpi 2024-05-21 10:20:02 +02:00
Lisa Julia Nebel
e803a3ae51 Add pyaction/PYACTION_GCONSUMP_INSERT_KW.DATA to pyactionComparisons.cmake so it is compared with actionx/ACTIONX_GCONSUMP.DATA 2024-05-17 10:49:09 +02:00
Lisa Julia Nebel
cc21b16bb4 Add pyaction/PYACTION_WSEGVALV_INSERT_KW.DATA to pyactionComparisons.cmake so it is compared with actionx/ACTIONX_WSEGVALV.DATA 2024-05-17 09:44:12 +02:00
Arne Morten Kvarving
b74b170d5b fixed: build with dune-fem 2.9 2024-05-16 10:58:08 +02:00
Bård Skaflestad
a05d1358c6
Merge pull request #5362 from akva2/janitoring
fixed: use getCommuncation instead of getCollectiveCommuncation
2024-05-16 09:36:28 +02:00
Bård Skaflestad
fcf9bce03f
Merge pull request #5361 from akva2/fix_dune_fem_restart_serialization_tests
fixed: also run the RestartSerialization tests without dune-fem
2024-05-16 09:35:36 +02:00
Arne Morten Kvarving
ff80e92e9d fixed: also run the RestartSerialization tests without dune-fem
we want both tests when dune-fem is present
2024-05-16 09:14:15 +02:00
Arne Morten Kvarving
2cc2c89b5d fixed: use getCommuncation instead of getCollectiveCommuncation
latter causes a deprecation warning
2024-05-16 09:11:38 +02:00
Tor Harald Sandve
2ea6cea895
Merge pull request #5292 from gdfldm/patch-1
Update GMDS and GMGP definitions in GenericOutputBlackoilModule.cpp
2024-05-15 15:00:10 +02:00
Bård Skaflestad
c6c8c0f237
Merge pull request #5356 from akva2/equil_use_comm_type
InitStateEquil: remove template parameter from Comm

Supersedes and closes #5348
2024-05-15 12:06:38 +02:00
Arne Morten Kvarving
ee1c531431 InitStateEquil: remove template parameter from Comm and use Parallel::Communication directly
in the process this quells a deprecation warning for
Dune::CollectiveCommunication usage
2024-05-15 11:20:29 +02:00
Arne Morten Kvarving
60defa4fd8
Merge pull request #5355 from multitalentloes/famg_warning_fix
Resolve warning delete-abstract-non-virtual-dtor
2024-05-15 11:00:34 +02:00
Tobias Meyer Andersen
73746b56bc Resolve warning delete-abstract-non-virtual-dtor 2024-05-15 10:00:14 +02:00
Arne Morten Kvarving
8e000d08ce WellAssemble: use Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
9c431d1921 WellBhpThpCalculator: template Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
5a340258aa WellConstraints: template Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
720e177aaa WellConvergence: template Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
96c4a2f510 WellHelpers: template computeHydrostaticCorrection Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
ca9baea09d WellTest: template Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
9bbd23acca WellGroupControls: template Scalar type 2024-05-15 08:19:36 +02:00
Arne Morten Kvarving
d25ea9ec26 WellGroupConstraints: template Scalar type 2024-05-15 08:19:36 +02:00
Atgeirr Flø Rasmussen
48eb73fa80
Merge pull request #5350 from totto82/gpmain_reset
Reset gpmain state when rate is zero
2024-05-15 08:12:16 +02:00
Arne Morten Kvarving
f70c7f15f8 ActionHandler: template Scalar type 2024-05-14 16:21:55 +02:00
Atgeirr Flø Rasmussen
ae61361061
Merge pull request #5308 from akva2/wellinterface_template_scalar
WellInterface: template Scalar type
2024-05-14 14:11:45 +02:00
Tor Harald Sandve
c0c301043c Reset gpmain state when rate is zero 2024-05-14 13:14:51 +02:00
Arne Morten Kvarving
3d8e5e5750 WellInterface: use Scalar type 2024-05-14 10:26:58 +02:00
Arne Morten Kvarving
5dfb926643 WellInterfaceIndices: use Scalar type 2024-05-14 10:26:58 +02:00
Arne Morten Kvarving
3067e56182 WellInterfaceFluidSystem: use Scalar type 2024-05-14 10:26:58 +02:00
Arne Morten Kvarving
11b5ba3f18 WellInterfaceGeneric: template Scalar type 2024-05-14 10:26:58 +02:00
Atgeirr Flø Rasmussen
226410cd44
Merge pull request #5303 from akva2/gaslift_template_scalar
GasLift: template Scalar type
2024-05-14 09:59:42 +02:00
Bård Skaflestad
2e7a7a0c44
Merge pull request #5347 from akva2/janitoring_gcc14
add missing include
2024-05-13 21:27:26 +02:00
Arne Morten Kvarving
5d54d36dc4 add missing include
in particular fixes build with gcc14
2024-05-13 15:05:47 +02:00
Bård Skaflestad
0f67799e9c
Merge pull request #5344 from totto82/GMST
Add GMST and modify GMTR output the maximum trapped CO2 in the gas phase
2024-05-13 13:56:49 +02:00
Tor Harald Sandve
b42a8cbcc3 Add output of GMST/GMUS
Rename GMTR to GMMO as ending with TR are used for tracers
[FR]GMTR output maximum trapped CO2 in the gas phase
2024-05-13 11:24:08 +02:00
Bård Skaflestad
5ebee78d23
Merge pull request #5346 from GitPaean/removing_releaseglobaltransmissibility
removing unused releaseGlobalTransmissibility()
2024-05-10 17:30:45 +02:00
Kai Bao
5fda72d24f removing unused releaseGlobalTransmissibility()
from AluGridVanguard and CpGridVanguard.
they exist is becaluse of typo in the function name. There is another
releaseGlobalTransmissibilities() function actually gets used.
2024-05-10 16:45:00 +02:00
Bård Skaflestad
633728b590
Merge pull request #5340 from multitalentloes/cmakeversion_bugfix
Lower CMake version

Resolves #5339.
2024-05-08 16:20:52 +02:00