Commit Graph
13850 Commits
Author SHA1 Message Date
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 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
Tor Harald Sandve 226ff0c9dc Merge pull request #3721 from joakim-hove/respect-nextstep
Respect NEXTSTEP in ecl genericproblem timestepper
2021-12-06 10:41:07 +01:00
Tor Harald Sandve 7467a63656 Merge pull request #3717 from joakim-hove/enable-tracer
Suggestion: Remove enable switch for tracer support
2021-12-06 09:10:38 +01:00
Tor Harald Sandve e230174de6 Fix assert in relaxation factor in std well
If original sum ~ 1 and relaxed_update ~ 0 the factor could -> inf
and trigger the assert.
The 1 + epsilon factor will make sure this does not happen
2021-12-03 14:00:40 +00:00
Tor Harald Sandve 4d19ba7409 Only check operable wells for wecon 2021-12-03 11:37:51 +00:00
Joakim Hove 9234fd8aa6 Respect NEXTSTEP in ecl genericproblem timestepper 2021-12-03 11:59:03 +01:00
Joakim Hove 43c0931cd3 Merge pull request #3718 from joakim-hove/tracer-rst-init2
Tracer rst init2
2021-12-02 13:14:19 +01:00
Bård Skaflestad 89dbf807b2 Merge pull request #2584 from goncalvesmachadoc/fixReport
fixReportPRT
2021-12-01 21:39:31 +01:00
Joakim Hove f737536dd6 Remove unused tracer field with initial concentration 2021-12-01 17:18:17 +01:00
Joakim Hove c49e5838c5 TracerModel prepare batches is called *after* initial values are set 2021-12-01 17:15:14 +01:00
goncalvesmachadoc 8b001e2e75 moveLogCall&ProtectField 2021-12-01 16:13:53 +01:00
Tong Dong Qiu 374f8276dc Move opencl variables to Preconditioner 2021-12-01 14:15:59 +01:00
Tong Dong Qiu 94ea2dcd30 Change C to C++
Also bugfix wrong size when COPY_ROW_BY_ROW is active
2021-12-01 14:15:16 +01:00
Tong Dong Qiu e0a4d271ea Formatting changes 2021-12-01 11:47:45 +01:00
Tong Dong Qiu 0881089406 Add Preconditioner, superclass of BILU0 and CPR 2021-12-01 11:47:45 +01:00
Tong Dong Qiu 50d0486b28 Allow a variable number of pre/post smooth steps during AMG 2021-12-01 11:47:44 +01:00
Tong Dong Qiu d58aa58791 Add more testcases for solve_transposed_3x3() 2021-12-01 11:47:44 +01:00
Tong Dong Qiu a911d5d2be Add test for solve_transposed_3x3() 2021-12-01 11:47:44 +01:00
Tong Dong Qiu 56fb3948e5 Fill restriction matrix faster 2021-12-01 11:47:44 +01:00
Tong Dong Qiu 411d3c6a8d Replace spmv-prolongation by specialized kernel 2021-12-01 11:47:44 +01:00
Tong Dong Qiu eaded9dcf7 Add prolongate_vector() kernel 2021-12-01 11:47:44 +01:00
Tong Dong Qiu 9d611f04ee Add timers to opencl CPR preconditioner 2021-12-01 11:47:44 +01:00
Tong Dong Qiu f2225503c4 Combine BILU0 and CPR preconditioner 2021-12-01 11:47:44 +01:00
Tong Dong Qiu 11d54f31f5 Reuse umfpack object 2021-12-01 11:47:29 +01:00
Tong Dong Qiu b9a12b64d9 Rename copy sparsity pattern function 2021-12-01 11:43:40 +01:00
Tong Dong Qiu d7204c5be7 Create separate functions 2021-12-01 11:43:39 +01:00
Tong Dong Qiu 13646337f3 Reduce get_absmax() code 2021-12-01 11:43:39 +01:00
Tong Dong Qiu 5e85c23478 Renamed move_to_coarse/fine() in CPR 2021-12-01 11:43:39 +01:00
Tong Dong Qiu 19a0454b6f Update comments 2021-12-01 11:43:39 +01:00