OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 08:54:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,571 Commits 31 Branches 117 Tags
84a8143bad466f14439341c970752bbb3625a1cd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 84a8143bad Improved parameter hierarchy and const-correctness. 2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen a76b19d95a Make FlexibleSolver feature-complete. 
In particular:
 - Add parallel solvers and preconditioners.
 - Add the update() interface to preconditioners, and use it with CPR.
 2019-06-03 11:42:30 +02:00
Atgeirr Flø Rasmussen 2cc22f99cb Merge pull request #1868 from andlaus/sparse_matrix_adapter_from_linear_solver 
set the SparseMatrixAdapter property in the linear solver type tag
 2019-05-31 20:40:10 +02:00
Atgeirr Flø Rasmussen 2d0cd0ecfe Merge pull request #1869 from GitPaean/adding_comment_getsegmentrateupwinding 
adding some comments about getSegmentRateUpwinding()
 2019-05-31 20:37:16 +02:00
Atgeirr Flø Rasmussen ff2965e346 Merge pull request #1862 from GitPaean/fixing_multisegment_wells_cleaning_up_restarting_test_1 
adding function updateUpwindingSegments() for MSW
 2019-05-29 10:09:08 +02:00
Atgeirr Flø Rasmussen f3b21f8ead Merge pull request #1861 from totto82/fixFPRP 
Fix FPRP output
 2019-05-29 09:59:46 +02:00
Atgeirr Flø Rasmussen c554fdb5fb Merge pull request #1802 from totto82/addWellPotMSW 
Add well potential output to MSW
 2019-05-27 15:31:21 +02:00
Atgeirr Flø Rasmussen 025b828e80 Merge pull request #1855 from totto82/fix_throw 
throw runtime_error instead of logic_error
 2019-05-22 11:39:09 +02:00
Atgeirr Flø Rasmussen 4e5aab5f14 Merge pull request #1829 from GitPaean/different_control_different_tolerance 
letting getResidualMeasureValue() use the same criterion as getWellConvergence()
 2019-05-16 13:36:03 +02:00
Atgeirr Flø Rasmussen 41ef80dd7d Merge pull request #1842 from blattms/always-print-version-if-requested 
If requested always print version and exit.
 2019-05-15 15:13:24 +02:00
Atgeirr Flø Rasmussen 6f4c737700 Merge pull request #1847 from blattms/print-missing-deck-only-on-master 
Let only master process print information about exception.
 2019-05-15 15:10:24 +02:00
Atgeirr Flø Rasmussen 3ac8e0a736 Merge pull request #1837 from totto82/summaryState 
add a summary state member in eclproblem
 2019-05-14 09:25:51 +02:00
Atgeirr Flø Rasmussen 8197bcfc54 Merge pull request #1832 from GitPaean/upding_well_control_inner_msw 
updating well control during iterateWellEquations in MSW
 2019-05-13 12:47:10 +02:00
Atgeirr Flø Rasmussen c2db2042ea Merge pull request #1825 from dr-robertk/PR/fix-istl-shared-ptr 
Adjust to shared_ptr change in dune-istl >= 2.7.
 2019-05-13 09:01:29 +02:00
Atgeirr Flø Rasmussen 1a8453e52a Merge pull request #1834 from GitPaean/fixing_output 
moving the output of the `Report step` information earlier
 2019-05-13 07:28:27 +02:00
Atgeirr Flø Rasmussen fe6d2376be Merge pull request #1822 from atgeirr/move-linalg-code 
Moved files to opm/simulators/ subdirs.
 2019-05-08 13:46:10 +02:00
Atgeirr Flø Rasmussen c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00
Atgeirr Flø Rasmussen b5f343a414 Update version to 2019.10-pre. 2019-04-30 15:37:47 +02:00
Atgeirr Flø Rasmussen 32572ac2ab Clear DeferredLogger's message container after logging. 
This keeps from logging the same messages again. Also add clearMessages()
method, which is useful to clear the local container after gathering into
a global container (which leaves the local containers untouched).
 2019-04-30 12:24:31 +02:00
Atgeirr Flø Rasmussen ad1eb4ae04 Merge pull request #1808 from GitPaean/correcting_mistake_pr1803 
Correcting a small assertion mistake introduce in PR#1803
 2019-04-30 12:22:08 +02:00
Atgeirr Flø Rasmussen 9bbb0ef679 Merge pull request #1807 from atgeirr/enable-msw-by-default 
Enable multi-segment wells by default.
 2019-04-28 23:13:16 +02:00
Atgeirr Flø Rasmussen 9b583ef936 Merge pull request #1806 from blattms/fix-editnnc-application 
[bugfix] Use NNC data with applied EDITNCC for transmissibility.
 2019-04-28 16:21:17 +02:00
Atgeirr Flø Rasmussen d2f8f07337 Enable multi-segment wells by default. 2019-04-27 07:16:36 +02:00
Atgeirr Flø Rasmussen 8c95d3e163 Merge pull request #1804 from totto82/removeDuplictaedThrow 
BUGFIX. Make sure that the convergece report is stored before throw
 2019-04-26 09:27:59 +02:00
Atgeirr Flø Rasmussen e3f951ee7d Merge pull request #1790 from hnil/cpr_less_verbose 
changed verbosity of the cpr solver
 2019-04-12 12:48:47 +02:00
Atgeirr Flø Rasmussen d03465b00d Merge pull request #1783 from GitPaean/not_throw_for_potential_failure 
not throw for failure when failing in calculating well potentials
 2019-04-12 09:45:34 +02:00
Atgeirr Flø Rasmussen 628be79cfe Merge pull request #1788 from blattms/amg_cpr_dune_2.5_rebased 
Amg cpr reusing hierarchy and supporting dune 2.5
 2019-04-10 19:14:15 +02:00
Atgeirr Flø Rasmussen 07e495c9da More minor cleanup. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 7664d27849 Clean up formatting and get most types from superclass. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen be86b90bac Make typed protected rather than private, enabling inheritance. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 2cf990e404 Do not store copy of weights inside BlackoilAmgCpr class. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 416cc93f96 Remove code that is no longer needed. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 0e5a5c5266 Minor cleanup. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 3d9c776384 Disable most of the file, as the base version is sufficient. 
All features have been added to BlackoilAmg.hpp.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 6d18c2849d Allow updating the AMG preconditioner. 
This adds the significant modifications from the BlackoilAmgCpr
experimental class to BlackoilAmg.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 032701ffc9 Silence unused argument warnings. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 0e1db0c6bd Reindent, remove unused function (after refactoring). 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 5d68a308b5 Fix memory bug by refactoring. 
Moving out of a matrix in the same function argument list as the matrix is passed
to another function is wrong. Simplified by avoiding the unwieldy tuple.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen c92d84432c Replace tabs with spaces. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 5f4f8b71a8 Silence override and member order warnings. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 29837be2e3 Changes to minimize differences to original istl versions. 
Also added note pointing to original istl files.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 13c6463f89 Refactor to be closer to the original amg.hh. 
Should minimize the diff when comparing.
 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen b39815edb5 Minor formatting and removing unused code. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen 28dfef1ecf Compile fix: do not use undefined member. 2019-04-10 14:40:46 +02:00
Atgeirr Flø Rasmussen a8d8fb86c3 Merge pull request #1592 from bska/report-segment-res 
WellState FIBO: Return Segment Vectors from report()
 2019-04-05 10:49:14 +02:00
Atgeirr Flø Rasmussen e8da0e8fd5 Merge pull request #1776 from atgeirr/update-test_equil 
Update test_equil.cpp for upstream changes.
 2019-04-02 08:20:05 +02:00
Atgeirr Flø Rasmussen 9f94c2ea9b Merge pull request #1777 from joakim-hove/update-missing-features 
Update missing features
 2019-04-01 08:53:54 +02:00
Atgeirr Flø Rasmussen c28d77e087 Update test_equil.cpp for upstream changes. 2019-03-28 15:47:44 +01:00
Atgeirr Flø Rasmussen f18477ce71 Merge pull request #1757 from atgeirr/improve_cpr_mod 
Improve CPR solver
 2019-03-21 11:19:10 +01:00
Atgeirr Flø Rasmussen 19b78b78c0 Updated after review comments. 2019-03-20 10:24:44 +01:00
Atgeirr Flø Rasmussen dc1135324f Merge pull request #9 from andlaus/improve_cpr_mod 
make the branch self contained
 2019-03-20 10:21:34 +01:00
Atgeirr Flø Rasmussen 9af17dcc8c Merge pull request #7 from akva2/improve_cpr_mod 
remove unused variables
 2019-03-15 09:16:24 +01:00
Atgeirr Flø Rasmussen 81ba405f26 Merge pull request #6 from akva2/improve_cpr_mod 
Improve cpr mod
 2019-03-14 11:53:16 +01:00
Atgeirr Flø Rasmussen 111feead14 Formatting fixes and removing unused code. 2019-03-14 11:22:07 +01:00
Atgeirr Flø Rasmussen 6ee5406a9f Formatting and indentation fixes. 2019-03-14 10:37:46 +01:00
Atgeirr Flø Rasmussen 4eb44b4808 Remove unused code and fix indentation changes. 2019-03-14 10:05:20 +01:00
Atgeirr Flø Rasmussen 13cd05fc19 Add weights argument to test for BlackoilAmg. 2019-03-14 09:56:12 +01:00
Atgeirr Flø Rasmussen 569ee02622 Merge pull request #1730 from fgfuchs/exception_handling_in_wells_for_parallel_runs 
correct exception handling in wells for parallel runs
 2019-03-13 15:40:36 +01:00
Atgeirr Flø Rasmussen a80527f808 Merge pull request #1753 from atgeirr/fix-hardcoded-phase-indices 
Replace hardcoded phase indexing.
 2019-03-13 11:07:23 +01:00
Atgeirr Flø Rasmussen ea9783277d Replace hardcoded phase indexing. 2019-03-11 11:36:41 +01:00
Atgeirr Flø Rasmussen f0f06225c5 Merge pull request #1743 from GitPaean/testing_storage_term_stdwell 
correcting the sign of the accumulation term of StandardWell
 2019-03-06 13:31:10 +01:00
Atgeirr Flø Rasmussen ec408ed6da Merge pull request #1744 from GitPaean/warning_nnc_inactive_active 
warning instead of throwing for nnc between active cells and inactive cells
 2019-03-05 14:01:34 +01:00
Atgeirr Flø Rasmussen 9c6fea72ac Merge pull request #1737 from akva2/import_ebos 
Import ebos from eWoms
 2019-03-01 10:19:09 +01:00
Atgeirr Flø Rasmussen e926f557b8 Fix: indexInInside() and indexInOutside() return signed integers. 2019-02-07 12:00:49 +01:00
Atgeirr Flø Rasmussen d087d7c41b Use NNC support from CpGrid. 2019-02-07 12:00:49 +01:00
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 c26aed1d42 Merge pull request #436 from totto82/remove_small_trans 
remove transmissibilities less then 1e-6 in the given unit system
 2018-12-11 11:26:35 +01:00
Atgeirr Flø Rasmussen 39571de366 Merge pull request #443 from totto82/disableTracer 
Add parameter for (dis)enable the tracer model
 2018-12-10 11:40:48 +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 4c7dcb1aba Merge pull request #441 from blattms/do-silent-getWriteRestartFile-call-on-nonzero-procs 
Do not log messages during getWriteRestartFile query on all procs.
 2018-12-07 18:53:45 +01:00
Atgeirr Flø Rasmussen e8628c35d6 Merge pull request #425 from blattms/process-editnnc 
Apply multiplicators from EDITNNC from the Deck.
 2018-12-07 18:45:22 +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