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
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
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
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
Tobias Meyer Andersen
60359268fd
Add cmake message if not hipifying due to version
2024-05-08 14:28:44 +02:00
Tobias Meyer Andersen
69a45b632e
lower cmake version, keep it for HIP
2024-05-08 14:09:26 +02:00
Bård Skaflestad
a417968464
Merge pull request #5333 from GitPaean/remove_unused_updateImbnum_
...
removing unused updateImbnum_ function
2024-05-08 10:59:41 +02:00
Atgeirr Flø Rasmussen
40b3cc049c
Merge pull request #5337 from bska/relaxed-not-tighter-than-strict
...
Enforce Relaxed Tolerances Not Stricter Than Strict
2024-05-08 10:23:04 +02:00
Kai Bao
b225ec240f
removing updateKrnum_
...
which does not have effects, which was suggested by Håkon Hægland.
And also removing the following member variables from
FlowGenericProblem because they are not in use anymore.
krnumx_, krnumy_, krnumz_;
imbnumx_, imbnumy_, imbnumz_;
2024-05-08 09:41:46 +02:00
Kai Bao
79236c4927
removing unused updateImbnum_ function
2024-05-08 09:33:00 +02:00
Bård Skaflestad
cc28bbe989
Enforce Relaxed Tolerances Not Stricter Than Strict
...
Relaxed tolerances being more strict than the strict tolerances does
not make sense in our use case.
2024-05-07 15:03:18 +02:00
Arne Morten Kvarving
66131bd350
Merge pull request #5253 from multitalentloes/script_test
...
Add HIP support
2024-05-07 08:02:53 +02:00
Bård Skaflestad
47672ae81f
Merge pull request #5335 from vkip/rptrst_basic0_allowed
...
Tag 'BASIC=0' as allowed in RPTRST
2024-05-06 16:32:13 +02:00
Tobias Meyer Andersen
e9d6b326cc
Add HIP support for AMD GPUs
...
This commits adds cmake functionality that can
hipify the cuistl framework to support AMD GPUs.
Some tests have been written as HIP does not mirror
CUDA exactly.
CONVERT_CUDA_TO_HIP is the new CMAKE argument.
CMAKE version is increased to include HIP
as a language (3.21 required).
A macro is added to create a layer of indirection
that will make only cuistl files that have been
changed rehipified.
Some BDA stuff is extracted to make sure CUDA
is not accidentally included.
2024-05-06 15:56:53 +02:00
Vegard Kippe
b27c83b2fd
Tag 'BASIC=0' as allowed in RPTRST
2024-05-06 15:17:08 +02:00
Atgeirr Flø Rasmussen
ae7307d2c3
Merge pull request #5302 from bska/more-infostep-cnv
...
Report CNV Violation Pore-Volume Fraction to INFOITER
2024-05-06 14:13:21 +02:00
Bård Skaflestad
027eed16e9
Report CNV Violation Pore-Volume Fraction to INFOITER
...
This commit includes the fraction of pore-volume whose CNV targets
are violated as a new per-iteration quantity in the INFOITER file
(--output-extra-convergence-info=iteration), with the column header
"CnvErrPvFrac". We collect the values which are already calculated
in
BlackoilModel<>::getReservoirConvergence()
and store these as a pair of numerator and denominator in the
ConvergenceReport class. Note that we need both the numerator and
the denominator in order to aggregate contributions from multiple
ranks.
While here, also make a few more objects 'const' and calculate
column widths directly instead of the maximum number of characters
in writeConvergenceHeader().
2024-05-06 11:31:47 +02:00
Bård Skaflestad
f01635dcf2
Merge pull request #5331 from totto82/fix_restart_co2
...
Bugfix: initialize the input temperature in restart run without temperature in the restart file
2024-05-06 11:19:18 +02:00
Bård Skaflestad
26c59ce5cb
Merge pull request #5329 from vkip/input_skip_mode
...
Add parameter InputSkipMode to parameterise SKIP100 and SKIP300
2024-05-06 10:56:38 +02:00
Tor Harald Sandve
c6c447dc94
initialize the input temperature in restart run without temperature in the restart file
2024-05-06 10:21:42 +02:00
Bård Skaflestad
66aacb5042
Merge pull request #5307 from bska/cnv-error-accum-interior
...
Accumulate CNV Pore-Volume Sum for Interior Cells Only
2024-05-03 17:49:25 +02:00
Bård Skaflestad
1e9943bfe6
Accumulate CNV Pore-Volume Sum for Interior Cells Only
...
The 'interiorBorder' category is *probably* equivalent to the
'interior' category for codimension zero elements, but it's better
to be safe than sorry. We don't want to accumulate pore-volume
contributions twice.
2024-05-03 14:19:00 +02:00
Arne Morten Kvarving
0cafaf92cb
Merge pull request #5332 from multitalentloes/remove_thrust_dependency
...
remove usage of thrust
2024-05-03 14:14:14 +02:00
Tobias Meyer Andersen
d5c088bb20
remove unused headers
2024-05-03 13:45:24 +02:00
Tobias Meyer Andersen
d795561100
remove usage of thrust
2024-05-03 12:52:27 +02:00
Bård Skaflestad
226e90f8e1
Merge pull request #5324 from daavid00/fixMass
...
Bug fix massGas in place
2024-05-03 09:41:14 +02:00
Vegard Kippe
b68a55a9b9
Add parameter InputSkipMode to parameterise the behvaviour of the SKIP100 and SKIP300 keywords
2024-05-03 09:28:14 +02:00
Atgeirr Flø Rasmussen
f0855f4f48
Merge pull request #5293 from totto82/fixInitGW
...
Fix gas-water initialization with transision zone
2024-05-02 15:57:13 +02:00
Bård Skaflestad
a9d7457ca3
Merge pull request #5326 from akva2/fix_bda_disable
...
fixed: properly avoid inclusion of BDA types if BDA is disabled
2024-05-02 13:07:19 +02:00