OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-24 14:47:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,307 Commits 31 Branches 117 Tags
8a5c9e82df087660af71ba9354ddfbf9b21ed0b7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 94ea40b253 Merge pull request #2619 from hakonhagland/refactor_execute 
Refactor `execute()` in `FlowMainEbos.hpp`
 2020-05-19 13:58:10 +02:00
Atgeirr Flø Rasmussen 77132af517 Merge pull request #2623 from atgeirr/fix-wrong-message 
Correct messages for group control switching.
 2020-05-15 11:32:09 +02:00
Atgeirr Flø Rasmussen 5aa2a785af Correct messages for group control switching. 2020-05-14 17:31:21 +02:00
Atgeirr Flø Rasmussen 53e11899fd Merge pull request #2621 from akva2/janitoring 
Some janitoring
 2020-05-14 17:04:31 +02:00
Atgeirr Flø Rasmussen 35cf505d14 Merge pull request #2618 from blattms/actually-use-trueimpes-for-cpr-trueimpes 
Use "trueimpes" for weight_type for configuration cpr_trueimpes.
 2020-05-14 09:57:12 +02:00
Atgeirr Flø Rasmussen 883b987837 Set default smoother relaxation to 1.0. 2020-05-13 17:08:38 +02:00
Atgeirr Flø Rasmussen ebce35b318 Add specialization for ParallelOverlappingILU0. 2020-05-13 17:08:38 +02:00
Atgeirr Flø Rasmussen 654fbf864e Merge pull request #2609 from hakonhagland/refactor_flowebos2 
Refactors flow_ebos_blackoil.cpp (2)
 2020-05-13 15:04:23 +02:00
Atgeirr Flø Rasmussen bf0e7f0e4a Split file to ensure correct authorship and license is applied. 2020-05-13 13:53:45 +02:00
Atgeirr Flø Rasmussen df58d44f70 Merge pull request #2612 from blattms/fix-flexible-parallel-verbosity 
Make only rank zero honor verbosity in flexible solvers.
 2020-05-13 08:41:01 +02:00
Atgeirr Flø Rasmussen 7beabdb9fb Merge pull request #2599 from atgeirr/improve-matrix-output 
Improvements to matrix writing facility.
 2020-05-08 15:41:33 +02:00
Atgeirr Flø Rasmussen 329036612b Enable matrix dumping also without MPI. 
Also remove the need for the reinterpret_cast by adding some extra
implementation details for more general block matrices.
 2020-05-08 13:32:36 +02:00
Atgeirr Flø Rasmussen 1e0b1b4a2b Merge pull request #2598 from atgeirr/timestepreport-revised 
Add writing detailed performance report
 2020-05-08 12:41:23 +02:00
Atgeirr Flø Rasmussen d108f9afa6 Avoid file-ending starting with S or A to not confuse comparison program. 2020-05-08 11:56:52 +02:00
Atgeirr Flø Rasmussen cf7b258f72 Minor adjustments from review. 2020-05-08 09:21:25 +02:00
Atgeirr Flø Rasmussen 561bec4a64 Make CASENAME.STEPINFO the name of the step info report file. 2020-05-07 22:29:01 +02:00
Atgeirr Flø Rasmussen 9458357009 Use = rather than += when appropriate for reports. 2020-05-07 22:09:17 +02:00
Atgeirr Flø Rasmussen 9dd2275af9 Remove seconds and add timestep to ITERINFO report. 2020-05-07 21:19:31 +02:00
Atgeirr Flø Rasmussen 769028b591 Remove 'verbosity' member and reorganize. 2020-05-07 21:00:39 +02:00
Atgeirr Flø Rasmussen 8dd53a38e9 Refactor SimulatorReport system. 
Now SimulatorReport object contains a vector of SimulatorReportSingle objects,
for both successful and failing steps.
 2020-05-07 16:13:39 +02:00
Atgeirr Flø Rasmussen cfdb2b9be6 Modifications of formatting, compile fix. 2020-05-07 15:04:20 +02:00
Atgeirr Flø Rasmussen 9476dfc35a Merge pull request #2594 from atgeirr/writematrix-revised 
Add a writeSystem() helper and use it to write system matrices.
 2020-05-07 09:07:07 +02:00
Atgeirr Flø Rasmussen 9357919201 Do not run setupParameter_() twice for the static-typed sims. 2020-05-05 16:19:10 +02:00
Atgeirr Flø Rasmussen 7dbbc0f2e5 Merge pull request #2588 from totto82/addMinMaxSupportGCONSALE 
Implement min/max for GCONSALE
 2020-05-05 15:46:36 +02:00
Atgeirr Flø Rasmussen 859db45e45 Merge pull request #2590 from totto82/fixSolventRein 
Fix solvent reinjection when different reinjection group is given
 2020-05-05 11:36:50 +02:00
Atgeirr Flø Rasmussen f0b1ee76b8 Ensure that the typetag used for initialization is correct. 
Without this, properties set in the static variants of flow such as
flow_blackoil_dunecpr.cpp will be honored in the run. However, the
text for '--help' and the property printout in the .DBG file will not
reflect the true type tag, but the default.

This bug was added during the recent refactoring of all Flow variants
to use the same initialization and setup code.
 2020-05-04 08:52:49 +02:00
Atgeirr Flø Rasmussen 8b77d68d9c Merge pull request #2572 from bska/prune-unused 
Remove Unused 'currentControl' Variable
 2020-04-28 08:09:17 +02:00
Atgeirr Flø Rasmussen 14bde098ce Merge pull request #2570 from blattms/fix-prec-factory-dune-master 
Complete future-proofing ILU usage in the preconditioner factory.
 2020-04-27 16:37:27 +02:00
Atgeirr Flø Rasmussen 06e5e6b6ac Merge pull request #2565 from totto82/avoidOscNupcol 
use nupcol to avoid oscillation between group controls
 2020-04-27 16:02:32 +02:00
Atgeirr Flø Rasmussen 6684cd7cb3 Merge pull request #2564 from totto82/fixGCONSALE 
Fix GCONSALE
 2020-04-27 15:59:29 +02:00
Atgeirr Flø Rasmussen a720bf9942 Add logging of linear solver parameter tree. 2020-04-24 14:52:04 +02:00
Atgeirr Flø Rasmussen c4e020c179 Merge pull request #2556 from totto82/test_atg 
Fix how the group reduction works
 2020-04-24 11:13:22 +02:00
Atgeirr Flø Rasmussen 196d6c95ec Merge pull request #2530 from bska/equil-subdiv-fipcalc 
Equilibration: Add Experimental Support for Horizontal Subdivision
 2020-04-23 16:50:41 +02:00
Atgeirr Flø Rasmussen 0df3a96fa6 Fix how group rate reductions work. 2020-04-23 09:39:03 +02:00
Atgeirr Flø Rasmussen 92d404de96 Merge pull request #2541 from joakim-hove/group-controls-update 
Check availability for group control separately for inj/prod
 2020-04-17 16:40:31 +02:00
Atgeirr Flø Rasmussen a1091bd718 Stop simulating if the schedule has set an exit condition. 
The program will return the value set in the EXIT keyword.
 2020-04-16 15:42:17 +02:00
Atgeirr Flø Rasmussen 88525f7c39 Merge pull request #2516 from hakonhagland/refactor_flow_run 
Refactor main() in flow.cpp.
 2020-04-16 13:28:03 +02:00
Atgeirr Flø Rasmussen 07d9ec135b Make Main a non-template class again, simplify. 2020-04-16 11:35:01 +02:00
Atgeirr Flø Rasmussen b7902ebfda Merge pull request #2539 from blattms/remove-stale-cpr-files 
Removes stale CPR headers that have been superseeded.
 2020-04-16 08:51:24 +02:00
Atgeirr Flø Rasmussen 2159a83b49 Merge pull request #2524 from hakonhagland/flow_tag2 
Refactor away flow_tag.hpp
 2020-04-15 17:16:05 +02:00
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