OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-01 13:29:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,879 Commits 24 Branches 101 Tags 75 MiB
3e4e62bc4f
Commit Graph

13879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Arne Morten Kvarving
390e5250f9
Merge pull request #3732 from Tongdongq/fix-solvetransposed-test 
Only include test if opencl is found
 2021-12-09 09:01:50 +01:00
Tong Dong Qiu
aa5f36b835 Only include test if opencl is found 2021-12-09 08:39:43 +01:00
Tor Harald Sandve
bd9e13d4bd
Merge pull request #3728 from totto82/fixGasliftGroupWell 
Fix when both well and group control restrict gaslift
 2021-12-09 08:12:31 +01:00
Atgeirr Flø Rasmussen
e2cdab208b
Merge pull request #3730 from atgeirr/fix-efficiency-alq-network 
Account for efficiency when adding lift gas to network flows.
 2021-12-09 07:49:16 +01:00
Markus Blatt
77e03660d9
Merge pull request #3731 from blattms/fix-opencl-cpr-serial 
Fixes compilation of opencl CPR without MPI
 2021-12-08 20:55:35 +01:00
Markus Blatt
ac41c318da Fixes compilation of opencl CPR without MPI 2021-12-08 20:24:14 +01:00
Markus Blatt
a61f69bb79
Merge pull request #3672 from Tongdongq/add-cpr-opencl 
Add CPR preconditioner to openclSolver
 2021-12-08 19:44:59 +01:00
Tor Harald Sandve
5926f48b62
Merge pull request #3727 from totto82/fixDRSDTDYN 
Fix DRSDTDYN
 2021-12-08 16:40:12 +01:00
Atgeirr Flø Rasmussen
819d88a1a7 Account for efficiency when adding lift gas to network flows. 2021-12-08 15:54:12 +01:00
Tor Harald Sandve
66425eb7c2 WIP fix when both well and group control restrict gasslift 2021-12-08 09:36:26 +00:00
Tor Harald Sandve
4184b4cbaf Fix DRSDTDYN 
Add multiplication of missing reference oil density
 2021-12-08 09:05:59 +00:00
Atgeirr Flø Rasmussen
69b81c4fbf
Merge pull request #3724 from totto82/CO2STORETHERMAL 
Add gasoil + thermal simulator
 2021-12-08 08:33:46 +01:00
Tor Harald Sandve
31954a487b
Merge pull request #3720 from totto82/operSolvEcon 
Only check operable wells for wecon
 2021-12-07 12:44:24 +01:00
Tor Harald Sandve
4f75d1ab8d Add gasoil + energy simulator 
Useful when combining CO2STORE + THERMAL

This PR also fixes an issue with missing phases in computation of output temperature
 2021-12-07 09:18:38 +01:00
Tong Dong Qiu
a5ed003418 Update GPU solver and solve_transposed_3x3() tests 2021-12-06 11:57:24 +01:00
Kai Bao
148fb4a282
Merge pull request #3712 from totto82/fixAssertInStw 
Fix assert in relaxation factor in std well
 2021-12-06 11:09:08 +01:00