Commit Graph

17749 Commits

Author SHA1 Message Date
Bård Skaflestad
a3a2b7a978 Make SummaryState Objects Aware of Undefined UDQ Value
This PR switches to calling the SummaryState constructor which is
aware of the value of undefined UDQs (OPM/opm-common#4052) directly.

While here, also sort headers, split some long lines, and prefer
initialisation lists to constructor body assignments.
2024-05-29 09:16:56 +02:00
Bård Skaflestad
091f758b5a
Merge pull request #5379 from bska/delay-udq-asgn-until-after-smry-output
Delay UDQ Assignments Until After Summary Output
2024-05-29 09:13:30 +02:00
Bård Skaflestad
6e8da2309b Delay UDQ Assignments Until After Summary Output
Commit 0aaa69c6e (PR #5330) was a little too eager in its effort to
handle UDQ ASSIGN operations after action processing[%].  In
particular, the assignments, which alter the internal structures of
the SummaryState and UDQState objects, would happen prior to writing
summary files.  In turn, this would make it appear as if the
assignment happened too early.  This commit defers UDQ assignments
triggered by action processing until FlowProblem<>::endEpisode() for
two reasons

  1. The problem originally addressed in 0aaa69c6e only presented
     when the assignment was triggered on the final time step of an
     episode (report step), so handling this situation here is a
     more targeted approach.

  2. Member function FlowProblem<>::endEpisode() is called after we
     write the summary file output so any alterations to the
     internal structures of the SummaryState will not be visible in
     the summary output until the next time step.  This is the
     expected behaviour.

[%] Insufficient testing by: [at]bska.
2024-05-28 18:16:30 +02:00
Bård Skaflestad
03e8c7ecdc
Merge pull request #5394 from atgeirr/avoid-memory-leak
Avoid memory leak from the *unique_ptr<X>.release() antipattern.
2024-05-28 18:15:01 +02:00
Bård Skaflestad
947033705d
Merge pull request #5391 from GitPaean/using_USE_DAMARIS_LIB
only trying to link darmaris when requested
2024-05-28 17:09:22 +02:00
Atgeirr Flø Rasmussen
6a7e1e08c0 Avoid memory leak from the *unique_ptr<X>.release() antipattern. 2024-05-28 16:49:08 +02:00
Bård Skaflestad
a16ef8b1c2
Merge pull request #5393 from atgeirr/avoid-out-of-scope-temporary
Bugfix: Avoid possible use of out-of-scope temporary.
2024-05-28 16:31:30 +02:00
Kai Bao
481c4830b5 only trying to link darmaris when requested 2024-05-28 16:16:19 +02:00
Atgeirr Flø Rasmussen
0fe76f6011 Bugfix: Avoid possible use of out-of-scope temporary.
Since std::clamp returns a reference we must be careful to not capture
the return value by reference, when there is a temporary among the input
parameters.

For the second change (adding the explicit Scalar return type to a lambda)
this is strictly speaking not necessary, as the lambda's return type is not
a reference, but that is obscure so the change is just done as to clarify.
2024-05-28 16:01:48 +02:00
Bård Skaflestad
8199342ce9
Merge pull request #5232 from steink/check_zero_target_from_group
When checking for zero target rates, also check wells under group control where required
2024-05-27 22:09:26 +02:00
Bård Skaflestad
c7c72f0ddb
Merge pull request #5389 from GitPaean/stablize_PYACTION_WCONPROD
limiting max time step to 10 days for PYACTION_WCONPROD
2024-05-27 17:01:10 +02:00
Kai Bao
0f9633b198 limiting max time step to 10 days for PYACTION_WCONPROD
to make the regression checking more stable.
2024-05-27 14:19:04 +02:00
Bård Skaflestad
2bb47476cb
Merge pull request #5365 from lisajulia/feature/pyAction-insert-kw-WECON-WTEST
Add pyaction/PYACTION_WTEST_INSERT_KW.DATA to pyactionComparisons.cma…
2024-05-27 10:45:15 +02:00
Bård Skaflestad
7175a74879
Merge pull request #5345 from lisajulia/feature/pyAction-insert-kw-GRUPTREE-WGRUPCON-WELSPECS
Add pyaction/PYACTION_GRUPTREE_INSERT_KW.DATA to pyactionComparisons.…
2024-05-27 10:44:37 +02:00
Lisa Julia Nebel
969ec035ec Add pyaction/PYACTION_GRUPTREE_INSERT_KW.DATA to pyactionComparisons.cmake so it is compared with actionx/ACTIONX_GRUPTREE.DATA 2024-05-27 09:38:38 +02:00
Lisa Julia Nebel
a316264dba Add pyaction/PYACTION_WTEST_INSERT_KW.DATA to pyactionComparisons.cmake so it is compared with actionx/ACTIONX_WTEST.DATA 2024-05-27 09:36:31 +02:00
Bård Skaflestad
6f094c558a
Merge pull request #5256 from BigDataAccelerate/overlap_copy_jacmat_gpu
Overlap creation of jacobian matrix with GPU data transfers
2024-05-24 13:11:27 +02:00
Stein Krogstad
427351cc12 Include checking for zero targets from groups where required 2024-05-23 14:55:37 +02:00
Stein Krogstad
2db90a92e7 include group controls for zero rate target checking 2024-05-23 14:44:26 +02:00
Bård Skaflestad
c84f14042d
Merge pull request #5378 from akva2/fix_amgcl_bs1
amgclSolverBackend: fix for block_size == 1
2024-05-23 14:13:16 +02:00
Arne Morten Kvarving
60e91a0fb5 amgclSolverBackend: fix for block_size == 1 2024-05-23 13:41:26 +02:00
Bård Skaflestad
9841c5d21c
Merge pull request #5377 from akva2/equil_template_scalar
InitStateEquil: template Scalar type
2024-05-23 10:48:04 +02:00
Bård Skaflestad
8edcc6a060
Merge pull request #5376 from akva2/various_template_scalar
Various classes: use Scalar type
2024-05-23 09:48:33 +02:00
Arne Morten Kvarving
4bef925974 InitStateEquil: use Scalar type from FluidSystem 2024-05-23 09:39:49 +02:00
Arne Morten Kvarving
4cfb7a8566 EquilibrationHelpers: template Scalar type 2024-05-23 09:38:27 +02:00
Arne Morten Kvarving
5ed5676f32 WellGroupHelpers: use appropriate Scalar type 2024-05-23 09:08:48 +02:00
Arne Morten Kvarving
db2db4bab5 WellFilterCake: use appropriate Scalar type 2024-05-23 09:06:16 +02:00
Arne Morten Kvarving
ca6b73a6f8 VFPProdProperties: use appropriate Scalar type 2024-05-23 09:03:48 +02:00
Arne Morten Kvarving
769489f552 VFPHelpers: use appropriate Scalar type 2024-05-23 09:01:14 +02:00
Arne Morten Kvarving
e9050359db BlackoilWellModel: use appropriate Scalar type 2024-05-23 08:52:59 +02:00
Arne Morten Kvarving
600e7ea2f7 Transmissibility: consistently use Scalar type 2024-05-23 08:42:51 +02:00
Arne Morten Kvarving
27ca3ab5f7 OutputBlackoilModule: consistently use Scalar type 2024-05-23 08:34:09 +02:00
Arne Morten Kvarving
39554ab7dd NonLinearSolver: use Scalar type 2024-05-23 08:25:37 +02:00
Arne Morten Kvarving
cdf227bcbd BlackoilModelParameters: consistently use Scalar
parameters are registered as Scalar not double
2024-05-23 08:17:45 +02:00
Arne Morten Kvarving
2205c68f0d BlackoilModel: use Scalar type 2024-05-23 08:09:53 +02:00
Arne Morten Kvarving
aa4758ff07 BlackoilModelNldd: use Scalar type 2024-05-22 15:52:13 +02:00
Arne Morten Kvarving
61bfea46c7 GenericTracerModel: use Scalar type 2024-05-22 15:46:50 +02:00
Arne Morten Kvarving
bf93915101 WellOperators: use field type 2024-05-22 15:39:24 +02:00
Arne Morten Kvarving
0f685d6b44 WellOperators: fix indent
also some formatting fixes, using instead of typedef
2024-05-22 15:30:48 +02:00
Arne Morten Kvarving
bac2087b85 WellProdIndexCalculator: template Scalar type 2024-05-22 15:21:37 +02:00
Arne Morten Kvarving
685bca2c2a WellProdIndexCalculator: drop indent for namespace 2024-05-22 15:21:37 +02:00
Bård Skaflestad
3544dfcabd
Merge pull request #5375 from akva2/msw_use_scalar
MultisegmentWell: use Scalar type
2024-05-22 15:18:45 +02:00
Arne Morten Kvarving
b9d03fc358 MultisegmentWell: use Scalar type 2024-05-22 14:33:36 +02:00
Arne Morten Kvarving
791d83b31a MultisegmentWellSegments: use Scalar type 2024-05-22 14:24:22 +02:00
Arne Morten Kvarving
caf4bc1de2 MultisegmentWellGeneric: use Scalar type 2024-05-22 14:24:22 +02:00
Arne Morten Kvarving
b151cbabac MultisegmentWellPrimaryVariables: use Scalar type 2024-05-22 14:24:22 +02:00
Arne Morten Kvarving
33ad8e3617 MultisegmentWellEval: use Scalar type 2024-05-22 14:24:22 +02:00
Arne Morten Kvarving
0da7903f8b MultisegmentWellAssemble: use Scalar type 2024-05-22 13:24:05 +02:00
Bård Skaflestad
f249a64d6c
Merge pull request #5374 from akva2/pavg_template_scalar
PAvgCalculator: template Scalar type
2024-05-22 13:21:36 +02:00
Arne Morten Kvarving
27d99f78ec ParallelWBPCalculation: template Scalar type 2024-05-22 10:51:12 +02:00