OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-07-29 21:27:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,104 Commits 24 Branches 102 Tags
7e1f8ecb8a825c699269a778579e126a73994df5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 7e1f8ecb8a Merge pull request #2527 from bska/refactor-equilibration 
Refactor Equilibration Procedure
 2020-04-15 13:30:38 +02:00
Atgeirr Flø Rasmussen 302474ade6 Merge pull request #2535 from hakonhagland/flow_tag_new_try 
Merge flow_tag.hpp into Main.hpp (new try)
 2020-04-15 13:29:59 +02:00
Atgeirr Flø Rasmussen e7e4cf6f20 Silence warnings and fix whitespace. 2020-04-08 10:41:20 +02:00
Atgeirr Flø Rasmussen 0c8ce54b71 Merge pull request #2498 from blattms/cherry-pick-hnil-flexible-clean-interface-rebased 
Cleaned up flexible solver improvements.
 2020-04-02 15:28:10 +02:00
Atgeirr Flø Rasmussen f30ddffdb7 Split WellGroupHelpers to cpp/hpp. 
Also changed namespace name.
 2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen d2dac6c19c Bugfix: rates in assembleControlEqProd() are by canonical phases, not active. 2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen a8107afc11 Fix handling of FIELD for injector groups. 2020-04-02 13:57:38 +02:00
Atgeirr Flø Rasmussen 3a5a8c23df Use generic control equation implementation. 2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen d703699e62 Avoid recursion above the FIELD group. 2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen 766d02cacc Unify group control equation codes. 2020-04-02 13:54:58 +02:00
Atgeirr Flø Rasmussen 27f62399f5 Handle guide-rate based well constraints from groups. 2020-04-02 10:41:57 +02:00
Atgeirr Flø Rasmussen 2fbad2eb59 Merge pull request #2511 from joakim-hove/wellpi 
Use only wconnection transmissibility without WellPI scaling
 2020-03-31 18:59:51 +02:00
Atgeirr Flø Rasmussen 1f5e032427 Merge pull request #2506 from joakim-hove/compile-time 
Add build time to flow startup banner
 2020-03-31 15:04:50 +02:00
Atgeirr Flø Rasmussen 8ef508cc08 Merge pull request #2491 from blattms/flexible-fixes 
Fixes ILU0 when using flexible solvers.
 2020-03-24 17:39:27 +01:00
Atgeirr Flø Rasmussen 070fafb31f Merge pull request #2494 from atgeirr/fix-ptr-overload 
Fix ptr() template for strict compilers (clang)
 2020-03-23 14:28:49 +01:00
Atgeirr Flø Rasmussen 56222d4350 Make is_ptr() for unique_ptr handle two template parameters. 2020-03-23 13:36:07 +01:00
Atgeirr Flø Rasmussen 1e84624ea7 Add override spec to silence warnings. 2020-03-23 11:57:59 +01:00
Atgeirr Flø Rasmussen 652c7d239b Simplify ptr(), avoiding a template template parameter. 
Since unique_ptr<T, Deleter> takes two arguments it cannot strictly
speaking be used via a template template parameter that takes one,
even though the second has a default. GCC allows this anyway, but
not clang.
 2020-03-23 11:55:45 +01:00
Atgeirr Flø Rasmussen 0c3cacf4da Merge pull request #2466 from atgeirr/update-readme 
Remove obsolete information from the README
 2020-03-13 11:24:51 +01:00
Atgeirr Flø Rasmussen 43c5df19d5 Remove obsolete information from the README 2020-03-13 11:23:35 +01:00
Atgeirr Flø Rasmussen 724adc31cb Merge pull request #2436 from akva2/no_serialization_matman 
No need to serialize MaterialLawManager any longer
 2020-03-09 16:05:46 +01:00
Atgeirr Flø Rasmussen ae0ace4b5a Merge pull request #2426 from blattms/shrink-eclequilinitializer 
Shrink EclEquilInitializer::initialFluidStates_.
 2020-03-08 18:24:07 +01:00
Atgeirr Flø Rasmussen 123a9d4579 Merge pull request #2409 from joakim-hove/sched-restart-property 
Add commandline switch --sched-restart to control restart init
 2020-03-05 09:28:14 +01:00
Atgeirr Flø Rasmussen 390c7b21d4 Merge pull request #2402 from akva2/update_foam_serialization 
changed: update FoamConfig serialization
 2020-03-04 14:18:39 +01:00
Atgeirr Flø Rasmussen 94f0bd2af6 Merge pull request #2370 from atgeirr/update-group-class 
Update for upstream changes to Group.
 2020-02-28 10:03:24 +01:00
Atgeirr Flø Rasmussen 3aeab97aa1 Update for upstream changes to Group. 2020-02-27 15:15:35 +01:00
Atgeirr Flø Rasmussen 70b0172a5a Merge pull request #2365 from joakim-hove/schedule-rst0 
Add disabled functionality to init wells and group from restart file
 2020-02-25 15:41:13 +01:00
Atgeirr Flø Rasmussen 8cd9da0d83 Merge pull request #2361 from akva2/removeNTGfill 
remove minpvFillNtg a temporary solution while not supporting standard minpv
 2020-02-24 13:34:43 +01:00
Atgeirr Flø Rasmussen 3f2ca3283c Merge pull request #2347 from akva2/disable_json_boost_1.48 
disable json input for boost 1.48
 2020-02-18 10:58:13 +01:00
Atgeirr Flø Rasmussen 47e6b0d87d Merge pull request #2340 from joakim-hove/remove-UDQFunctionTable-serialization 
Remove serialization support for UDQFunctionTable and UDQFunction
 2020-02-14 10:26:12 +01:00
Atgeirr Flø Rasmussen 2cbeff2aca Silence warnings. 2020-02-13 11:04:02 +01:00
Atgeirr Flø Rasmussen 83a5cf1f91 Do not use std::pointer_to_binary_function. 
Removed from C++17.
 2020-02-13 11:03:05 +01:00
Atgeirr Flø Rasmussen 5fe48dab8b Merge pull request #2327 from akva2/bump_dune 
Bump required dune version to 2.6
 2020-02-11 09:41:44 +01:00
Atgeirr Flø Rasmussen b1474a1427 Merge pull request #2324 from joakim-hove/aquifer-interface-refactor 
Use member variable in Aquifer code
 2020-02-10 09:26:03 +01:00
Atgeirr Flø Rasmussen d4419fedfb Merge pull request #2283 from totto82/conditionalCheck 
make group constrain check conditional
 2020-02-07 15:02:04 +01:00
Atgeirr Flø Rasmussen 066a6e5210 Merge pull request #1936 from GitPaean/support_wgr_wecon 
Support WGR limit check for WECON
 2020-01-31 09:59:28 +01:00
Atgeirr Flø Rasmussen 64a6d533fc Merge pull request #2309 from akva2/fix_relperm_diag_parallel 
fixed: run RelpermDiagnostics on the global grid in parallel runs
 2020-01-31 09:55:52 +01:00
Atgeirr Flø Rasmussen f003d37dba Merge pull request #2276 from totto82/fixREIN 
Fix REIN for multi level groups by passing the top phase
 2020-01-20 09:55:27 +01:00
Atgeirr Flø Rasmussen 2afab847f3 Merge pull request #2280 from atgeirr/add-missing-instantiation 
Add missing instantiation of pack.
 2020-01-15 12:43:56 +01:00
Atgeirr Flø Rasmussen b91f6fcc9f Add missing instantiation of pack. 
For pack(std::vector<Opm::Tabulated1DFunction<double>>).
 2020-01-15 11:25:00 +01:00
Atgeirr Flø Rasmussen 9d8d4921b8 Pass EnableBrine flag to BlackOilFluidState used for equilibration. 
Gave compile error on clang due to narrowing (the int 3 -> bool).
Bug did not cause trouble because default number of phases in
the fluid state (3) was sufficient.
 2020-01-13 11:00:33 +01:00
Atgeirr Flø Rasmussen 725b90504c Merge pull request #2269 from totto82/fixVREP 
fix for vrep and rein for more then one level of groups
 2020-01-13 08:33:29 +01:00
Atgeirr Flø Rasmussen b39ca125f6 Change auto in prototype to template argument. 2020-01-10 09:59:21 +01:00
Atgeirr Flø Rasmussen 0a73f8aac7 Merge pull request #2267 from blattms/fix-preconditioner-factory-name-clash-dune-2.7 
Move PreconditionerFactory into namespace Opm.
 2020-01-08 12:52:02 +01:00
Atgeirr Flø Rasmussen 83c9efea04 Merge pull request #2263 from bska/fix-oob-ssol-index 
Restart: Don't Access Solvent Saturation Unless Active
 2020-01-06 14:49:28 +01:00
Atgeirr Flø Rasmussen 5f979b4ec2 Merge pull request #2241 from GitPaean/fixing_non_defaulted_influx_coefficient 
fixing the non-defaulted influx coefficient for AquiferFetkovich
 2020-01-02 13:51:35 +01:00
Atgeirr Flø Rasmussen 38a094d0a8 Merge pull request #2256 from atgeirr/fix-msw-wefac 
Bugfix: correct well efficiency factors for MSW
 2020-01-02 09:16:27 +01:00
Atgeirr Flø Rasmussen 63a2460ed4 Bugfix: correct well efficiency factors for MSW 
With this, the conservation equations for the mswell are in terms of
effective flows. This is similar to the treatment for standard wells.
The alternative (formulating the equations in full rates) could be
better and clearer in the long run.
 2019-12-23 12:37:20 +01:00
Atgeirr Flø Rasmussen f03c4004b3 Merge pull request #2228 from totto82/fixGP3 
Fix the accumulation of the group potentials.
 2019-12-18 14:00:21 +01:00
Atgeirr Flø Rasmussen f0bb49199a Merge pull request #2236 from totto82/setMinimumChoppedTimeStep 
at option to set the time step size for shutting problematic wells
 2019-12-18 13:57:24 +01:00
Atgeirr Flø Rasmussen f769b97198 Merge pull request #2225 from atgeirr/fix-zero-wconprod 
Shut wells under zero WCONPROD when disallowing crossflow
 2019-12-13 14:41:52 +01:00
Atgeirr Flø Rasmussen f09dcda21c Shut production well if zero rate and disallowing crossflow. 2019-12-13 11:08:36 +01:00
Atgeirr Flø Rasmussen a89e8f6457 Complain less about missing operability checking. 
Do not give a warning for production wells or history wells,
respect the EnableWellOperabilityCheck flag. This is identical
to the behaviour of StandardWell. There will now only be a
warning for producers in prediction mode.
 2019-12-13 11:00:01 +01:00
Atgeirr Flø Rasmussen c8e1f61050 Ensure open_for_output_ flag is set to true in init(). 2019-12-13 10:59:24 +01:00
Atgeirr Flø Rasmussen b81faa9221 Merge pull request #2199 from GitPaean/support_wsegvalv 
Support WSEGVALV
 2019-12-11 21:07:15 +01:00
Atgeirr Flø Rasmussen 807375811e Merge pull request #2217 from atgeirr/silence-override-warnings 
Add override to silence warnings.
 2019-12-10 12:39:54 +01:00
Atgeirr Flø Rasmussen 63c766cd30 Add override to silence warnings. 2019-12-10 11:37:52 +01:00
Atgeirr Flø Rasmussen 52b9ecbfd5 Merge pull request #2210 from totto82/gconsalesump 
Support for Gconsale and Gconsump
 2019-12-06 15:01:49 +01:00
Atgeirr Flø Rasmussen 4bad782a1f Merge pull request #2178 from GitPaean/support_wsegsicd_rebased 
Support WSEGSICD implementation
 2019-12-06 14:20:40 +01:00
Atgeirr Flø Rasmussen d96e0a2478 Refactor solving functions to take control objects directly. 
This allows us to avoid some very hacky manipulation of the Well object.
 2019-12-05 12:40:35 +01:00
Atgeirr Flø Rasmussen cfcbc7159c Merge pull request #2208 from akva2/parallel_tests 
Add some more parallel tests
 2019-12-04 14:49:59 +01:00
Atgeirr Flø Rasmussen 8690a71aac Merge pull request #2175 from totto82/fixGRUPInit 
fix issue when GRUP is used in WCONPROD and WCONINJE and NONE
 2019-12-04 12:31:37 +01:00
Atgeirr Flø Rasmussen d4433b80b5 Improve/fix well potential calculations for MultiSegmentWell. 
Includes fixes for bhp-based potentials, and an implementation for thp-based
potentials similar to that for StandardWell.
 2019-12-04 11:01:45 +01:00
Atgeirr Flø Rasmussen c922bf3b30 Merge pull request #2206 from joakim-hove/move-summarystate-eval 
SummaryState is updated at the end of simulator timestep
 2019-12-04 09:33:33 +01:00
Atgeirr Flø Rasmussen becb29cec6 Merge pull request #2203 from joakim-hove/apply-action-output-update 
Update output from applyActions() to show date
 2019-12-03 09:02:02 +01:00
Atgeirr Flø Rasmussen 0edecb9a78 Merge pull request #2196 from totto82/smallTime 
Add option for throwing for small time steps
 2019-12-02 12:28:12 +01:00
Atgeirr Flø Rasmussen 937369166d Merge pull request #2182 from blattms/parallel-restart-fixes 
ParallelRestart: use references and allow non-default template parame…
 2019-11-26 11:14:14 +01:00
Atgeirr Flø Rasmussen 5d5250d568 Merge pull request #2181 from atgeirr/remove-unused-well-code 
Remove unused Wells struct and all its friends
 2019-11-25 13:23:21 +01:00
Atgeirr Flø Rasmussen e718bf3ccf Remove unused code. 2019-11-25 11:00:21 +01:00
Atgeirr Flø Rasmussen bddeaba880 Delete obsolete include directives and functions. 
Also make other minor adjustments, in particular moving the function
getCubeDim() from WellsManagerDetail to WellHelpers.hpp.
 2019-11-25 10:58:44 +01:00
Atgeirr Flø Rasmussen 87188f5862 Avoid using the Wells struct. 2019-11-25 08:36:18 +01:00
Atgeirr Flø Rasmussen cab0724a26 Merge pull request #2119 from blattms/fix-multiple-usage-printing-parallel 
Only print usage information on one processes.
 2019-11-22 15:23:27 +01:00
Atgeirr Flø Rasmussen 171b83ae10 Merge pull request #2171 from joakim-hove/rm-rockfromdeck 
Rm rockfromdeck
 2019-11-20 07:51:40 +01:00
Atgeirr Flø Rasmussen 3d9a0341b2 Merge pull request #2161 from blattms/filter-connection-on-local-grid-after-loadbalance 
Only filter in filterConnections_ on root process.
 2019-11-19 09:09:32 +01:00
Atgeirr Flø Rasmussen 4aa79bf39c Merge pull request #2152 from GitPaean/wip_fixing_aquifer_2 
fixing and improvement of the Aquifer models
 2019-11-18 11:19:15 +01:00
Atgeirr Flø Rasmussen 2a5c93356c Merge pull request #2160 from joakim-hove/rename-well2 
Rename Well2 -> Well and Group2 -> Group
 2019-11-14 10:33:54 +01:00
Atgeirr Flø Rasmussen 36cc2f4837 Merge pull request #2156 from joakim-hove/STOP-well 
Make sure the perforation pressures is initialized also for STOP wells
 2019-11-12 21:31:46 +01:00
Atgeirr Flø Rasmussen 96b4556926 Merge pull request #2144 from totto82/nupcolFix2 
Various group control fixes
 2019-11-08 17:38:25 +01:00
Atgeirr Flø Rasmussen 415f4adcef Merge pull request #2151 from joakim-hove/skip-processing 
Skip processing of filename if external deck already exists.
 2019-11-08 09:08:54 +01:00
Atgeirr Flø Rasmussen b9b8905db5 Merge pull request #2142 from atgeirr/prediction-fixes 
Prediction improvements
 2019-11-05 19:15:01 +01:00
Atgeirr Flø Rasmussen 20f767555e Merge pull request #2141 from totto82/fixGroupFraction 
fix group fraction bug
 2019-11-05 16:18:01 +01:00
Atgeirr Flø Rasmussen 672835710b Merge pull request #2140 from totto82/fixGroupProd 
Fix for hierarchy of production groups.
 2019-11-05 16:15:29 +01:00
Atgeirr Flø Rasmussen 4b7e37df1b Increase hardcoded producer bhp search range to 600 bar. 2019-11-05 16:07:22 +01:00
Atgeirr Flø Rasmussen 5ce4e84acd Do not add 0 to flo_samples vector. 2019-11-05 16:06:09 +01:00
Atgeirr Flø Rasmussen 5e8b577cd0 Use the RegulaFalsiBisection method instead of RegulaFalsi. 2019-11-05 16:05:42 +01:00
Atgeirr Flø Rasmussen b034ea2b04 Merge pull request #2139 from totto82/thpInj 
add computeBhpAtThpLimitInj
 2019-11-05 15:15:12 +01:00
Atgeirr Flø Rasmussen d7dff5c690 Merge pull request #2138 from totto82/resvRateMSW 
compute resv rates for MSW
 2019-11-05 14:20:24 +01:00
Atgeirr Flø Rasmussen bc71341462 Merge pull request #2125 from totto82/mswThp 
add support for thp control in MSW
 2019-11-04 11:25:20 +01:00
Atgeirr Flø Rasmussen 7922c51adb Merge pull request #2132 from totto82/gconinje 
Support custom vrep and rein group
 2019-11-04 10:23:33 +01:00
Atgeirr Flø Rasmussen 95aeca322f Merge pull request #2130 from totto82/reorderThp 
Check THP in the end
 2019-11-04 09:14:24 +01:00
Atgeirr Flø Rasmussen 0e02c32929 Merge pull request #2098 from blattms/make-elementIndexScatterer-work-with-two-mappers 
Allow different ElementMapper types in ElementIndexScatterHandle.
 2019-10-24 15:16:08 +02:00
Atgeirr Flø Rasmussen 5d1e125ab9 Merge pull request #2096 from totto82/avoid_nan_density 
avoid nan in the density calculation
 2019-10-22 14:27:45 +02:00
Atgeirr Flø Rasmussen 5267f3cf17 Merge pull request #1965 from totto82/killDistr 
Reimplementation of the well control code
 2019-10-22 10:25:32 +02:00
Atgeirr Flø Rasmussen f3d53e4750 Merge pull request #2089 from akva2/allow_parallel_norne_trigger 
added: allow running the norne test in parallel
 2019-10-22 09:54:43 +02:00
Atgeirr Flø Rasmussen 32b31a2606 Address review comments. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen f618073492 Some small logic fixes. 
- Make sure to reopen revived wells.
 - Do not use thp limit for potential calculations when well is bhp controlled.
 - Stopped wells do not check controls.
 - Set thp to control when appropriate in updateWellStateWithTarget().
 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 6b011c1bfb Use new method to determine operability under THP control. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen a536b90891 Improve stopped wells logic and log messages. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 2b9f5fb4fb Use robustSolveBhpAtThpLimitProd() for potentials and initialization. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 7581275b03 Add robustSolveBhpAtThpLimitProd() method. 2019-10-18 16:08:07 +02:00