Commit Graph

13747 Commits

Author SHA1 Message Date
Tor Harald Sandve
b5cdb1048a Mark wells with negative and trivial potentials as not operable
The simulator will try to compute potentials at every iterations to
try to reopen the well.
2021-11-22 08:44:17 +00:00
Bård Skaflestad
d163bebcdc
Merge pull request #3699 from blattms/man-page-spelling
Adds manpage and fixes several spelling issue found by lintian
2021-11-17 09:59:50 +01:00
Markus Blatt
2e491fbce6 Fixed spelling errors in flow.1 mang page.
When generating it an older version of flow (with spelling errors)
was used with help2man.
2021-11-16 22:40:27 +01:00
Markus Blatt
e2c76dff3d Updated man-page for 2021 release.
help2man -h "-h" --version-string="2021.10" --no-discard-stderr -n \
"Eclipse compatible parallel reservoir simulator" -N flow > man.1
2021-11-16 13:28:56 +01:00
Joakim Hove
2b0bce970c
Merge pull request #3698 from joakim-hove/rename-restart
Suggestion: Rename restart case to ${CASE}_RESTART in regression test
2021-11-16 10:46:58 +01:00
Joakim Hove
11ac39fa52
Merge pull request #3686 from joakim-hove/geo-actionx
Geo actionx
2021-11-15 22:30:52 +01:00
Kai Bao
c2e18fd077
Merge pull request #3573 from totto82/crossFlowEcon
remove assert and handle opposite rates in wecon related fractions.
2021-11-15 15:31:05 +01:00
Joakim Hove
4d1fb8c797
Merge pull request #3700 from blattms/gcc-11
Include limits header where needed for g++-11
2021-11-15 13:13:07 +01:00
Markus Blatt
b0792db164 Include limits header where needed for g++-11
Without this compilation fails on Debian unstable.
2021-11-15 12:11:25 +01:00
Markus Blatt
a2246d331b Spelling fixes
Gbp-Pq: Name 0005-Spelling-fixes.patch
2021-11-15 12:06:05 +01:00
Markus Blatt
7fa9e8d983 Manually fix unbreakable long lines.
Warning was:

W: libopm-simulators-bin: manpage-has-errors-from-man usr/share/man/man1/flow.1.gz 202: warning [p 5, 0.5i]: cannot adjust line

Gbp-Pq: Name 0003-Manually-fix-unbreakable-long-lines.patch
2021-11-15 12:06:05 +01:00
Markus Blatt
64cdc95fac Added man pages for flow.
Generated using:

declare -A short_desc
short_desc['flow']='Eclipse compatible parallel reservoir simulator'
short_desc['ebos']='Eclipse compatible parallel reservoir simulator for research'
for key in "${!short_desc[@]}"; do
           help2man -h "-h" --version-string="2021.04" --no-discard-stderr -n "${short_desc[$key]}" -N $key >\
           $key.1
done

Gbp-Pq: Name 0002-Added-man-pages-for-flow-and-ebos.patch
2021-11-15 12:06:05 +01:00
Markus Blatt
afc5ed751f
Merge pull request #3691 from akva2/bda_wellcontrib_refactor
Refactor BDA well contributions
2021-11-15 10:26:44 +01:00
Markus Blatt
ec56782288
Merge pull request #3690 from akva2/wellcontrib_cleanups
Some simple cleanup in BDA WellContributions
2021-11-15 10:18:12 +01:00
Bård Skaflestad
f2fab4475b
Merge pull request #3695 from GitPaean/remove_pv_fraction
removing --relaxed-max-pv-fraction for num aquifer tests
2021-11-14 22:44:43 +01:00
Joakim Hove
3d07797670
Merge pull request #3683 from bska/fix-incorrect-vector-tag
Fix Incorrect Solution Array Tag
2021-11-14 16:12:54 +01:00
Bård Skaflestad
6bf741502f Fix Incorrect Solution Array Tag
The Flow specific PORV_RC and TMULT_RC solution arrays were tagged
as ECLIPSE compatible.  Mark them as Flow specific so they do not
cause restart problems in the ECLIPSE compatible case.
2021-11-14 15:41:14 +01:00
Joakim Hove
ccb708e716 Rename restart case to ${CASE}_RESTART 2021-11-14 13:16:57 +01:00
Joakim Hove
b28c3abbc5
Merge pull request #3693 from akva2/fix_changed_tests
fixed: only update files if they actually changed
2021-11-14 13:11:12 +01:00
Kai Bao
e7010ba6f4 removing --relaxed-max-pv-fraction for num aquifer tests 2021-11-12 14:32:10 +01:00
Tor Harald Sandve
ae5a1df29c
Merge pull request #3638 from blattms/exclude-pv-aquifer-cnv
Exclude pv of numerical aquifer cells in ratio of cells violating CNV
2021-11-12 13:27:58 +01:00
Arne Morten Kvarving
06fe93a430 changed: do not always start update_data branch from origin/master
this allows for update_data from opm-tests. the generated
PR will include the contents of the PR it was generated for
2021-11-12 11:57:13 +01:00
Arne Morten Kvarving
9e01b3b790 fixed: only update files if they actually changed
fixes the changed tests output
2021-11-12 11:25:45 +01:00
Arne Morten Kvarving
069882f3e4 fixed: no device handling in test_cusparseSolver
the exception is not thrown while setting up the bridge as in
opencl. rather the exception is thrown in the solve_system call.
2021-11-12 10:29:26 +01:00
Joakim Hove
ae69c92280
Merge pull request #3692 from joakim-hove/reorder-summary-solution
Reorder SUMMARY and SOLUTION section in test deck
2021-11-12 10:00:24 +01:00
Joakim Hove
46ed61455d Reorder SUMMARY and SOLUTION section in test deck 2021-11-12 09:08:30 +01:00
Joakim Hove
4fc5d34090 Apply new GEO keywords when ACTIONX has applied geo multiplier 2021-11-12 08:02:52 +01:00
Joakim Hove
7b038ba376
Merge pull request #3685 from joakim-hove/sim-update
Use struct SimulatorUpdate as return type from Schedule::applyAction
2021-11-11 14:58:58 +01:00
Arne Morten Kvarving
e25caba8ed changed: refactor BDA well contributions
split in API specific classes for Cuda/OpenCL

this to
1) it's cleaner
2) it avoids pulling in openCL code in cuda classes which leads
to clashes between nvidia headers and opencl.hpp

there is still too much API specific things in interface between the
bda components to work through a virtual interface so we still have to cast
to the relevant implementation in various places.
2021-11-11 14:49:33 +01:00
Arne Morten Kvarving
352d31a1e9 BdaBridge: avoid FPGA include in header
already includ in the cpp file where it is required.
2021-11-11 13:39:46 +01:00
Arne Morten Kvarving
7fb39f8308 BdaBridge: avoid includes in header 2021-11-11 13:39:25 +01:00
Arne Morten Kvarving
be6c857b16 bda: use forwarding for WellContributions 2021-11-11 13:29:12 +01:00
Arne Morten Kvarving
4a1fb0b86a use std::vector for val_pointers 2021-11-11 13:15:29 +01:00
Arne Morten Kvarving
2b0508af8b changed: use unique_ptr for MultisegmentWellContributions
less manual pointer management is always good
2021-11-11 13:15:29 +01:00
Tor Harald Sandve
ef439cd6d6
Merge pull request #3678 from totto82/fixGasliftX2
Fix gasslift reduction when under LRAT, GRAT or WRAT
2021-11-11 13:11:31 +01:00
Arne Morten Kvarving
5bfac05827
Merge pull request #3688 from blattms/fix-wellcontrib-without-opencl
Fixes compilation of WellContributions with deactivated OpenCL.
2021-11-11 11:59:45 +01:00
Bård Skaflestad
7f68143d45
Merge pull request #3684 from akva2/cosmetic_ocd
cosmetics: do not indent for namespace
2021-11-11 10:16:18 +01:00
Markus Blatt
c54e85a8eb Fixes compilation of WellContributions with deactivated OpenCL.
OpenCL header was included and OpenclKernels used unconditionally
in WellContributions.cpp. As this file is compiled if CUDA is found,
too it lead to undefined references for e.g. cl::CommandQueue if
opencl headers were there and compile error if not.
2021-11-10 19:41:59 +01:00
Joakim Hove
86f7a2d332 Use strict SimulatorUpdate as return type from Schedule::applyAction 2021-11-10 15:35:46 +01:00
Arne Morten Kvarving
dc136746df cosmetics: do not indent for namespace
also avoid an unnecessary close/open for namespace Opm
2021-11-10 14:24:51 +01:00
Tor Harald Sandve
cd9e742ad5 remove assert and handle opposite rates in wecon 2021-11-10 13:14:22 +01:00
Bård Skaflestad
2bd5b30cda
Merge pull request #3681 from akva2/vexcl_no_auto_func_param
fixed: auto function parameters requires the concept-ts
2021-11-10 11:19:30 +01:00
Bård Skaflestad
fd743de749
Merge pull request #3680 from akva2/use_runstatic
Use Main::runStatic in PyBlackoilSimulator
2021-11-10 11:14:05 +01:00
Bård Skaflestad
2f71912978
Merge pull request #3682 from akva2/fix_serial_no_cast_op
fix serial build after PR #3675
2021-11-10 11:13:16 +01:00
Arne Morten Kvarving
24e252f46d fix serial build after PR #3675
annoyingly, dune has a casting operator for mpicollectivecommunication
-> MPIComm but for some reason does not have a casting operator for
the dummy collectivecommunication -> No_Comm
2021-11-10 10:41:24 +01:00
Arne Morten Kvarving
f27931c2e2 fixed: auto function parameters requires the concept-ts
use a regular template parameter instead
2021-11-10 10:25:27 +01:00
Bård Skaflestad
6f0b06715e
Merge pull request #3676 from akva2/use_single_sum_call
GasLiftGroupInfo: use a array to allow for one sum call
2021-11-10 10:16:39 +01:00
Bård Skaflestad
5e31ea3054
Merge pull request #3675 from akva2/multivar_broadcast_rates
Use multivariable broadcast facility to broadcast rates
2021-11-10 10:14:36 +01:00
Arne Morten Kvarving
7f7fbab2f4 remove FLOW_BLACKOIL_ONLY hack from Main.hpp
now that the python simulator uses runStatic, the
runDynamic template is never instanced, and thus there
are no linker issues.
2021-11-10 10:07:11 +01:00
Arne Morten Kvarving
3a512c0f20 changed: use runStatic in python simulator 2021-11-10 09:51:17 +01:00