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,972 Commits 31 Branches 117 Tags
0605b2fe6fcfde4c09dab33c4a457ba2acac57a9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 5267f3cf17 Merge pull request #1965 from totto82/killDistr 
Reimplementation of the well control code
 2019-10-22 10:25:32 +02:00
Atgeirr Flø Rasmussen f3d53e4750 Merge pull request #2089 from akva2/allow_parallel_norne_trigger 
added: allow running the norne test in parallel
 2019-10-22 09:54:43 +02:00
Atgeirr Flø Rasmussen 32b31a2606 Address review comments. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen f618073492 Some small logic fixes. 
- Make sure to reopen revived wells.
 - Do not use thp limit for potential calculations when well is bhp controlled.
 - Stopped wells do not check controls.
 - Set thp to control when appropriate in updateWellStateWithTarget().
 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 6b011c1bfb Use new method to determine operability under THP control. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen a536b90891 Improve stopped wells logic and log messages. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 2b9f5fb4fb Use robustSolveBhpAtThpLimitProd() for potentials and initialization. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 7581275b03 Add robustSolveBhpAtThpLimitProd() method. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen d5d890ff23 Make checkConstraints() stop after first broken constraint. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen e8daf663ab Solve the bhp = bhpfunc(thp, rate(bhp)) equation better. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen f55c9647b7 Allow up to factor 3 extrapolation in VFP. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen 11aeb82e8e Merge pull request #2058 from blattms/fix-unused-variable-wells 
Fixes unused variable warning in standard wells.
 2019-10-15 10:07:18 +02:00
Atgeirr Flø Rasmussen 40f91b0e32 Merge pull request #2034 from totto82/sync_restart 
sync restart
 2019-10-14 13:26:57 +02:00
Atgeirr Flø Rasmussen 4ddb8e8d56 Merge pull request #2051 from atgeirr/enable-onephase-revised-rebased 
Enable onephase
 2019-10-11 21:02:46 +02:00
Atgeirr Flø Rasmussen b0de207940 Merge pull request #2040 from alfbr/prt-banner 
Make PRT header self-explanatory
 2019-10-11 20:48:43 +02:00
Atgeirr Flø Rasmussen 8ef1958c18 Silence warnings. 2019-10-11 20:18:53 +02:00
Atgeirr Flø Rasmussen 5211217c94 Whitespace fixes (tabs->spaces, reformatted new files). 2019-10-11 15:57:51 +02:00
Atgeirr Flø Rasmussen 0b9b20695c Change back relative change computation to old order. 
Changing this caused tiny timestepping differences.
 2019-10-11 15:29:49 +02:00
Atgeirr Flø Rasmussen 71c5129d3d Do not build the extra Flow variants by default. 2019-10-11 08:46:17 +02:00
Atgeirr Flø Rasmussen 10e2200a25 Add two new flow variants for one-phase (water, water+energy) simulation. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen 7270aa3013 Update flow_tag.hpp to match current flow.cpp. 
The flow_tag.hpp file is used for simple construction of simulators for
particular models or other compile-time choices. This updates it to
get identical behaviour as that of mainline (multi-model) Flow.
 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen 3ddcdf2349 Only run relperm diagnostics for > 1 phase cases. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen 2d9f41b1aa Rename getPerfPressure() -> getPerfCellPressure(). 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen 189dc150fb Merge pull request #2039 from totto82/moveBanner 
move PRT header to the top
 2019-10-03 14:28:06 +02:00
Atgeirr Flø Rasmussen 2b9e30df33 Merge pull request #2036 from blattms/improve-vanguard-layering-violation 
Make sure subclass functions are not called before subclass is initia…
 2019-10-02 14:57:00 +02:00
Atgeirr Flø Rasmussen 96af6ca5f0 Merge pull request #2023 from totto82/fix_solvent_restart 
Fix solvent restart
 2019-10-01 15:35:22 +02:00
Atgeirr Flø Rasmussen 9ded4bc6ac Merge pull request #2022 from totto82/enableDriftInFlow 
Make it possible to test driftCompensation i Flow
 2019-09-25 12:23:22 +02:00
Atgeirr Flø Rasmussen 20fdd62569 Merge pull request #2020 from joakim-hove/make-equilrecord 
Use new EquilRecord from opm-common
 2019-09-24 08:28:21 +02:00
Atgeirr Flø Rasmussen 4f22b3c468 Merge pull request #2006 from tskille/EclipseGrid 
Fixed typo for EclipseGrid member function
 2019-09-23 15:56:19 +02:00
Atgeirr Flø Rasmussen 37854bcdcb Merge pull request #2016 from akva2/ewoms_to_models 
Move ewoms/* into an opm/models/* structure
 2019-09-19 14:23:47 +02:00
Atgeirr Flø Rasmussen c7200460ab Abort the run before reading the deck if there are unknown params. 2019-09-19 14:20:05 +02:00
Atgeirr Flø Rasmussen 03e7e0be52 Merge pull request #2013 from akva2/janitoring 
Some janitoring
 2019-09-18 15:57:21 +02:00
Atgeirr Flø Rasmussen 1fc26e2e96 Merge pull request #2007 from akva2/rename_parallel 
changed: ewoms/parallel -> opm/models/parallel
 2019-09-18 15:40:40 +02:00
Atgeirr Flø Rasmussen 523e38e095 Remove some supported keywords from the missing features list. 2019-09-18 15:34:38 +02:00
Atgeirr Flø Rasmussen 6b24f7907b Merge pull request #1998 from akva2/rename_linalg 
changed: ewoms/linear -> opm/simulators/linalg
 2019-09-10 09:46:59 +02:00
Atgeirr Flø Rasmussen b8b3599ac5 Merge pull request #1993 from akva2/namespace_change 
changed: namespace Ewoms -> namespace Opm
 2019-09-09 09:05:19 +02:00
Atgeirr Flø Rasmussen 7c34877630 Ensure output dir exists before creating log streams. 2019-09-06 12:35:40 +02:00
Atgeirr Flø Rasmussen aff158566e Merge pull request #1990 from akva2/use_opm_grid_region_mapping 
changed: remove duplicated regionmapping class
 2019-09-05 12:39:33 +02:00
Atgeirr Flø Rasmussen e2abc845f4 Merge pull request #1987 from joakim-hove/apply-action-report-step 
Add reportStep argument to Schedule::actions()
 2019-09-04 14:24:58 +02:00
Atgeirr Flø Rasmussen f3aedc4f3c Merge pull request #1985 from akva2/rename_ewoms 
changed: rename ewoms to opm-models
 2019-08-23 16:20:53 +02:00
Atgeirr Flø Rasmussen fdcfa8f0ff Merge pull request #1955 from GitPaean/well_potential_improvements 
using self-copying when calculating well potentials
 2019-08-21 15:31:09 +02:00
Atgeirr Flø Rasmussen 64a4fe1ade Merge pull request #1970 from atgeirr/handle-grup-unititialized 
[WIP] Handle GRUP-caused uninitialized (-1) well control index
 2019-08-13 12:28:30 +02:00
Atgeirr Flø Rasmussen 63364dc983 Bugfix: use proper method to access injected phase. 2019-08-13 11:57:06 +02:00
Atgeirr Flø Rasmussen b32290d65a Remove unused variable. 
Also move variable to scope where used.
 2019-08-13 10:51:16 +02:00
Atgeirr Flø Rasmussen f5070c6ba9 Avoid getting distr when current control index is -1. 2019-08-13 10:14:37 +02:00
Atgeirr Flø Rasmussen ffeb1529e8 Throw if calling well_controls_current_distr() with -1 current index. 2019-08-13 10:14:10 +02:00
Atgeirr Flø Rasmussen 8438e84db1 Handle two possible cases where current control is -1. 2019-08-12 14:49:52 +02:00
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