OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,532 Commits 31 Branches 117 Tags
83fc76e6a3d3c67bcdba34bd39fe21b688a18c32
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen dbd8b323da Merge pull request #1721 from fgfuchs/parallel_well_logging 
Correct Logging for Black Oil Well Model for parallel runs
 2019-02-06 11:38:29 +01:00
Atgeirr Flø Rasmussen b471b89890 Merge pull request #1718 from andlaus/mea_culpa 
Properly adapt to the new linear solver API used by eWoms
 2019-02-01 15:45:45 +01:00
Atgeirr Flø Rasmussen e39f68787f Merge pull request #1715 from atgeirr/fix-missing-virtual-destructor 
Add virtual destructor to base class.
 2019-01-21 21:58:15 +01:00
Atgeirr Flø Rasmussen 7c30ee46ce Merge pull request #1713 from fgfuchs/replace_well_switching_logger 
Replace well switching logger
 2019-01-21 21:56:56 +01:00
Atgeirr Flø Rasmussen 6b6daa228a Add virtual destructor to base class. 2019-01-21 15:05:05 +01:00
Atgeirr Flø Rasmussen 037367bb03 Merge pull request #1714 from akva2/janitoring 
Some janitoring
 2019-01-21 15:00:58 +01:00
Atgeirr Flø Rasmussen a00972dc0b Merge pull request #1712 from andlaus/fix_ebos_convergence 
adapt to the new preparation procedure of ewoms linear solvers
 2019-01-21 14:54:09 +01:00
Atgeirr Flø Rasmussen f9f02724b9 Merge pull request #1710 from blattms/fix-parallel-well-hasTHPConstraints 
Make BlackoilWellModel::hasTHPConstraints() work correctly in parallel.
 2019-01-15 09:50:55 +01:00
Atgeirr Flø Rasmussen 1b79501060 Merge pull request #1709 from bska/deferredlogger-openmpi-18 
Deferred Logger: Support Older MPI Implementations
 2019-01-15 09:34:06 +01:00
Atgeirr Flø Rasmussen 8927df3095 Merge pull request #1705 from fgfuchs/feature_gatherdeferredlogger 
gather deferredLogger implemented
 2019-01-14 14:56:45 +01:00
Atgeirr Flø Rasmussen 9ea723a83e Merge pull request #1704 from joakim-hove/create-all-objects 
Create all objects
 2019-01-14 10:50:47 +01:00
Atgeirr Flø Rasmussen 4cd8eba331 Merge pull request #1618 from totto82/change_to_linear_solver_api_from_ewoms 
Adapt to linear solver api from ewoms
 2019-01-11 10:21:44 +01:00
Atgeirr Flø Rasmussen 578923f93a Merge pull request #1685 from GitPaean/sliencing_extra_ 
removing some white spaces.
 2019-01-10 14:52:41 +01:00
Atgeirr Flø Rasmussen 601cce155c Merge pull request #1693 from GitPaean/ignoring_well_no_perf 
not adding wells without perforations to WellsManager
 2019-01-10 14:47:20 +01:00
Atgeirr Flø Rasmussen 9c799b9c97 Merge pull request #1698 from fgfuchs/new-feature-deferredlogger 
New feature deferredlogger
 2019-01-09 07:27:49 +01:00
Atgeirr Flø Rasmussen 480fa1fd44 Merge pull request #1697 from GitPaean/removing_dynamiclisteconlimited 
removing DynamicListEconLimited
 2019-01-08 12:17:54 +01:00
Atgeirr Flø Rasmussen 9ba0184da4 Merge pull request #1676 from GitPaean/fixing_grid_indices 
fixing grid_index for AquiferCarterTracy
 2019-01-02 15:32:28 +01:00
Atgeirr Flø Rasmussen 10c77257ad Fix missing GRAT in switch. 2019-01-02 15:29:22 +01:00
Atgeirr Flø Rasmussen 7771725e4c Merge pull request #1683 from GitPaean/using_msw_test_msw_model_1 
adding --use-multisegment-well=true to msw-model-1 test
 2019-01-02 12:51:03 +01:00
Atgeirr Flø Rasmussen 483d6c50e1 Merge pull request #1681 from atgeirr/fix-shutting-new-well 
Avoid opening well that was shut on same time step.
 2018-12-17 11:47:31 +01:00
Atgeirr Flø Rasmussen a48fbac322 Merge pull request #1680 from GitPaean/flow_polymw_remake 
adding the simulator for flow injectivity study
 2018-12-17 10:26:41 +01:00
Atgeirr Flø Rasmussen b1c16e536b Avoid opening well that was shut on same time step. 2018-12-14 10:04:59 +01:00
Atgeirr Flø Rasmussen 51d85d25d1 Merge pull request #1678 from atgeirr/fix-throw-before-storing-report 
Move throw-if-nan to after storing convergence report.
 2018-12-13 11:15:03 +01:00
Atgeirr Flø Rasmussen 56cc37f255 Move throw-if-nan to after storing convergence report. 2018-12-11 13:10:22 +01:00
Atgeirr Flø Rasmussen eeb17b460f Merge pull request #1677 from joakim-hove/version 
Add special case handling of commandline argument "--version"
 2018-12-10 10:07:05 +01:00
Atgeirr Flø Rasmussen 69cd2f9b84 Merge pull request #1668 from totto82/remove_logging 
Remove repetitive logging info
 2018-12-07 10:53:31 +01:00
Atgeirr Flø Rasmussen cb06770b54 Merge pull request #1638 from trinemykk/addtracer 
add method for getting the surfacevolume well connection rate
 2018-12-07 10:38:21 +01:00
Atgeirr Flø Rasmussen cf687c19fb Merge pull request #1571 from kel85uk/fix_#14_aquifer_making_connections 
Fixes for carter tracy aquifer model
 2018-12-07 09:56:36 +01:00
Atgeirr Flø Rasmussen e3c0a21d6d Merge pull request #1664 from GitPaean/removing_some_repeated_code_phase_usage 
removing some repeated code in phaseUsageFromDeck
 2018-12-03 14:32:00 +01:00
Atgeirr Flø Rasmussen 23edd39c63 Revise logic of shutting wells vs. chopping step. 
An infinite loop was possible if no wells were actually shut,
yet the step was restarted with no chopping.
 2018-12-03 13:25:19 +01:00
Atgeirr Flø Rasmussen 6b896d178e Add bool return value to forceShutWellByNameIfPredictionMode(). 
Returns true if the well requested was actually shut.
 2018-12-03 13:24:34 +01:00
Atgeirr Flø Rasmussen 7b550ba06c Merge pull request #1662 from akva2/remove_files 
remove files moved to opm-simulators-legacy
 2018-11-27 11:35:05 +01:00
Atgeirr Flø Rasmussen b6f8128260 Merge pull request #1661 from akva2/removeBlackoilStateCorr 
Remove usage of BlackoilState class
 2018-11-27 10:14:06 +01:00
Atgeirr Flø Rasmussen a95e7f60d1 Merge pull request #1659 from atgeirr/fix-wtest-parallel 
Fix WTEST in parallel
 2018-11-26 11:03:54 +01:00
Atgeirr Flø Rasmussen 7e91381cd8 Fix another parallel bug. 
A WellSwitchingLogger was created in a local context (meaning not
all processes might be there), but since its destructor does
communication it must be called in a global context (guaranteeing
that all processes create it).
 2018-11-26 10:21:25 +01:00
Atgeirr Flø Rasmussen 09405ce6f5 Fix bug in parallel case. 
Since computeAverageFormationFactor() involves communication to reduce
values across the whole reservoir, it must be called by all processes,
also those with no wells to reopen.
 2018-11-26 09:39:54 +01:00
Atgeirr Flø Rasmussen cc1d22b35c Merge pull request #1657 from GitPaean/welltesting_physical_reason 
first version of the well testing for physical reason
 2018-11-26 09:32:46 +01:00
Atgeirr Flø Rasmussen 4343ae6be0 Merge pull request #1654 from atgeirr/optimize-parilu0 
Avoid in-loop allocation in convertToCRS().
 2018-11-23 22:24:54 +01:00
Atgeirr Flø Rasmussen 48db4062b5 Count lower/upper entries simpler and faster. 2018-11-23 21:38:22 +01:00
Atgeirr Flø Rasmussen 8a038401ce Avoid in-loop allocation in convertToCRS(). 
This is done by counting entries first.
 2018-11-23 21:38:22 +01:00
Atgeirr Flø Rasmussen e66af25d0d Merge pull request #1658 from atgeirr/shutdown-chopping-wells 
Shut time-chopping wells
 2018-11-23 13:56:47 +01:00
Atgeirr Flø Rasmussen 8bd3cbc1c1 Only shut down wells if under prediction-type control. 2018-11-23 12:51:13 +01:00
Atgeirr Flø Rasmussen d8882fe263 Merge pull request #1655 from akva2/remove_legacy_update 
remove legacy tests from update data script
 2018-11-22 19:13:48 +01:00
Atgeirr Flø Rasmussen 1979fc8f5d Avoid deep chopping by shutting down misbehaving wells. 2018-11-22 16:24:52 +01:00
Atgeirr Flø Rasmussen 422d477945 Add method BlackoilWellModel::forceShutWellByName(). 2018-11-22 16:24:17 +01:00
Atgeirr Flø Rasmussen 3bbc13a9ce Add step numbers to convergence reports, add query method. 2018-11-22 11:14:39 +01:00
Atgeirr Flø Rasmussen 9167d08839 Limit timestep when we have THP constraints present. 
Using 16 days as the current limit. Could be made a user parameter.
 2018-11-22 11:03:18 +01:00
Atgeirr Flø Rasmussen 7f677154b4 Merge pull request #1648 from GitPaean/welloperability_checking 
[WIP] Welloperability checking
 2018-11-22 09:03:53 +01:00
Atgeirr Flø Rasmussen 4337483ac6 Merge pull request #1639 from atgeirr/store-convrep 
Store ConvergenceReport objects
 2018-11-19 15:13:14 +01:00
Atgeirr Flø Rasmussen 83ce1eb919 Ensure all residuals are checked for convergence. 
Looping over all components instead of phases, to handle polymer etc.
correctly. Also slight refactoring of how component names for output
are handled.
 2018-11-19 14:46:31 +01:00
Atgeirr Flø Rasmussen b42165b560 Store convergence reports from all steps and iterations. 2018-11-19 11:48:07 +01:00
Atgeirr Flø Rasmussen fe79a9fc07 Refactor getConvergence() to use ConvergenceReport. 
Note: the communication and reduction for computing reservoir
convergence is not done by gathering ConvergenceReports, but
as before, using the convergenceReduction() method.
 2018-11-19 11:48:07 +01:00
Atgeirr Flø Rasmussen c006ea23f2 Merge pull request #1651 from totto82/speed_up_add_cell_rates 
Speed up add cell rates
 2018-11-19 10:49:19 +01:00
Atgeirr Flø Rasmussen 339c7a5043 Merge pull request #1650 from akva2/fix_install_matrixblock 
fixed: install MatrixBlock.hpp
 2018-11-19 09:01:17 +01:00
Atgeirr Flø Rasmussen b5cb7bb829 Merge pull request #1644 from GitPaean/fixing_control_initialization 
using control in DECK to initialize the control in WellState
 2018-11-16 15:38:22 +01:00
Atgeirr Flø Rasmussen 8b09803bc2 Merge pull request #1646 from akva2/split_legacy 
Remove legacy simulators
 2018-11-16 15:17:09 +01:00
Atgeirr Flø Rasmussen 92a9b5fa9b Avoid using legacy stuff for ebos linear solvers. 2018-11-16 12:06:12 +01:00
Atgeirr Flø Rasmussen 7896c2f334 Merge pull request #1636 from GitPaean/update_IPR 
update well state with THP target based on inflow performance relationship
 2018-11-15 18:01:34 +01:00
Atgeirr Flø Rasmussen 0761850e7a Merge pull request #1637 from OPM/fix-gather-convergemcereport-for-openmpi 
Make MPI calls in gatherConvergenceReport with void*.
 2018-11-15 11:04:35 +01:00
Atgeirr Flø Rasmussen 8b376f9b14 Merge pull request #1634 from atgeirr/fix-missing-includes-matrixblock 
Add missing includes
 2018-11-14 21:11:45 +01:00
Atgeirr Flø Rasmussen 5e51d6982b Add missing includes. 2018-11-14 21:09:40 +01:00
Atgeirr Flø Rasmussen 258c019989 Merge pull request #1617 from andlaus/sparse_matrix_abstraction 
Sparse matrix abstraction
 2018-11-14 16:14:00 +01:00
Atgeirr Flø Rasmussen db8c00db00 Merge pull request #1632 from akva2/use_istl_ebos 
Use ebos ISTL class
 2018-11-14 15:44:26 +01:00
Atgeirr Flø Rasmussen 44dc9b22bc Merge pull request #1622 from GitPaean/updating_thp_when_VFPActive 
Updating thp when valid VFP table is specified
 2018-11-14 15:00:14 +01:00
Atgeirr Flø Rasmussen 49a7773b30 Merge pull request #1630 from akva2/split_vfp 
Split VFP classes in ebos and legacy
 2018-11-14 11:04:05 +01:00
Atgeirr Flø Rasmussen e1e39b4bd9 Merge pull request #1626 from GitPaean/fixing_different_number_of_wells_due_to_wtest 
fixing different well number between Wells and Well_containers
 2018-11-14 09:37:09 +01:00
Atgeirr Flø Rasmussen 54cc52dcaf Merge pull request #1629 from akva2/remove_rogue_includes 
remove two rogue includes
 2018-11-14 09:06:13 +01:00
Atgeirr Flø Rasmussen 3de0f25535 Merge pull request #1627 from atgeirr/fix-nompi-build 
Add missing include for std::vector.
 2018-11-13 21:10:40 +01:00
Atgeirr Flø Rasmussen 8d2bc0e449 Add missing include for std::vector. 2018-11-13 20:26:44 +01:00
Atgeirr Flø Rasmussen 58642254e0 Merge pull request #1624 from akva2/split_mpi_func 
split mpi function from newtoniterationutilities
 2018-11-13 19:21:56 +01:00
Atgeirr Flø Rasmussen d858f2901a Merge pull request #1614 from totto82/well_ppp 
Output of well potential when asked for
 2018-11-13 14:29:58 +01:00
Atgeirr Flø Rasmussen 446dbdf86d Use gatherConvergenceReport(). 
This avoids multiple all-reduce blocks, simplifying the code and
enabling us to return the report from getWellConvergence().
 2018-11-13 14:02:55 +01:00
Atgeirr Flø Rasmussen 6e7cc756de Move implementation of gatherConvergenceReport() to cpp file. 
No templates involved, no reason to keep it in header. This also makes
building more robust by only invoking HAVE_MPI in the cpp file, after
including config.h.
 2018-11-13 14:01:01 +01:00
Atgeirr Flø Rasmussen a9aacb7960 Run the "gatherconvergencereport" test in parallel. 2018-11-13 10:31:23 +01:00
Atgeirr Flø Rasmussen 9fc272fb85 Add runner script for tests needing MPI. 
The script run-parallel-unitTest.sh takes as its arguments:
 - number of processes (to be passed as -np parameter to mpirun)
 - directory in which to find the binary to be executed
 - remaining arguments form the command line for the test.
 2018-11-13 10:31:23 +01:00
Atgeirr Flø Rasmussen 566f6813dd Created gatherConvergenceReport() function and test. 2018-11-13 10:30:32 +01:00
Atgeirr Flø Rasmussen 48b0024855 Refactor BlackoilModelEbos::getConvergence(). 
The loop over elements to extract data has been moved to a separate
function localConvergenceData().
 2018-11-13 10:19:15 +01:00
Atgeirr Flø Rasmussen 576852b299 Remove cell_index from ReservoirFailure struct. 2018-11-13 10:19:15 +01:00
Atgeirr Flø Rasmussen 58eedf0d65 Merge pull request #1615 from GitPaean/using_events_for_well_states_2 
detecting whether some well control events happens to a well
 2018-11-13 07:42:19 +01:00
Atgeirr Flø Rasmussen d562df9d8a Merge pull request #1597 from GitPaean/avoiding_overshoot_fractions 
relaxation to avoid overshoot of fractions of StandardWell
 2018-11-12 14:20:52 +01:00
Atgeirr Flø Rasmussen 19e89b470b Merge pull request #1555 from totto82/use_ewoms_well_api 
Use ewoms well api for the well model
 2018-11-09 08:35:53 +01:00
Atgeirr Flø Rasmussen 8f62670c1e Merge pull request #1611 from totto82/productivity_index 
Compute well productivity index and pass it to the output
 2018-11-08 09:30:46 +01:00
Atgeirr Flø Rasmussen 9d6a9b4aa2 Merge pull request #1604 from andlaus/ebos_aquifers 
let aquifers be managed by core ebos
 2018-11-02 10:33:13 +01:00
Atgeirr Flø Rasmussen 985b1b17f0 Merge pull request #1608 from andlaus/fix_2p_wells 
well model: fix valgrind complaints if either oil or gas are disabled
 2018-10-31 15:16:56 +01:00
Atgeirr Flø Rasmussen 671ed75535 Made ReservoirFailure and WellFailure into classes. 2018-10-25 13:08:16 +02:00
Atgeirr Flø Rasmussen 852765a65b Address review comments. 2018-10-25 12:12:06 +02:00
Atgeirr Flø Rasmussen 2bf4d15285 Rename ConvergenceStatus -> ConvergenceReport. 2018-10-25 11:57:47 +02:00
Atgeirr Flø Rasmussen 2bef8d7017 Use infinity as too-large boundary for multisegment pressure equation. 
This is to preserve current behaviour. Infinity is used in the test
currently, rather than the provided parameter (that is only used for
mass balance/flux equations).
 2018-10-24 21:43:26 +02:00
Atgeirr Flø Rasmussen cb72c882ea Merge pull request #1603 from andlaus/one_reading_deckfile_message 
flow: print the "reading deck file" message only once
 2018-10-24 21:25:58 +02:00
Atgeirr Flø Rasmussen 08e26f523d Merge pull request #1599 from andlaus/fast_banner 
flow: print the startup banner immediately
 2018-10-24 15:12:38 +02:00
Atgeirr Flø Rasmussen f9fae47f23 Use ConvergenceStatus in well subsystem. 2018-10-23 14:05:19 +02:00
Atgeirr Flø Rasmussen 37d4327ce3 Add Pressure equation type (for multisegment wells). 2018-10-23 14:04:27 +02:00
Atgeirr Flø Rasmussen 42cb36ab9f Improve severity feature, add severityOfWorstFailure(). 2018-10-23 11:28:32 +02:00
Atgeirr Flø Rasmussen 34afb0b254 Add severity (normal, too large, nan) to failure objects. 2018-10-23 10:52:34 +02:00
Atgeirr Flø Rasmussen 892b24c435 Make well failure types more informative. 
Separating control eq failures with THP, BHP and Rate.
 2018-10-23 10:26:39 +02:00
Atgeirr Flø Rasmussen 891912b04a Add ConvergenceFailure class and test. 2018-10-23 10:03:13 +02:00
Atgeirr Flø Rasmussen 949b88d5c6 Merge pull request #1582 from alfbr/master 
Increase default maximum iterations for both non-linear and linear solver
 2018-09-27 10:28:52 +02:00
Atgeirr Flø Rasmussen 46416008e6 Merge pull request #1566 from blattms/fix-parallel-file-merge 
[bugfix] Make parallel file merge work again for any --output-dir.
 2018-09-24 13:58:20 +02:00
Atgeirr Flø Rasmussen 1f7b8aa9d1 Merge pull request #1581 from blattms/fix-issue-1574-and-more 
Remove dead code.
 2018-09-24 13:37:32 +02:00
Atgeirr Flø Rasmussen c4c461b389 Merge pull request #1558 from totto82/changeDefaultTolMB 
Change default ToleranceMB from 1e-5 to 1e-6
 2018-08-27 16:09:09 +02:00