Commit Graph
24166 Commits
Author SHA1 Message Date
Arne Morten Kvarving 05e94c6891 wheels: build with make
the supplied ninja is too old to support fortran
2026-03-11 09:30:53 +01:00
Bård Skaflestad 09bd151ddb Merge pull request #6919 from akva2/use_cmp_0167
rely on policy for forcing config mode for boost
2026-03-10 15:16:15 +01:00
Arne Morten Kvarving aa08470f60 rely on policy for forcing config mode for boost 2026-03-10 15:02:08 +01:00
Bård Skaflestad 7d175770e3 Merge pull request #6903 from akva2/janitoring_cuda
Janitoring: quell some cuda warnings
2026-03-10 14:55:35 +01:00
Arne Morten Kvarving d4c8727423 disable test with boost < 1.75
does not build
2026-03-10 14:09:44 +01:00
Markus Blatt 72040e0042 Merge pull request #6844 from aritorto/nncBasedOnTrans
[LGR] NNCs for CpGrid with LGRs
2026-03-10 12:27:39 +01:00
Antonella RitortoandMarkus Blatt 6e0946f47b Pair level and level index up
Co-authored-by: Markus Blatt <markus@dr-blatt.de>
2026-03-10 10:37:19 +01:00
Atgeirr Flø Rasmussen 47247d3ce3 Merge pull request #6910 from multitalentloes/format_blackoillocalresidualtpfa_2
run clang-format on blackoillocalresidualtpfa.hh
2026-03-10 09:28:48 +01:00
Bård Skaflestad c25b2ccabe Merge pull request #6917 from akva2/vendored_fmt_cleanup
adjust to changed DownloadFmt
2026-03-10 09:02:27 +01:00
Svenn Tveit 2df74ce9c4 Merge pull request #6905 from totto82/support_consat_solvent
Support individual satnums in wells for solvent model
2026-03-10 08:53:43 +01:00
Arne Morten Kvarving 6afb711485 adjust to changed DownloadFmt 2026-03-10 08:47:42 +01:00
Bård Skaflestad 2082f1cb9a Merge pull request #6896 from akva2/remove_ecl_opts
adjust to removed HAVE_ECL_(IN|OUT)PUT options
2026-03-09 18:37:32 +01:00
Arne Morten Kvarving a6dc3d959a adjust to removed HAVE_ECL_(IN|OUT)PUT options 2026-03-09 18:07:33 +01:00
Antonella Ritorto 5769baa950 Avoid unneceseary reserve() 2026-03-09 16:40:26 +01:00
Bård Skaflestad 26c5580013 Merge pull request #6914 from akva2/opmlibmain_use_prereqs
prereqs is now included by OpmLibMain
2026-03-09 16:37:56 +01:00
Arne Morten Kvarving 3a6ee1496f prereqs is now included by OpmLibMain 2026-03-09 15:18:58 +01:00
Bård Skaflestad 055baaeb1f Merge pull request #6913 from akva2/use_language_hook
move language setup to language hook
2026-03-09 14:00:30 +01:00
Antonella Ritorto 19a41f5392 Return the level indices 2026-03-09 13:45:01 +01:00
Arne Morten Kvarving d792fe0fce move language setup to language hook
needs to run before the target is added
2026-03-09 13:03:31 +01:00
Antonella Ritorto 648e9ec75e Regular/internal NNCs for CpGrid with LGRs - only level zero for now 2026-03-09 12:57:36 +01:00
Antonella Ritorto c66cd321c7 Global/Local and Amalgamated NNCs for CpGrid with LGRs 2026-03-09 12:57:36 +01:00
Antonella Ritorto e5fae3e0bc Extract refined level grids TRAN* values for output 2026-03-09 12:57:32 +01:00
Bård Skaflestad 67e0c7518c Merge pull request #6912 from totto82/support_item13_ehystr
remove item 13 from unsupported list
2026-03-09 12:24:36 +01:00
Markus Blatt a01f5e0cf1 Merge pull request #6799 from aritorto/reduceCodeTransLevel
[LGR] TRAN* for refined level grids
2026-03-09 12:02:47 +01:00
Tor Harald Sandve 28b5eead27 remove item 13 from unsupported list 2026-03-09 10:56:18 +01:00
Tor Harald Sandve 4f96ff03cb Support individual satnums in wells for solvent model 2026-03-09 09:34:47 +01:00
Antonella Ritorto a5d62f8598 Pass the entire vector in writeInitial 2026-03-06 17:10:41 +01:00
Tobias Meyer Andersen d8f5745493 run clang-format on blackoillocalresidualtpfa.hh 2026-03-06 10:56:03 +01:00
Antonella Ritorto ef6887c4a9 Extract refined level grids TRAN* values for output 2026-03-06 10:43:43 +01:00
Tor Harald Sandve 83172e94dd Merge pull request #6900 from hakonhagland/reorg_gsh
Reorganize GroupStateHelper private methods by caller group
2026-03-06 10:26:40 +01:00
Bård Skaflestad 0d821e6ceb Merge pull request #6907 from akva2/guiderates_exit_early
exit early if there are no wells
2026-03-06 08:57:58 +01:00
Arne Morten Kvarving 1b92015617 turn on expt-relaxed-constexpr for two more cuda tests
the stl functions are marked constexpr, and this causes
warnings when used in device code. turn on option to
relax this restriction.

move code doing this for other files into source hook
2026-03-06 08:30:23 +01:00
Arne Morten Kvarving 7ae36dc520 quell some warnings in cuda kernels 2026-03-06 08:26:33 +01:00
Arne Morten Kvarving 3a01f45c98 exit early if there are no wells
quells a compiler warning
2026-03-06 07:48:36 +01:00
Håkon Hægland 145c01208d Minor GroupStateHelper cleanups noticed during reorganization
- Rename sumProductionRate_() to sumProductionRateForControlMode_()
  to better describe that it sums rates for a specific control mode.

- Add defensive cmode mismatch check in getProductionGroupTarget()
  for reservoir coupling slave groups. The slave's cmode should
  already match the master's after updateSlaveGroupCmodesFromMaster().

- Replace bare std::logic_error throw with OPM_DEFLOG_THROW in
  activePhaseIdxToRescoupPhase_(). The old TODO noted that
  deferredLogger() was unavailable, but the method now lives in
  GroupStateHelper which provides it.
2026-03-05 14:37:28 +01:00
Håkon Hægland 9f04875139 Reorganize GroupStateHelper private methods by caller group
Group the 24 private methods into six logical sections based
on which public methods call them, making the caller
relationships immediately visible:

  A) Constraint checking helpers
  B) Injection & production target helpers
  C) Guide rate & hierarchy navigation
  D) Reservoir coupling helpers
  E) Satellite group rate helpers
  F) Recursive update helpers

This is a pure code-move with no logic changes.
2026-03-05 14:37:26 +01:00
Bård Skaflestad 2e961cc2a2 Merge pull request #6906 from akva2/quell_vcfv_warning
quell compiler warning
2026-03-05 14:17:03 +01:00
Arne Morten Kvarving db0f06c00b quell compiler warning 2026-03-05 13:13:41 +01:00
Tor Harald Sandve 261d5a7e51 Merge pull request #6853 from hakonhagland/slave_rate_prod_lim
Reservoir coupling: Enforce per-rate-type master production limits on slave
2026-03-05 12:52:59 +01:00
Håkon Hægland ac27377d7a Enforce per-rate-type master production limits
Store the five per-rate-type production limits (ORAT, WRAT, GRAT,
LRAT, RESV) that the master sends alongside the active target in
ReservoirCouplingSlaveReportStep, with delegation through
ReservoirCouplingSlave.

Add getEffectiveProductionLimit() to GroupStateHelper which combines
the master limit, the slave's local GCONPROD target, and the
GRUPSLAV filter flag (MAST/SLAV/BOTH) to produce the effective
constraint for each rate type.
2026-03-05 12:02:09 +01:00
Tor Harald Sandve aefb153bd0 Merge pull request #6852 from hakonhagland/refact_cgpc
Deduplicate BlackoilWellModelConstraints::checkGroupProductionConstraints()
2026-03-05 11:36:04 +01:00
Bård Skaflestad 06c797a22a Merge pull request #6902 from akva2/multmatrix_no_out_param
detail::multMatrix: replace out param with return value
2026-03-05 11:08:45 +01:00
Håkon Hægland 350733219e Add parameter comment for readability
Add /*injector=*/ parameter comment for readability
2026-03-05 10:53:47 +01:00
Arne Morten Kvarving 1873f6cb99 detail::multMatrix
use return of matrix instead of out-param.

the resize() method does not take existing size into account
so this causes no extra allocations
2026-03-05 10:26:02 +01:00
Bård Skaflestad 58f2626df8 Merge pull request #6901 from akva2/janitoring
Janitoring: quell 2 compiler warnings and some adjacent cleanups
2026-03-05 10:00:43 +01:00
Arne Morten Kvarving f435b43538 remove redundant initialization 2026-03-05 09:32:47 +01:00
Arne Morten Kvarving 620e1d49c7 remove virtual qualifier on override methods 2026-03-05 09:32:47 +01:00
Arne Morten Kvarving de2f405816 cosmetics 2026-03-05 09:32:47 +01:00
Arne Morten Kvarving 3ae1767e0a quell compiler warning
function is unused for bz == 1 (since we do not use cpr in that case),
but compiler doesn't know that so it will warn about oob deref in
getQuasiImpesWeights
2026-03-05 09:32:47 +01:00
Håkon Hægland a94b2f5c47 Deduplicate checkGroupProductionConstraints()
The five per-rate-type blocks (ORAT, WRAT, GRAT, LRAT, RESV) in
BlackoilWellModelConstraints::checkGroupProductionConstraints()
followed an identical pattern.  Extract three helpers into
GroupStateHelper (sumProductionRate_, getProductionConstraintTarget_,
checkProductionRateConstraint_) and replace the repetitive blocks
with a single loop over control modes.

BlackoilWellModelConstraints now delegates to GroupStateHelper,
which already holds the required state (comm, phaseUsage,
groupState, deferredLogger).  The DeferredLogger& parameter is
removed from the signature since it is redundant.

Pure refactoring, no behavioral change.
2026-03-05 09:23:14 +01:00