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
11,974 Commits 31 Branches 117 Tags
ced3c99e09e6fd4fcfe0d3baabd4dc9644aa99f5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Atgeirr Flø Rasmussen 0a70d95bee Refactor shouldCreateSolver(). 2020-10-11 08:20:19 +02:00
Atgeirr Flø Rasmussen 1c208e9a92 Avoid unnecessary extra matrix manipulation. 
When using the ParallelOverlappingILU0 it is not necessary to fix the overlap rows.
 2020-10-10 10:09:23 +02:00
Atgeirr Flø Rasmussen ac3004da9d Merge pull request #2847 from blattms/blackoilmodel-getLocalNonshutWells 
Added BlackoilWellModel::getLocalNonshutWells to reduce code duplicat…
 2020-10-09 16:35:50 +02:00
Atgeirr Flø Rasmussen 65817c9068 Removed old amg/cpr code that can be replaced. 
The replacement consists of using the FlexibleSolver code.
 2020-10-08 15:12:41 +02:00
Atgeirr Flø Rasmussen f528adb604 Merge pull request #2837 from blattms/fix-parallel-average-formation-factors 
Fixes parallel computation of average formation factors.
 2020-10-06 19:37:12 +02:00
Atgeirr Flø Rasmussen 0aa3f51eb7 Merge pull request #2836 from akva2/avoid_macro 
avoid usage of property system macro
 2020-10-05 09:54:53 +02:00
Atgeirr Flø Rasmussen f6569b6a4f Merge pull request #2832 from alfbr/improve-output 
Improve output
 2020-10-05 08:49:09 +02:00
Atgeirr Flø Rasmussen aa5db0ddcf Merge pull request #2833 from hakonhagland/override 
Fix inconsistent-missing-override warnings
 2020-10-04 23:09:02 +02:00
Atgeirr Flø Rasmussen 30cab9dbe6 Merge pull request #2819 from totto82/rocktab 
Add support for ROCKTAB
 2020-10-01 09:32:31 +02:00
Atgeirr Flø Rasmussen c6203e9bec Add command line parameter --serial-partitioning. 2020-09-29 16:14:45 +02:00
Atgeirr Flø Rasmussen 0096035a97 Merge pull request #2818 from totto82/updateHystTime 
Change when hysteresis and vappers are updated
 2020-09-29 15:59:56 +02:00
Atgeirr Flø Rasmussen 64f9f1431b Merge pull request #2809 from GitPaean/fixing_ct_aquifer 
fixing the initialization of aquifer pressure for CT aquifer
 2020-09-28 12:28:02 +02:00
Atgeirr Flø Rasmussen 0cdd1eda69 Merge pull request #2812 from totto82/fixBC_2p 
fix BC code for 2p simulations.
 2020-09-28 09:51:01 +02:00
Atgeirr Flø Rasmussen e8460b384e Merge pull request #2804 from totto82/updateAndInvalid 
Invalidate and update the intensive quantities at the same time
 2020-09-28 09:02:25 +02:00
Atgeirr Flø Rasmussen b5c5c28c16 Merge pull request #2788 from alfbr/new-defaults 
New numerical defaults
 2020-09-28 08:57:08 +02:00
Atgeirr Flø Rasmussen 1aa1c2d322 Merge pull request #2800 from atgeirr/hnil-standard_nonlinearsolve 
Replace root finder with opm-common implementation
 2020-09-26 17:11:24 +02:00
Atgeirr Flø Rasmussen 237b281f09 Merge pull request #2802 from blattms/refactor-defunct-wells 
Refactored how well information is exported after load balancing.
 2020-09-23 08:54:35 +02:00
Atgeirr Flø Rasmussen 68add695fe Merge pull request #2735 from hakonhagland/python_step2 
Implements a Python step() method.
 2020-09-22 15:47:48 +02:00
Atgeirr Flø Rasmussen 04732f596b Merge pull request #2794 from bska/prepare-nodepress-smry-output 
Chase Group/Node Summary API Update
 2020-09-21 09:21:46 +02:00
Atgeirr Flø Rasmussen 8dffd39b0a Rewrite communicateGroupRates() to do a single sum(). 2020-09-18 09:50:41 +02:00
Atgeirr Flø Rasmussen 0816e21846 Merge pull request #2787 from akva2/fix_optional_deserialization 
Fix optional deserialization
 2020-09-16 09:41:53 +02:00
Atgeirr Flø Rasmussen 76384344ca Merge pull request #2777 from GitPaean/adding_well_assembly_timing 
adding timing for the well assembly
 2020-09-08 16:02:16 +02:00
Atgeirr Flø Rasmussen 3dffb5d4da Use log mechanism for info output, and tell the user the deck has been read. 2020-09-03 15:11:25 +02:00
Atgeirr Flø Rasmussen 92bdcbf597 Reinstate lost logging of header and parameters. 
Also re-add the ability to do strict parsing.
 2020-09-03 14:07:33 +02:00
Atgeirr Flø Rasmussen 4f7421d64d Merge pull request #2746 from bska/restart-active-group-constraints 
Restore Groups' Active Constraints on Restart
 2020-09-03 10:35:55 +02:00
Atgeirr Flø Rasmussen 8d999ad448 Merge pull request #2664 from GitPaean/addinginneritartionsstdwell 
Adding inner iterations for standard wells.
 2020-08-11 16:37:00 +02:00
Atgeirr Flø Rasmussen 3a0469cde1 Merge pull request #2704 from bska/remove-basic-warning 
Cell Data: Don't Warn About Supported Output Directives
 2020-07-28 15:52:59 +02:00
Atgeirr Flø Rasmussen af413f474c Merge pull request #2715 from atgeirr/fix-opencl-cmake 
Fix CMake variable case bug.
 2020-07-28 13:17:13 +02:00
Atgeirr Flø Rasmussen 0205f54caf Fix CMake variable case bug. 
This caused compile failure on a system without the c++ OpenCL binding header cl.hpp.
 2020-07-28 12:42:55 +02:00
Atgeirr Flø Rasmussen f2395f6d94 Merge pull request #2695 from totto82/addBrineOutput 
Add brine to output
 2020-07-01 11:46:23 +02:00
Atgeirr Flø Rasmussen a66260fe87 Merge pull request #2684 from totto82/convertUsingPriviousRates 
use rates from previous time-step in the guiderate conversion
 2020-07-01 11:04:22 +02:00
Atgeirr Flø Rasmussen 4448d8f5ed Merge pull request #2691 from bska/prepare-guiderate-smry 
EclWriter: Refactor Cell Loop out to Helper Function
 2020-07-01 10:48:03 +02:00
Atgeirr Flø Rasmussen 3554fae75b Merge pull request #2693 from totto82/addOilWaterBrine 
Add oil water brine specialization
 2020-07-01 09:58:45 +02:00
Atgeirr Flø Rasmussen c94eec872f Allow well operators with FlexibleSolver. 2020-06-30 12:33:57 +02:00
Atgeirr Flø Rasmussen 8b67b23c6e Merge pull request #2687 from atgeirr/improve-preconditioner-factory 
Make ghost-last feature available in PreconditionerFactory.
 2020-06-26 14:38:42 +02:00
Atgeirr Flø Rasmussen c59f4f7118 Make ghost-last feature available in PreconditionerFactory. 2020-06-25 10:56:11 +02:00
Atgeirr Flø Rasmussen 02be5d1ced Merge pull request #2686 from atgeirr/separate-wellops 
Move well operators to separate file, and generalize
 2020-06-25 10:53:04 +02:00
Atgeirr Flø Rasmussen c2c79f0903 Move well operators to separate file. 
Also introduce new class WellModelAsLinearOperator making a well model
into an actual Dune::LinearOperator, this prevents the TypeTag dependent
type from leaking into the type of the WellModelMatrixAdapter instantiation.

As a side benefit, the adapter classes can now adapt (i.e. combine with a
matrix operator) any linear operator.
 2020-06-25 10:13:12 +02:00
Atgeirr Flø Rasmussen 7a69db02de Merge pull request #2685 from blattms/fix-owner-cells-not-first 
Alternative fix running in parallel with --owner-cells-first=false
 2020-06-25 00:29:58 +02:00
Atgeirr Flø Rasmussen d3efb01e89 Merge pull request #2645 from hakonhagland/refac_fullyimpl 
Refactor run() in `SimulatorFullyImplicitBlackoilEbos.hpp`
 2020-06-24 16:35:09 +02:00
Atgeirr Flø Rasmussen 3766f19de3 Merge pull request #2680 from atgeirr/minor-flexible-solver-improvements 
Minor flexible solver improvements
 2020-06-21 14:37:01 +02:00
Atgeirr Flø Rasmussen c58456faae Add missing include. 2020-06-20 16:28:59 +02:00
Atgeirr Flø Rasmussen 427eac5132 Use macro for instantiations, and clean up includes. 2020-06-19 16:37:43 +02:00
Atgeirr Flø Rasmussen 171656144f Install FlexibleSolver_impl.hpp for downstream users. 2020-06-19 16:04:27 +02:00
Atgeirr Flø Rasmussen fb99dd6fee Use unique_ptr rather than shared_ptr. 2020-06-19 16:03:46 +02:00
Atgeirr Flø Rasmussen 226697ec6f Merge pull request #2679 from akva2/janitoring 
make parseSuccess dependent on MPI
 2020-06-19 15:10:38 +02:00
Atgeirr Flø Rasmussen 5105b80e50 Merge pull request #2667 from atgeirr/flexible-solver-separate-compile-unit 
Use explicit instantiation for FlexibleSolver to reduce compile times.
 2020-06-19 15:03:30 +02:00
Atgeirr Flø Rasmussen faddef0321 Do not instantiate things requiring MPI when HAVE_MPI is false. 2020-06-19 10:01:16 +02:00
Atgeirr Flø Rasmussen 678756b9e1 Merge pull request #2678 from joakim-hove/fix-sequential 
Add actionState argument also for non MPI branch
 2020-06-19 06:54:16 +02:00
Atgeirr Flø Rasmussen e4ea932a9d Merge pull request #2661 from totto82/fixUpwindMSW_clean 
Fix upwinding for friction, acceleration, valve and SIGD for MSW
 2020-06-18 11:40:31 +02:00
Atgeirr Flø Rasmussen dcd5d21415 Split constructor to reduce instantiation. 
Without the split, certain combinations with Dune::Amg::SequentialInformation
as template argument for Comm needlessly get instantiated.
 2020-06-18 08:28:20 +02:00
Atgeirr Flø Rasmussen 3784ab9d77 Amended copyrights and made the _impl.hpp a proper header file. 2020-06-17 21:07:13 +02:00
Atgeirr Flø Rasmussen f24b2cd708 Split instantiation files to enable parallel build. 2020-06-17 13:03:57 +02:00
Atgeirr Flø Rasmussen 2dc2e053d1 Change order of constructor arguments. 
This allows simplification, and having just two constructors.
 2020-06-17 09:31:19 +02:00
Atgeirr Flø Rasmussen a6d186551b Use explicit instantiation for FlexibleSolver to reduce compile times. 2020-06-17 07:43:30 +02:00
Atgeirr Flø Rasmussen 9c552ec812 Merge pull request #2675 from totto82/changeRstTest 
change MSW restart test to read the schedule
 2020-06-16 19:48:13 +02:00
Atgeirr Flø Rasmussen 16a599684d Merge pull request #2672 from akva2/fix_harmless_ubsan 
changed: delay deck dereference
 2020-06-15 10:42:44 +02:00
Atgeirr Flø Rasmussen dd8e42958a Prettifying and reducing log output from MSW. 2020-06-10 16:36:17 +02:00