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
9,758 Commits 31 Branches 117 Tags
af1bf9a193ebe1aa55cd859767450b63e837d822
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 1b986056ce Merge pull request #1967 from andlaus/ebos_foam 
enable the foam extension for ebos/mebos
 2019-08-12 09:33:07 +02:00
Atgeirr Flø Rasmussen b7a36a6a72 Merge pull request #1938 from atgeirr/use-foam-module 
Use foam module
 2019-08-09 09:54:33 +02:00
Atgeirr Flø Rasmussen c6d31376b5 Use a dummy Communication object for the serial case. 2019-08-08 09:27:14 +02:00
Atgeirr Flø Rasmussen 12032203b3 Improve out-of-range check for extra components. 2019-08-07 12:03:43 +02:00
Atgeirr Flø Rasmussen dfae9d1b32 Add foam integration test. 2019-08-07 10:39:16 +02:00
Atgeirr Flø Rasmussen dd612c58a2 Make ebos variants compile. 2019-08-07 10:39:16 +02:00
Atgeirr Flø Rasmussen b9e7881878 Finalize integration of foam module. 2019-08-07 10:39:16 +02:00
Atgeirr Flø Rasmussen 0e309fc254 Merge pull request #1954 from GitPaean/wrong_thp_result 
Not extrapolating towards negative in VFP tables
 2019-08-06 10:40:17 +02:00
Atgeirr Flø Rasmussen 2058d47fd2 Merge pull request #1922 from GitPaean/support_gor_wecon 
adding GOR checking for WECON
 2019-07-05 15:47:16 +02:00
Atgeirr Flø Rasmussen 70683b662b Merge pull request #1933 from GitPaean/refactoring_wtest_further 
refactoring the ration economic limit checking
 2019-07-05 14:44:52 +02:00
Atgeirr Flø Rasmussen 99afc4f152 Merge pull request #1919 from GitPaean/improving_wtest 
improving WTEST results.
 2019-07-01 13:59:03 +02:00
Atgeirr Flø Rasmussen 65652a05cf Merge pull request #1893 from bska/check-arraydims-consistency 
Flow: Verify Consistent Array Dimensions
 2019-07-01 11:21:59 +02:00
Atgeirr Flø Rasmussen 77e7a07756 Merge pull request #1918 from bska/printf-ptr 
Format Specifier '%p' Requires Pointers to Void
 2019-06-26 18:22:51 +02:00
Atgeirr Flø Rasmussen 766afa4602 Merge pull request #1917 from GitPaean/fixing_warnings_ 
more fixing for the tests
 2019-06-26 14:35:00 +02:00
Atgeirr Flø Rasmussen e731715924 Merge pull request #1915 from GitPaean/fixing_warnings_ 
fixing warnings under opm-simulators
 2019-06-26 12:52:41 +02:00
Atgeirr Flø Rasmussen aa06942695 Merge pull request #1911 from GitPaean/refactoring_wtest_for_wellcut_completions_continue 
adapting to the upstream change
 2019-06-26 09:34:19 +02:00
Atgeirr Flø Rasmussen bc07b688c5 Fix typo, indentation and return in unknown-parameter situation. 2019-06-25 10:10:58 +02:00
Atgeirr Flø Rasmussen 43503cf7c6 Merge pull request #1904 from blattms/abort-with-notification 
Notify user that we are aborting because of unused keywords.
 2019-06-25 09:45:27 +02:00
Atgeirr Flø Rasmussen 6d0aa4351a Merge pull request #1898 from GitPaean/refactoring_wtest_for_wellcut_completions 
Fixing completion water cut checking for WTEST and some related refactoring
 2019-06-24 16:48:32 +02:00
Atgeirr Flø Rasmussen 5029b83321 Merge pull request #1905 from andlaus/include_config_h 
NNC sorter test: include config.h
 2019-06-21 21:00:51 +02:00
Atgeirr Flø Rasmussen a598734e71 Merge pull request #1890 from akva2/janitoring 
remove unused variables
 2019-06-21 08:33:03 +02:00
Atgeirr Flø Rasmussen 5749a7150c Move files out of opm/core/simulator. 2019-06-20 11:00:52 +02:00
Atgeirr Flø Rasmussen fa016a6008 Moved all remaining files out of opm/autodiff. 2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen a33cfbf0bc Moved Flow-related classes and files to opm/simulators/flow. 2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen 841f92afc7 Merge pull request #1896 from alfbr/time-reports 
Adding time and date to time step report
 2019-06-20 10:31:48 +02:00
Atgeirr Flø Rasmussen e4ef759d97 Merge pull request #1892 from akva2/fix_flexible_no_mpi 
fixed: build with dune 2.6 without MPI
 2019-06-19 10:08:25 +02:00
Atgeirr Flø Rasmussen 66972b39ed Merge pull request #1760 from GitPaean/testing_standardWellV 
replacing StandardWell with StandardWellV, then renaming StandardWellV to be StandardWell.
 2019-06-14 06:22:38 +02:00
Atgeirr Flø Rasmussen 078678206a Changes to support latest Dune version. 2019-06-12 10:40:55 +02:00
Atgeirr Flø Rasmussen b837dd71b4 Small fixes for the FlexibleSolver system. 2019-06-11 09:55:05 +02:00
Atgeirr Flø Rasmussen 2c5ef367dd Merge pull request #1852 from atgeirr/flexible-linear-solver 
Flexible linear solver
 2019-06-06 14:21:51 +02:00
Atgeirr Flø Rasmussen d5c3c93c7d Use overloading instead of template specialization. 
This seems to be necessary for older compilers.
 2019-06-06 10:36:17 +02:00
Atgeirr Flø Rasmussen 72ae444566 Fixes for Dune < 2.6. 
The PreconditionerFactory requires 2.6, so this is addressed by
simply not using that code at all for Dune < 2.6. No FlexibleSolver
etc.
 2019-06-06 09:10:43 +02:00
Atgeirr Flø Rasmussen 8ae671eb86 Merge pull request #1871 from totto82/fix_segfault 
fix segfault when no well report is registred
 2019-06-06 08:57:56 +02:00
Atgeirr Flø Rasmussen 38a61fa0c0 Add <config.h> include, clean up comments. 2019-06-05 15:57:45 +02:00
Atgeirr Flø Rasmussen c21fd6f26d Add and use PreconditionerFactory class. 
This replaces the makePreconditoner() function. The main advantage
is that it is extensible, making it easy to for example add new
preconditioners to the factory at runtime. It supports both parallel
and serial preconditioners.
 2019-06-05 15:12:52 +02:00
Atgeirr Flø Rasmussen d44b974dc8 Bugfix: ensure the matrix passed to parallel preconditioner is ok. 
Done with the makeOverlapRowsInvalid() approach.
 2019-06-05 15:12:33 +02:00
Atgeirr Flø Rasmussen d42c5426b2 Merge pull request #1872 from totto82/eval_friction2 
Make calculateFrictionFactor evalution  + critical bugfix in MSW friction model
 2019-06-05 11:19:28 +02:00
Atgeirr Flø Rasmussen 08cec09293 Merge pull request #1845 from blattms/abort-on-unknown-keywords-v2 
Abort if flow is run with unknown keywords.
 2019-06-03 15:42:02 +02:00
Atgeirr Flø Rasmussen 866db1c66d Revise json file for test after changing expected structure. 2019-06-03 11:42:30 +02:00
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