OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,614 Commits 31 Branches 117 Tags
fe8df9726604a827de92a822f79253d6671be808
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen fe8df97266 Merge pull request #3637 from akva2/fix_mpiabort_no_input_case 
changed: special case no input deck given handling
 2021-10-29 15:35:35 +02:00
Atgeirr Flø Rasmussen 2a7a9d46ce Merge pull request #3640 from totto82/inj_comm 
communicate inj_resv/surface_rates
 2021-10-29 15:35:24 +02:00
Atgeirr Flø Rasmussen b4fe98b739 Merge pull request #3636 from joakim-hove/mark-as-supported-diffuse-diffc-gpmaint 
Mark keywords DIFFC, DIFFUSE and GPMAINT as supported
 2021-10-29 12:25:00 +02:00
Atgeirr Flø Rasmussen b568237c04 Merge pull request #3625 from atgeirr/bump-version 
Bump version.
 2021-10-25 09:06:06 +02:00
Atgeirr Flø Rasmussen 760099a692 Bump version. 2021-10-22 10:18:22 +02:00
Atgeirr Flø Rasmussen 8ae8e07212 Merge pull request #3609 from atgeirr/fix-init-order 
Silence init order and unused argument warnings
 2021-10-15 13:41:29 +02:00
Atgeirr Flø Rasmussen fc80451e3d Silence unused argument warning. 2021-10-15 13:26:44 +02:00
Atgeirr Flø Rasmussen 4c213b25e0 Order of initialization should match order of definition. 2021-10-15 13:24:55 +02:00
Atgeirr Flø Rasmussen 5e1853b8e4 Merge pull request #3588 from totto82/improve_switch_output 
make multiple well control switching output more readable
 2021-10-14 10:56:53 +02:00
Atgeirr Flø Rasmussen dead95ba18 Merge pull request #3519 from totto82/continueOnConvergenceFailure 
Option for continue on solver convergence failure
 2021-10-14 09:31:23 +02:00
Atgeirr Flø Rasmussen 347ad2da6b Reinstate tests that were commented out due to EclWellManager issues. 2021-10-13 11:10:48 +02:00
Atgeirr Flø Rasmussen 432f4d8247 Remove unused class EclPeacemanWell 2021-10-13 11:00:08 +02:00
Atgeirr Flø Rasmussen e6e8eab6d2 Remove unused EclWellManager class. 2021-10-13 10:56:33 +02:00
Atgeirr Flø Rasmussen 2da4165b3e Stop using EclWellManager in test_ecl_output.cc. 2021-10-13 10:55:05 +02:00
Atgeirr Flø Rasmussen 72be136529 Stop using EclWellManager in test_equil.cc. 2021-10-13 10:50:33 +02:00
Atgeirr Flø Rasmussen 54599f3fc6 Merge pull request #3603 from akva2/fix_mpi_double_finalize 
fixed: double call to MPI_Finalize
 2021-10-13 10:13:12 +02:00
Atgeirr Flø Rasmussen 7e5cd73254 Set communication object before constructing vanguard. 2021-10-06 08:52:19 +02:00
Atgeirr Flø Rasmussen 09a5320e21 Silence unused variable warning. 2021-10-06 08:52:06 +02:00
Atgeirr Flø Rasmussen e519bb32ec Use correct communicator in EclGenericVanguard::init(). 2021-10-06 08:51:31 +02:00
Atgeirr Flø Rasmussen d1391de639 Minor whitespace fixes. 2021-10-05 13:59:16 +02:00
Atgeirr Flø Rasmussen e5c85e88ce Merge pull request #3552 from fgfuchs/cuda_improvements 
cusparsesolver wrong size and type in cols,rows fixed
 2021-09-28 11:41:17 +02:00
Atgeirr Flø Rasmussen d1bfd48b6e Add missing include for unordered_map. 2021-09-09 12:17:54 +02:00
Atgeirr Flø Rasmussen 080cd410f2 Merge pull request #3244 from akva2/add_collective_comm 
add collective communication to generic vanguard
 2021-08-12 14:49:19 +02:00
Atgeirr Flø Rasmussen 38d68fbae4 Do not use C99 variable-length arrays. 2021-07-08 17:55:28 +02:00
Atgeirr Flø Rasmussen 3253a79693 Instantiate pack etc. for new integer type. 
The std::uint_fast64_t is used in WriteRestartFileEvents, from
opm-common.
 2021-07-08 17:55:28 +02:00
Atgeirr Flø Rasmussen 8c5a6b12d5 Merge pull request #3158 from totto82/operability_solve 
shut/stop unsolvable wells
 2021-06-18 10:13:14 +02:00
Atgeirr Flø Rasmussen be0515dcba Avoid warning by defining static variable inline. 2021-06-03 13:27:49 +02:00
Atgeirr Flø Rasmussen 8e6e1c3d5e Remove unused PhaseUsage data member. 2021-06-03 13:02:31 +02:00
Atgeirr Flø Rasmussen 52877883d8 Add virtual destructor for base class. 2021-06-03 13:01:56 +02:00
Atgeirr Flø Rasmussen 001648c8fb Make constants used in subclasses protected. 2021-05-24 11:24:14 +02:00
Atgeirr Flø Rasmussen dee7030784 Merge pull request #3273 from akva2/clang_cleanups 
Quell various clang warnings
 2021-05-21 09:22:31 +02:00
Atgeirr Flø Rasmussen 377d7eca60 Merge pull request #3271 from totto82/fixRESVpred 
BUGFIX fix direction of the resv check
 2021-05-18 19:05:17 +02:00
Atgeirr Flø Rasmussen 32d0854f14 Fix incorrect indices for 1 and 2-phase cases with MSW. 2021-05-18 15:32:15 +02:00
Atgeirr Flø Rasmussen fc8d17c04e Merge pull request #3164 from totto82/fixNOgrp 
honour group available for higher controll
 2021-04-20 11:13:27 +02:00
Atgeirr Flø Rasmussen c6431c2f04 Merge pull request #3042 from totto82/changeDefaultMinTimeStepShutting 
change default MinTimeStepBeforeShuttingProblematicWellsInDays to 0.01
 2021-04-07 08:04:05 +02:00
Atgeirr Flø Rasmussen 41063bc735 Merge pull request #3142 from bska/add-license-file 
Add LICENSE File
 2021-03-30 11:22:58 +02:00
Atgeirr Flø Rasmussen a05bb1a0b9 Merge pull request #3109 from fgfuchs/fix_infostep 
fix ordering of first line in *INFOSTEP files
 2021-03-11 15:31:07 +01:00
Atgeirr Flø Rasmussen 831f1db872 Merge pull request #3078 from fgfuchs/json_file_does_not_exist 
throw specific error if json file does not exist
 2021-02-24 14:13:14 +01:00
Atgeirr Flø Rasmussen 18a8d78f02 Merge pull request #3008 from GitPaean/cleaningup_after_aicd_pr 
refactoring the pressure assemble equations for ICD
 2021-01-22 08:26:16 +01:00
Atgeirr Flø Rasmussen 3a0dbdc6e7 Merge pull request #2993 from blattms/stdwell-comm-rebase-split-cont-clean 
Final fixes to make distributed wells work for Norne.
 2021-01-15 15:42:45 +01:00
Atgeirr Flø Rasmussen bf826c99c9 Merge pull request #3003 from totto82/setImbalanceTol 
dynamically set zoltan imbalance tolerance
 2021-01-07 08:25:41 +01:00
Atgeirr Flø Rasmussen 2cce4a1af5 Merge pull request #2962 from totto82/addFLowDynTest 
add flow solvent dynamic test
 2020-12-21 16:07:21 +01:00
Atgeirr Flø Rasmussen 02f93984f3 Merge pull request #2995 from totto82/stopfix 
don't shut stopped wells
 2020-12-21 15:51:36 +01:00
Atgeirr Flø Rasmussen d910d42f6e Only add AMG preconditioners to factory if sensible. 
Also add test using a new operator class, that would not compile
without the change.
 2020-12-17 14:54:59 +01:00
Atgeirr Flø Rasmussen 81419aa001 Merge pull request #2975 from totto82/dunify_aquifers 
Dunify aquifers
 2020-12-15 09:46:21 +01:00
Atgeirr Flø Rasmussen 2673af7db5 Merge pull request #2978 from joakim-hove/use-well-status 
Use enum Well::Status for well status in WellState
 2020-12-10 12:43:40 +01:00
Atgeirr Flø Rasmussen 6e87ec6266 Merge pull request #2955 from blattms/stdwell-comm-rebase-split-pwell-info 
Last part of current distributed standard wells.
 2020-12-10 08:56:00 +01:00
Atgeirr Flø Rasmussen f6353535c9 Merge pull request #2973 from blattms/include-config.h 
[bugfix] Include config.h in WellGroupHelpers.cpp
 2020-12-09 07:36:33 +01:00
Atgeirr Flø Rasmussen 6a376b3212 Merge pull request #2922 from atgeirr/make-new-well-rate-init-default 
Make --alternative-well-rate-init=true the default.
 2020-12-08 16:25:12 +01:00
Atgeirr Flø Rasmussen 5a1a2760f8 Merge pull request #2969 from atgeirr/silence-warnings 
Silence warnings.
 2020-12-08 16:23:42 +01:00
Atgeirr Flø Rasmussen dbb1d0e731 Silence warnings. 2020-12-08 09:33:07 +01:00
Atgeirr Flø Rasmussen 5477588a18 Merge pull request #2966 from blattms/use-custom-handle 
Use a custom handle for copying doubles for above.
 2020-12-07 12:05:26 +01:00
Atgeirr Flø Rasmussen 0269a36865 Merge pull request #2964 from atgeirr/add-missing-template 
Add missing template qualification.
 2020-12-07 10:13:25 +01:00
Atgeirr Flø Rasmussen d20641d97b Only modify initial rates for producers. 2020-12-07 10:05:46 +01:00
Atgeirr Flø Rasmussen a07ee07c66 Add missing template qualification. 2020-12-07 08:31:10 +01:00
Atgeirr Flø Rasmussen 83a6c2abae Merge pull request #2947 from blattms/fix-parallel-well-red 
Prepares for apply distributed standard wells.
 2020-12-04 20:32:30 +01:00
Atgeirr Flø Rasmussen 30856af1ab Merge pull request #2959 from blattms/fix-initCompletions 
[bugfix] Do not iterate pass end of perf_data_ in initCompletions
 2020-12-02 16:11:05 +01:00
Atgeirr Flø Rasmussen f34b286636 Merge pull request #2944 from goncalvesmachadoc/aquifer 
Remove unnecessary check for saturations
 2020-12-01 08:40:28 +01:00
Atgeirr Flø Rasmussen 374764fc6f Merge pull request #2946 from atgeirr/add-more-amg-options 
Add more AMG options to allow setting from JSON.
 2020-11-27 08:57:04 +01:00
Atgeirr Flø Rasmussen 5617a2ef5c Merge pull request #2919 from blattms/do-not-filter-distributed 
Do not filter connections on the schedule of the loadbalanced grid.
 2020-11-26 16:43:09 +01:00
Atgeirr Flø Rasmussen 6e31c77234 Add more AMG options to allow setting from JSON. 2020-11-26 15:37:50 +01:00
Atgeirr Flø Rasmussen a0ca8dd0b5 Use better-suited AMG criterion. 
Use SymmetricDependency instead of SymmetricMatrixDependency.
Our matrices are structurally symmetric, but not numerically symmetric.
 2020-11-25 16:40:03 +01:00
Atgeirr Flø Rasmussen d8800cc077 Merge pull request #2846 from bska/calc-wellpi-endoftimestep 
Unconditionally Calculate PI at End of Timestep
 2020-11-25 08:14:48 +01:00
Atgeirr Flø Rasmussen c880bc8688 Merge pull request #2939 from goncalvesmachadoc/aquifer 
Fix well mixture for single-phase
 2020-11-24 10:19:18 +01:00
Atgeirr Flø Rasmussen ea34c2c2df Merge pull request #2911 from atgeirr/network-add-glift 
Add the option to include gas lift for network calculations.
 2020-11-20 15:23:12 +01:00
Atgeirr Flø Rasmussen 69d04b7000 Set and communicate ALQ properly in parallel. 2020-11-20 08:03:21 +01:00
Atgeirr Flø Rasmussen e15db6a892 Merge pull request #2934 from blattms/stdwell-assign-totalrate-once 
StandardWell only assing primary_variables_[WQTotal] once.
 2020-11-20 07:54:43 +01:00
Atgeirr Flø Rasmussen 8716dbfcfd Add the option to include gas lift for network calculations. 2020-11-19 14:19:26 +01:00
Atgeirr Flø Rasmussen 307315a03d Merge pull request #2932 from atgeirr/glift-constify 
Make consistent use of const for alq-related state.
 2020-11-19 12:56:37 +01:00
Atgeirr Flø Rasmussen 376aecfad5 Store producer status, only call getALQ() for producers. 
As it was, the getALQ() call would insert injectors into the ALQ maps,
leading to trouble.

Also, this gets rid of the slightly weird thing that the output data
structure's producer/injector status was only set after creation,
in BlackoilWellModel::wellData().
 2020-11-19 11:22:25 +01:00
Atgeirr Flø Rasmussen 8a5203814b Make consistent use of const for alq-related state. 
A const well state was passed to functions that were modifying it by
calling setALQ(). Now the setALQ() method is made non-const, mutable
references to the well state are passed where sensible. The getALQ()
method uses map::at() instead of map::operator[] and no longer modifies
current_alq_. With this, it is now easy to see which methods modify the
well state and which don't. The alq-related members in the
WellStateFullyImplicitBlackoil class are no longer 'mutable'-qualified.
 2020-11-19 10:09:52 +01:00
Atgeirr Flø Rasmussen d69dbf598e Response to review comments. 2020-11-17 12:53:04 +01:00
Atgeirr Flø Rasmussen f967d82ad5 Make --alternative-well-rate-init=true the default. 2020-11-17 11:56:02 +01:00
Atgeirr Flø Rasmussen 82ecb1e7cd Implement addWellContributions() for MultisegmentWell. 2020-11-16 11:42:29 +01:00
Atgeirr Flø Rasmussen 963a8b640a Add the invertWithUMFPack() utility. 2020-11-16 11:37:44 +01:00
Atgeirr Flø Rasmussen db7cd1053f Add the multMatrixImpl() utility. 2020-11-16 11:37:44 +01:00
Atgeirr Flø Rasmussen cb928f90f0 Refactor per-perforation code into separate function. 
Also make some methods const.
 2020-11-16 11:19:03 +01:00
Atgeirr Flø Rasmussen 6f7e83a2ce Merge pull request #2916 from blattms/stdwell-comm-backport 
Parts of the distributed well work backported to original approach.
 2020-11-13 08:43:00 +01:00
Atgeirr Flø Rasmussen adfb8ef771 Merge pull request #2898 from blattms/always-accu-to-one-proc-as-default 
Always accumulates data in AMG to 1 process on coarse levels.
 2020-11-05 15:41:57 +01:00
Atgeirr Flø Rasmussen 778f486bcc Merge pull request #2871 from akva2/flow_object_libs 
changed: compile each flow simulator as a object library
 2020-10-27 11:54:13 +01:00
Atgeirr Flø Rasmussen 5d48923994 Merge pull request #2856 from plgbrts/temp 
fix temperature reporting for injectors
 2020-10-22 14:25:35 +02:00
Atgeirr Flø Rasmussen 7e737b143d Address review comments. 2020-10-21 09:50:31 +02:00
Atgeirr Flø Rasmussen e7d1d6603a Silence unused argument warning. 2020-10-19 09:13:37 +02:00
Atgeirr Flø Rasmussen 77099d1b65 Merge pull request #2863 from bska/fix-unused-gridforconn 
Move 'gridForConn' Into Cuda/OpenCL Block
 2020-10-19 07:48:47 +02:00
Atgeirr Flø Rasmussen 24b2393334 Add parameter --alternative-well-rate-init. 
With this, a slightly more sophisticated procedure is used for well rate intialization.
Since it changes existing results, it defaults to false, giving the existing behaviour.
 2020-10-15 17:56:11 +02:00
Atgeirr Flø Rasmussen 6155188a70 Remove unused file SimFIBODetails.hpp. 2020-10-15 16:35:35 +02:00
Atgeirr Flø Rasmussen 8eb4d1dc70 Implemented computeCurrentWellRates() for multisegment wells. 
Also add effect of rock compressibility on well connection transmissibility factors,
which was added to StandardWell earlier but not MultisegmentWell.
 2020-10-15 16:24:55 +02:00
Atgeirr Flø Rasmussen 7e87ea3200 Refactor to put updateWellStateRates() in base class. 2020-10-15 14:15:05 +02:00
Atgeirr Flø Rasmussen 52c695937b Implement extended network model. 2020-10-15 10:54:03 +02:00
Atgeirr Flø Rasmussen 2aeefc71c1 Merge pull request #2827 from totto82/timestepping 
add options for timestepping
 2020-10-13 14:25:26 +02:00
Atgeirr Flø Rasmussen 43d5d2c532 Merge pull request #2850 from atgeirr/silence-warnings 
Silence warnings from range-for.
 2020-10-13 08:19:48 +02:00
Atgeirr Flø Rasmussen ea0abd1331 Bugfix: do not substr() on too small strings. 2020-10-12 21:58:58 +02:00
Atgeirr Flø Rasmussen dedbe78cee Copyright additions. 2020-10-12 17:06:11 +02:00
Atgeirr Flø Rasmussen 316b28923d Rename parameter --linear-solver-configuration to --linsolver. 2020-10-12 17:03:00 +02:00
Atgeirr Flø Rasmussen f169cf90d8 Remove --linear-solver-configuration-file parameter. 
This is now handled by passing a string to --linear-solver-configuration that
ends with ".json".
 2020-10-12 16:41:09 +02:00
Atgeirr Flø Rasmussen f262eec9bf Silence warnings from range-for. 2020-10-12 09:39:37 +02:00
Atgeirr Flø Rasmussen 385880485a Fix logic of shouldCreateSolver(). 2020-10-11 22:46:02 +02:00
Atgeirr Flø Rasmussen 30a4fe55b0 Add "amg" option to --linear-solver-configuration. 2020-10-11 09:31:48 +02:00
Atgeirr Flø Rasmussen 842afd312e Refactor setupPropertyTree(). 2020-10-11 09:24:05 +02:00
Atgeirr Flø Rasmussen 00438c4860 Remove unused parts (not just comment out). 2020-10-11 08:44:21 +02:00