Tong Dong Qiu
b4e730a767
Removed default declaration in wrong place
2022-10-27 09:25:55 +02:00
Bård Skaflestad
fd145e2cd7
Merge pull request #4204 from tskille/krnum_cases
...
start regression testing for krnum cases
2022-10-26 14:39:10 +02:00
Markus Blatt
0ab28551e5
Merge pull request #4200 from totto82/2p_expvfp
...
fix 2p case wvfpexp
2022-10-26 12:40:16 +02:00
Bård Skaflestad
edda5f5c8a
Merge pull request #4205 from akva2/janitoring
...
Some janitoring
2022-10-26 11:48:41 +02:00
Arne Morten Kvarving
b9ee7eae6f
use if constexpr
2022-10-26 11:23:55 +02:00
Arne Morten Kvarving
96ec2b0e96
comment out unused private variable (causes a warning)
2022-10-26 10:59:43 +02:00
Torbjørn Skille
f30417af8c
start regression testing for krnum cases
2022-10-26 10:17:53 +02:00
Tor Harald Sandve
72c78c5eb1
fix 2p case wvfpexp
2022-10-24 15:25:30 +02:00
Arne Morten Kvarving
cf6423bfce
Merge pull request #4186 from alfbr/master
...
Split up different tests in include files
2022-10-20 15:23:32 +02:00
Alf Birger Rustad
6546468ff0
Put the if outside includes
2022-10-20 13:50:39 +02:00
Markus Blatt
3e680e41f5
Merge pull request #4136 from Tongdongq/remove_reordering
...
Remove reordering for opencl
2022-10-19 15:30:01 +02:00
Atgeirr Flø Rasmussen
5f058d3e0d
Merge pull request #4187 from atgeirr/fix-damaris-cmake
...
Use MPI_FOUND not MPI_Found.
2022-10-19 15:24:32 +02:00
Atgeirr Flø Rasmussen
a9c1a0998e
Use MPI_FOUND not MPI_Found.
2022-10-19 14:13:39 +02:00
Alf Birger Rustad
18dec593ec
If blocks cannot cross include statements
2022-10-19 13:55:57 +02:00
Alf Birger Rustad
277b013d92
Split up different tests in include files
2022-10-19 13:21:06 +02:00
Arne Morten Kvarving
fc96fe8359
Merge pull request #4179 from atgeirr/bump-version
...
Bump version for master branch.
2022-10-19 09:14:52 +02:00
Atgeirr Flø Rasmussen
870e8db59a
Bump version for master branch.
2022-10-18 17:30:43 +02:00
Atgeirr Flø Rasmussen
776180c081
Merge pull request #4175 from akva2/damaris_fixes
...
fixed: damaris depends on mpi
2022-10-18 15:22:46 +02:00
Atgeirr Flø Rasmussen
97ed033fdf
Merge pull request #4094 from totto82/checkControl
...
Check control
2022-10-18 14:31:31 +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
ac6c7d82f5
fixed: damaris depends on mpi
2022-10-18 13:12:01 +02:00
Tor Harald Sandve
7b90d35f21
fixup from PR comments
2022-10-18 12:58:07 +02:00
Bård Skaflestad
1f2496829d
Merge pull request #4160 from akva2/optimize_tracer_assembly
...
Optimize tracer assembly
2022-10-18 11:41:17 +02:00
Tor Harald Sandve
9538db85b1
set thp msw
2022-10-18 10:55:17 +02:00
Tor Harald Sandve
14428120d9
fix rebase
2022-10-18 10:55:17 +02:00
Tor Harald Sandve
e1d36f32b8
add missing wellGroupTargetsViolated in ++ operator
2022-10-18 10:55:17 +02:00
Tor Harald Sandve
756c9bad21
set ws.thp = thp_limit for wells under THP control
2022-10-18 10:55:17 +02:00
Tor Harald Sandve
47329b30b9
always check individual controls
2022-10-18 10:55:17 +02:00
Tor Harald Sandve
d25dc4e795
check controls in getWellConvergence
2022-10-18 10:55:17 +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
Bård Skaflestad
36ca7d11e9
Merge pull request #4149 from totto82/improve_conv_thp
...
Improve convergence for newly opened wells with thp control
2022-10-18 10:26:55 +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
Atgeirr Flø Rasmussen
a2c5ec1127
Merge pull request #4037 from totto82/scaleEnergy
...
scale energy residual to have the same relative order as the mass balance residuals
2022-10-17 23:33:28 +02:00
Bård Skaflestad
77061d97ca
Merge pull request #4173 from blattms/fix-4157
...
[bugfix] Unconditionally compile WellContributions.cpp et al
2022-10-17 18:09:27 +02:00
Atgeirr Flø Rasmussen
f177b69e84
Merge pull request #4172 from atgeirr/remove-unused-vars
...
Remove unused variables.
2022-10-17 17:39:01 +02:00
Atgeirr Flø Rasmussen
a35f365e3e
Merge pull request #4143 from totto82/simplifyWellReport
...
only output final change of well control
2022-10-17 17:28:53 +02:00
Markus Blatt
fc96ef86c1
[bugfix] Unconditionally compile WellContributions.cpp et al
...
Otherwise we get undefined references. Fixes problems introduced with #4157
2022-10-17 16:51:53 +02:00
Atgeirr Flø Rasmussen
216f77f03f
Remove unused variables.
2022-10-17 16:45:18 +02:00
Tor Harald Sandve
74eb0d048f
Improve convergence for newly opened wells with thp control
2022-10-17 15:32:27 +02:00
Atgeirr Flø Rasmussen
1eec214c89
Merge pull request #4169 from blattms/dune-2.9-fix-deprecations
...
Dune 2.9 fix deprecations
2022-10-17 15:17:29 +02:00
Atgeirr Flø Rasmussen
5a90ced52d
Merge pull request #4054 from totto82/gasliftthplim
...
Allow for gaslift for wells that violate thp limit but are not allowed to switch
2022-10-17 15:15:49 +02:00
Atgeirr Flø Rasmussen
6a13fe807a
Merge pull request #4155 from totto82/fixTestGlift
...
set alq before trying to solve the equation during well testing
2022-10-17 15:08:57 +02:00
Atgeirr Flø Rasmussen
31ac961834
Merge pull request #4157 from blattms/wellcontrib-available-always
...
Fix compilation with amgcl/vexcl and without CUDA/OpenCL.
2022-10-17 15:03:37 +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
