Commit Graph

13899 Commits

Author SHA1 Message Date
Paul Egberts
98c8e691c3 Allow for brine and precipitation/dissolution of salt 2022-01-14 11:46:40 +01:00
Paul Egberts
f69aa171fe removed some salt-precipitation related keywords from the unsupported keyword list 2022-01-14 11:46:39 +01:00
Paul Egberts
0824ee0694 Initialization of solid salt saturation 2022-01-14 11:46:39 +01:00
Paul Egberts
dfe298a424 Allowing for non-eclipse output SALTP and PERMFACT 2022-01-14 11:46:39 +01:00
Bård Skaflestad
3317f10c4a
Merge pull request #3729 from goncalvesmachadoc/gaswater_brine
allow for gas-water + brine
2022-01-12 12:31:34 +01:00
Markus Blatt
c231e3b56b
Merge pull request #3767 from blattms/fix-opencl-warn-from-refactor
Include config.h in clSources.cpp to include correct openCL header.
2022-01-11 21:42:21 +01:00
Markus Blatt
ba0bce0fa7 Include config.h in clSources.cpp to include correct openCL header.
Otherwise the definitions determined by CMake are not available to
opm/simulators/linalg/bda/opencl.hpp and choosing the correct header
might fail.

On my system this at least fixes a warning.

Fallout from #3749
2022-01-11 20:13:45 +01:00
Markus Blatt
790fa8044e
Merge pull request #3755 from blattms/fix-opencl-apply-stdwells-rebased
Fix opencl apply stdwells rebased (replaces #3746)
2022-01-11 19:18:03 +01:00
goncalvesmachadoc
300f536a19 add exit_failure for water+brine case 2022-01-11 14:23:37 +01:00
goncalvesmachadoc
f73caf8a55 fix casename 2022-01-11 14:19:16 +01:00
Bård Skaflestad
ee3c3db1af
Merge pull request #3766 from blattms/3_a_mpi_multflt_mod2
Let ctest test 3_A_MPI_MULTFLT_SCHED_MODEL2 in parallel.
2022-01-10 21:19:39 +01:00
Markus Blatt
9bf55a0c6c Let ctest test 3_A_MPI_MULTFLT_SCHED_MODEL2 in parallel.
This would have detected OPM/opm-common#2922 as the test fails
with master.
Needs OPM/opm-common#2923 to succeed.
2022-01-10 20:58:22 +01:00
Markus Blatt
bf53d5b0ad
Merge pull request #3765 from bska/communicate-dissolved-rates
Accumulate Dissolved Gas and Vaporized Oil Flow Rates Across Ranks
2022-01-10 16:15:06 +01:00
Bård Skaflestad
abf92eed52 Accumulate Dissolved Gas and Vaporized Oil Flow Rates Across Ranks
This is needed to get consistent estimates for the summary vectors

  * {F,G,W}OP{R,T}{F,S} -- Free/Vaporized Oil Production
  * {F,G,W}GP{R,T}{F,S} -- Free/Dissolved Gas Production

in the case of distributed wells.

Thanks to [at]blattms for the suggested fix.
2022-01-10 14:14:39 +01:00
Tor Harald Sandve
3e4e62bc4f
Merge pull request #3751 from hakonhagland/glift_swg_fx3
Refactor some methods in `GasLiftSingleWellGeneric.cpp` (part 2)
2022-01-03 14:14:15 +01:00
Joakim Hove
a883fd9edb
Merge pull request #3742 from joakim-hove/repo-reorg
Downstream filesystem reorganisation in opm-common
2022-01-03 10:37:37 +01:00
Joakim Hove
6b92443cb4 Downstream filesystem reorganisation in opm-common 2022-01-02 14:33:34 +01:00
Tong Dong Qiu
f48fe632cb Added comment to apply_stdwell kernels 2021-12-22 16:22:55 +01:00
Tong Dong Qiu
3decb73561 Fix stdwell_apply opencl kernel 2021-12-22 16:16:04 +01:00
Markus Blatt
994260aaea
Merge pull request #3754 from blattms/clean-opencl-kernels-rebased
Clean opencl kernels rebased (rebased #3749)
2021-12-22 15:52:40 +01:00
Markus Blatt
89bc7d9ef0 Variable DEBUG_KERNEL renamed to DEBUG_OPENCL_KERNELS_INTEL
... to indicate that this only works on Intel and to make the
name less generic.
2021-12-22 12:44:07 +01:00
Jose Eduardo Bueno
c7ac97e215 [OpenCL] Moves all OpenCL kernels to *.cl files.
Kernel files are located in opm/simulators/linalg/bda/opencl/kernels.
CMake will combine them for usage in
${PROJECT_BINARY_DIR}/clSources.cpp that becomes part of the library.
2021-12-22 12:43:18 +01:00
Håkon Hægland
4bdf7c1b58 Refactor methods getXyzRateWithLimit_()
Refactors getOilRateWithLimit_(), getGasRateWithLimit_(), and
getWaterRateWithLimit_() in GasLiftSingleWellGeneric.cpp. The
common part of the methods is split out into a new method called
getRateWithLimit_(). The purpose of the refactorization is to reduce
reptetive code and make the code easier to maintain.
2021-12-22 10:45:31 +01:00
Atgeirr Flø Rasmussen
e970449667
Merge pull request #3753 from hakonhagland/glgi_const2
Made some methods in GasLiftGroupInfo const
2021-12-22 07:27:16 +01:00
Håkon Hægland
f28b906782 Made some methods in GasLiftGroupInfo const
This is in agreement with C++ Core Guidelines. A member function should
be marked const unless it changes the object’s observable state. This
gives a more precise statement of design intent, better readability, more
errors caught by the compiler, and sometimes more optimization opportunities.
2021-12-21 23:24:58 +01:00
Markus Blatt
723fd50d4c
Merge pull request #3748 from hakonhagland/glift_swg_fx2
Refactor some methods in `GasLiftSingleWellGeneric.cpp`
2021-12-21 20:55:48 +01:00
Håkon Hægland
11ad879472 Make parameters to getLiquidRateWithGroupLimit_() const
To improve readability, we make the parameters of
getLiquidRateWithGroupLimit_() const as discussed in
https://github.com/OPM/opm-simulators/pull/3748
2021-12-20 23:19:40 +01:00
Håkon Hægland
837f33e679 Refactor some methods in GasLiftSingleWellGeneric.
Refactor getOilRateWithGroupLimit_(), getGasRateWithGroupLimit_(),
getWaterRateWithGroupLimit_(), and getLiquidRateWithGroupLimit_() into
a single generic method called getRateWithGroupLimit_().
2021-12-20 23:08:31 +01:00
Bård Skaflestad
f77d82a0e9
Merge pull request #3744 from OPMUSER/Validate-ROCKCOMP
Validate ROCKCOMP Update
2021-12-20 13:51:07 +01:00
Markus Blatt
0485c65d16
Merge pull request #3740 from atgeirr/make-split-comm-test-runtime-optional
Replace DEMONSTRATE_RUN_WITH_NONWORLD_COMM macro with runtime bool.
2021-12-20 12:46:49 +01:00
OPMUSER
d6f7cb59a7 Validate ROCKCOMP Upadate 2021-12-20 18:06:17 +08:00
Atgeirr Flø Rasmussen
c94a940770 Add test for the custom communicator feature. 2021-12-20 09:58:13 +01:00
Tor Harald Sandve
a4a40a1f70
Merge pull request #3747 from hakonhagland/glift_swg_fx
Consider all groups when reducing oil rate to group limits
2021-12-17 08:52:32 +01:00
Atgeirr Flø Rasmussen
74b79d4626
Merge pull request #3743 from akva2/adjust_material_adjustments
adjust to upstream changes
2021-12-16 09:34:46 +01:00
Håkon Hægland
e388827d81 Fixup in GasLiftSingleWellGeneric
Consider all groups when reducing oil rate to group limits.
The current code just checks the first group limit in the set.
But there might be groups later in the set with more restrictive
limits, causing the oil rate to be reduced more than the first
limit.
2021-12-15 19:15:35 +01:00
Arne Morten Kvarving
9c4478c35b adjust to upstream changes 2021-12-14 13:40:47 +01:00
Joakim Hove
6c34271545
Merge pull request #3736 from OPMUSER/NEXTSTEP
Remove NEXTSTEP from Unsupported List
2021-12-14 08:57:02 +01:00
OPMUSER
34652f2d5d Remove NEXTSTEP from Unsupported List 2021-12-14 11:31:38 +08:00
Arne Morten Kvarving
81859b4268
Merge pull request #3722 from tskille/tracer_tests
Multiple restart tests
2021-12-13 09:33:23 +01:00
Atgeirr Flø Rasmussen
e22d1177fd
Merge pull request #3738 from OPMUSER/WILL_STOP
Update PartiallySupportedFlowKeywords.cpp All STOP Version
2021-12-13 09:23:44 +01:00
Torbjørn Skille
3274281c2d multiple restart tests 2021-12-12 17:57:40 +01:00
Atgeirr Flø Rasmussen
eec32ec581 Replace DEMONSTRATE_RUN_WITH_NONWORLD_COMM macro with runtime bool.
This allows for testing the simulator with the artifically split communicator,
in order to verify that there is no inappropriate usage of the world communicator.
2021-12-10 17:42:44 +01:00
Tor Harald Sandve
51d9b7ee11
Merge pull request #3719 from totto82/noIterPot
Do not iterate when computing well potentials for standard wells
2021-12-10 16:20:10 +01:00
OPMUSER
0ee2ed0311 Update PartiallySupportedFlowKeywords.cpp 2021-12-10 20:17:12 +08:00
OPMUSER
f7327c06f7 Update PartiallySupportedFlowKeywords.cpp 2021-12-10 19:56:54 +08:00
Tor Harald Sandve
1baee5ec9b
Merge pull request #3715 from goncalvesmachadoc/vapwat
update parameters BlackoilFluidSystem
2021-12-09 15:37:49 +01:00
Tor Harald Sandve
b87e5e0a9f
Merge pull request #3735 from hakonhagland/glift_refact
Small clean up in GasLiftSingleWellGeneric.cpp
2021-12-09 15:24:49 +01:00
Markus Blatt
04308922c8
Merge pull request #3733 from akva2/fix_dune2.6_in_test
fix build with dune 2.6
2021-12-09 14:02:14 +01:00
Håkon Hægland
738b5c5f18 Small clean up in GasLiftSingleWellGeneric.cpp
As discussed in PR #3728, it is better to move the two methods
reduceALQtoGroupTarget() and checkGroupTargetsViolated() from
OptimizeState to the parent class, then we do not have to abuse
OptimizeState in maybeAdjustALQbeforeOptimizeLoop_() just to call
reduceALQtoGroupTarget().

Also fixes a typo (as discussed in PR #3729) in reduceALQtoGrouptTarget()
where the water rate is updated with the gas flow rate instead of the
water flow rate. Should be like this:

 water_rate = -potentials[this->parent.water_pos_];

instead of

 water_rate = -potentials[this->parent.gas_pos_];
2021-12-09 11:58:43 +01:00
Arne Morten Kvarving
2d0d48d8c9 fix build with dune 2.6 2021-12-09 09:02:13 +01:00