Commit Graph

14935 Commits

Author SHA1 Message Date
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
Markus Blatt
f49739cb52
Merge pull request #4168 from bska/expand-bitset-serialization
Add Serialization Support for std::bitset<3>
2022-10-17 12:04:11 +02:00
Markus Blatt
8d522a2c42 Get rid deprecation warning for newer DUNE versions. 2022-10-14 21:29:09 +02:00
Bård Skaflestad
629edd3919 Add Serialization Support for std::bitset<3>
Needed in upcoming work for communicating dynamic phase quantities
per segment in a multisegmented well.
2022-10-14 18:29:52 +02:00
Bård Skaflestad
8162b97c0e
Merge pull request #4167 from atgeirr/hide-all-vtk-params
Hide all vtk parameters.
2022-10-14 11:30:29 +02:00
Atgeirr Flø Rasmussen
c6b3e4c462 Hide all vtk parameters. 2022-10-14 10:46:45 +02:00
Atgeirr Flø Rasmussen
69f2ede363
Merge pull request #4165 from atgeirr/avoid-useless-call
Do not call assignToSolution() and throw away the result.
2022-10-14 10:31:26 +02:00
Tong Dong Qiu
d06b02f88f Add test with Jacobi matrix for openclSolver 2022-10-14 09:33:55 +02:00
Bård Skaflestad
7096343121
Merge pull request #4162 from akva2/use_range_generators
Use range generators for grid iterations
2022-10-13 23:42:10 +02:00
Bård Skaflestad
dd61e79e86
Merge pull request #4166 from GitPaean/removing_GTotal
removing the usage of GTotal in the well code
2022-10-13 23:01:43 +02:00
Arne Morten Kvarving
ff826aa939 RegionAverageCalculator: use elements range generator 2022-10-13 23:01:37 +02:00
Arne Morten Kvarving
5796396696 RateConverter: use elements range generator 2022-10-13 23:01:37 +02:00