OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,714 Commits 9 Branches 35 Tags
f66f699fcafdcd04b35e73f9746f5fdc98836b19
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 2177aa745e Merge pull request #1027 from totto82/fix_2p_equil_init 
Fix two phase equil initialization
 2016-06-24 14:42:48 +02:00
Atgeirr Flø Rasmussen 3d5689dc72 Merge pull request #1046 from pgdr/add-dimens-to-norne-deck-test 
Added DX/DY/DZ to norne_pvt.data
 2016-06-21 22:45:36 +02:00
Atgeirr Flø Rasmussen bdebcf48a3 Merge pull request #1043 from pgdr/remove-return-type-warn 
Remove warnings (by throwing), added copyright header
 2016-06-20 22:34:40 +02:00
Atgeirr Flø Rasmussen 7ddf390bf8 Merge pull request #1044 from akva2/fix_jenkins_again 
fixed: broken array loop in jenkins script
 2016-06-20 15:00:25 +02:00
Atgeirr Flø Rasmussen d9c33cbcb6 Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned 
Avoid ambiguous calls to abs with unsigned integers.
 2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen 9b2acf96bf Merge pull request #1042 from andlaus/update_dune.module 
add opm-output as a dependency to dune.module
 2016-06-16 15:21:21 +02:00
Atgeirr Flø Rasmussen f3f6170881 Merge pull request #1038 from qilicun/equil-check 
Rise up a warning if equil region has no active cells.
 2016-06-16 10:02:49 +02:00
Atgeirr Flø Rasmussen 89cb2680a1 Make specialization for all unsigned integer types. 2016-06-16 08:47:21 +02:00
Atgeirr Flø Rasmussen 15e12c89bf Merge pull request #1034 from qilicun/minor-format-change 
Minor format changes
 2016-06-15 15:10:57 +02:00
Atgeirr Flø Rasmussen 8f2e2c91b1 Merge pull request #1029 from blattms/make-ownermask-accessible 
Make ParallelIstlInformation::ownerMask_ accessible.
 2016-06-15 15:08:58 +02:00
Atgeirr Flø Rasmussen 8b2ebc690b Address review comments. 2016-06-15 15:01:45 +02:00
Atgeirr Flø Rasmussen e6da69575a Set default solver depending on configuration. 2016-06-15 14:32:00 +02:00
Atgeirr Flø Rasmussen 291b13c2d4 Avoid ambiguous calls to abs with unsigned integers. 2016-06-15 10:55:42 +02:00
Atgeirr Flø Rasmussen b5dc48af0e Make new ops const. 2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen fcb99e425d Add operator== and operator!= to PhasePresence. 
This makes it simpler to write code debugging or inspecting changed phase configurations.
 2016-06-15 08:57:20 +02:00
Atgeirr Flø Rasmussen 1b6048016b Merge pull request #1031 from akva2/opm_output_upstream 
update jenkins build scripts
 2016-06-13 13:37:00 +02:00
Atgeirr Flø Rasmussen 192bb54e70 Merge pull request #1017 from jokva/umfpack-correct-preprocessor-directive 
Check for HAVE_UMFPACK in LinearSolverFactory
 2016-06-13 08:43:30 +02:00
Atgeirr Flø Rasmussen bb2a582aa8 Merge pull request #1028 from qilicun/format-message 
Format message
 2016-06-08 10:57:31 +02:00
Atgeirr Flø Rasmussen 7f355929ac Merge pull request #1026 from blattms/add-parallel-linfinity-norm 
Added utilities to compute a real L-infinity norm in parallel.
 2016-06-07 20:26:23 +02:00
Atgeirr Flø Rasmussen 681846686a Merge pull request #1024 from andlaus/lad_to_dad 
rename some variables from "Lad" to "Eval" (was: to "Dad")
 2016-06-07 11:43:42 +02:00
Atgeirr Flø Rasmussen f5cf2d47e1 Merge pull request #1025 from totto82/fix_hydrocarbonstate 
Fix to handle cases without DISGAS and VAPOIL
 2016-06-07 11:38:16 +02:00
Atgeirr Flø Rasmussen 39924206ca Merge pull request #1023 from qilicun/refine-messagetype 
paramemters output should go in Debug mode.
 2016-06-06 12:35:37 +02:00
Atgeirr Flø Rasmussen 7de314bb7e Merge pull request #1021 from blattms/add-missing-fstream-include 
Fix incomplete type error for std::ofstream in examples
 2016-05-27 11:15:33 +02:00
Atgeirr Flø Rasmussen ef2125f39e Merge pull request #1019 from qilicun/log-more-messages 
Write more messages into OpmLog.
 2016-05-26 11:20:49 +02:00
Atgeirr Flø Rasmussen 537c4dd730 Merge pull request #1010 from qilicun/log_timer_messages 
Log timer messages
 2016-05-20 08:39:14 +02:00
Atgeirr Flø Rasmussen f582de6023 Merge pull request #1018 from qilicun/cleanup-prefix 
Cleanup the prefix.
 2016-05-20 08:37:39 +02:00
Atgeirr Flø Rasmussen 2a43e9631f Merge pull request #1011 from qilicun/format-output-relperm-diagnostics 
Unify output messages format.
 2016-05-19 15:06:52 +02:00
Atgeirr Flø Rasmussen 747ec8fa8c Merge pull request #1015 from totto82/hydrocarbonState 
Add member hydroCarbonState to the BlackoilState
 2016-05-18 14:16:53 +02:00
Atgeirr Flø Rasmussen 8b43643e25 Merge pull request #1009 from blattms/prevent-dereferencing-past-the-end 
Prevent dereferencing the end iterator.
 2016-05-09 09:40:53 +02:00
Atgeirr Flø Rasmussen a5d858f396 Merge pull request #1005 from akva2/add_downstream_trigger_support 
added: downstream build support in the jenkins trigger
 2016-05-03 15:27:09 +02:00
Atgeirr Flø Rasmussen 022e594850 Merge pull request #1006 from atgeirr/bump-version 
dune.module: change version to 2016.10-pre
 2016-05-03 14:35:28 +02:00
Atgeirr Flø Rasmussen b248655314 dune.module: change version to 2016.10-pre 2016-05-03 14:31:32 +02:00
Atgeirr Flø Rasmussen 1fbc689f6c Merge pull request #1003 from babrodtk/two_phase_bugfixes 
Two phase bugfixes
 2016-04-28 15:42:59 +02:00
Atgeirr Flø Rasmussen b07f4dd494 Merge pull request #1000 from akva2/updates_for_16.04_packaging 
Updates for 16.04 packaging
 2016-04-18 11:13:13 +02:00
Atgeirr Flø Rasmussen b6e381d627 Merge pull request #998 from totto82/bugfix_wellgroup 
BUGFIX. Comparison with null pointer
 2016-04-15 13:16:23 +02:00
Atgeirr Flø Rasmussen 165b17564d Merge pull request #997 from totto82/Fix_guiderates 
Bugfix in setup guiderates
 2016-04-15 08:46:17 +02:00
Atgeirr Flø Rasmussen 78a927c859 Update CMake list with deleted files. 2016-04-14 11:29:17 +02:00
Atgeirr Flø Rasmussen 277b3a2e58 Merge pull request #993 from atgeirr/remove-unused-code 
Removed SimulatorOutput class from this module.
 2016-04-07 15:47:56 +02:00
Atgeirr Flø Rasmussen 90e9374a2b Renoved SimulatorOutput class from this module. 2016-04-07 15:41:40 +02:00
Atgeirr Flø Rasmussen ccb34c14ec Merge pull request #992 from atgeirr/module-renaming 
Module renaming
 2016-04-06 15:37:44 +02:00
Atgeirr Flø Rasmussen b5cbf0ea2d Rename HAVE_DUNE_CORNERPOINT -> HAVE_OPM_GRID. 
Note that this is quite strange since opm-core is upstream and not downstream
from opm-grid. However, when this file is used from opm-autodiff the macro is used.
 2016-04-05 15:14:02 +02:00
Atgeirr Flø Rasmussen 2b9b1f8b05 Merge pull request #987 from qilicun/refactor-relpermDiagnostics 
Refactor relperm diagnostics using OpmLog functionalities.
 2016-04-04 15:04:44 +02:00
Atgeirr Flø Rasmussen a20da3a6d2 Merge pull request #988 from totto82/gc_default 
Calculate default guide rates using the well potentials
 2016-04-04 14:12:48 +02:00
Atgeirr Flø Rasmussen 09c31b67ca Merge pull request #984 from totto82/bugfix_groupcontrol 
BUGFIX. Call setupGuideRates before groupcontrol is applied
 2016-03-31 13:28:08 +02:00
Atgeirr Flø Rasmussen 730f1e88b7 Merge pull request #977 from kjellkongsvik/Remove_OutputWriter 
Remove output writer
 2016-03-31 09:42:33 +02:00
Atgeirr Flø Rasmussen 7a5e8865b5 Merge pull request #982 from dr-robertk/PR/copyable-simulator-timer 
Allow SimulatorTimers to be copied.
 2016-03-29 11:09:14 +02:00
Atgeirr Flø Rasmussen e4929b7263 Implement direct fast field access. 2016-03-29 10:46:14 +02:00
Atgeirr Flø Rasmussen 6bcca2ea23 Merge pull request #972 from qilicun/solvent-diagnostics 
Solvent diagnostics
 2016-03-16 10:32:12 +01:00
Atgeirr Flø Rasmussen 3e8d6b521f Merge pull request #971 from andlaus/fix_thpres_defaults 
threshold pressures: consider the saturated case and fix a typo
 2016-03-09 09:48:37 +01:00
Atgeirr Flø Rasmussen bd91cf6e72 Merge pull request #970 from andlaus/fix_R_in_viscosity 
BlackoilPropertiesFromDeck: properly calculate the Rs and Rv values for viscosity
 2016-03-08 11:28:53 +01:00
Atgeirr Flø Rasmussen 41faabe61a Merge pull request #955 from andlaus/opm-material_blackoil_PVT 
replace the blackoil PVT classes by the ones of opm-material
 2016-03-07 13:40:24 +01:00
Atgeirr Flø Rasmussen eb0f59f96d Merge pull request #965 from atgeirr/remove-unused-parameter 
Remove unused 'restart' parameter from SimulatorTimer::init().
 2016-03-04 11:22:01 +01:00
Atgeirr Flø Rasmussen 72b9bdabf4 Merge pull request #969 from atgeirr/master 
Fix minor issues with RelpermDiagnostics
 2016-03-04 09:14:50 +01:00
Atgeirr Flø Rasmussen 9a83cbaddf Only include normal (not _impl.hpp) header from client code. 2016-03-04 09:12:43 +01:00
Atgeirr Flø Rasmussen 2a4ca8a34e Only .cpp files should include config.h. 2016-03-04 09:10:19 +01:00
Atgeirr Flø Rasmussen 54ac4bd5e4 Include template implementation file. 2016-03-04 09:09:52 +01:00
Atgeirr Flø Rasmussen 10468bafab Merge pull request #968 from qilicun/template-grid 
make grid as template parameter.
 2016-03-04 08:30:58 +01:00
Atgeirr Flø Rasmussen a703bfbcf1 Merge pull request #958 from qilicun/rename_logfile 
use standard filename for output log file.
 2016-03-02 08:29:20 +01:00
Atgeirr Flø Rasmussen 5c2257cafa Remove unused 'restart' parameter from SimulatorTimer::init(). 2016-02-29 11:03:08 +01:00
Atgeirr Flø Rasmussen 01df431198 Silence sign comparison warning. 2016-02-29 10:58:43 +01:00
Atgeirr Flø Rasmussen be1ea358ff Merge pull request #953 from andlaus/const_gridproperties 
fix the build
 2016-02-19 11:46:32 +01:00
Atgeirr Flø Rasmussen 0297d6c657 Merge pull request #957 from joakim-hove/cmp-template 
Using template for cmp::vector_equal()
 2016-02-19 11:41:07 +01:00
Atgeirr Flø Rasmussen dc918fcff9 Merge pull request #947 from andlaus/fix_wet_gas_pvt_extrapolation 
PvtLiveGas: do not special case in the extrapolation code
 2016-02-16 12:44:53 +01:00
Atgeirr Flø Rasmussen 1b9be6d4bd Merge pull request #940 from chflo/OPM-163 
OPM-163: Use EclipseState instead of Deck for PvtInterface
 2016-01-08 13:36:17 +01:00
Atgeirr Flø Rasmussen 1a8b38dcc9 Merge pull request #936 from atgeirr/silence-warnings 
Silence warnings in test programs.
 2015-12-14 15:26:35 +01:00
Atgeirr Flø Rasmussen 576d24a070 Silence warnings in test programs. 2015-12-14 15:25:27 +01:00
Atgeirr Flø Rasmussen 125c27462d Merge pull request #928 from totto82/minpv_pinch 
compatibility of MINPV and PINCH
 2015-12-14 11:33:20 +01:00
Atgeirr Flø Rasmussen cc07dc80b7 Merge pull request #934 from totto82/residualSaturations 
Add method to access the materialLawManager
 2015-12-11 13:08:39 +01:00
Atgeirr Flø Rasmussen a819d314f8 Merge pull request #929 from qilicun/relpermDiagnostics 
Relperm diagnostics
 2015-12-09 10:11:26 +01:00
Atgeirr Flø Rasmussen e8ab4341f1 Merge pull request #933 from atgeirr/silence-warnings 
Silence some warnings.
 2015-12-07 13:31:13 +01:00
Atgeirr Flø Rasmussen fc20fe5be9 Silence some warnings. 2015-12-01 13:36:08 +01:00
Atgeirr Flø Rasmussen ec25abb15f Merge pull request #930 from totto82/cellDepth 
Use cell depths based on averaging cell corners
 2015-11-27 10:17:49 +01:00
Atgeirr Flø Rasmussen 84b3bcc6ea Merge pull request #907 from andlaus/thpress_from_initial 
implement determining the threshold pressure from the initial condition
 2015-11-17 09:03:02 +01:00
Atgeirr Flø Rasmussen 556e24f008 Merge pull request #922 from blattms/return_mask_for_updateOwnerMask 
Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask
 2015-11-13 15:20:35 +01:00
Atgeirr Flø Rasmussen d9dfd852f5 Merge pull request #927 from atgeirr/fix-rename-error 
Follow class renaming.
 2015-11-13 11:39:12 +01:00
Atgeirr Flø Rasmussen 909f62ef4b Follow class renaming. 2015-11-13 11:37:53 +01:00
Atgeirr Flø Rasmussen 9f7a1be749 Merge pull request #921 from dr-robertk/PR/adaptive-timestepping-revision 
AdaptiveTimeStepping: allow for more flexible error computation in the future.
 2015-11-12 17:23:11 +01:00
Atgeirr Flø Rasmussen 6ac19ac961 Merge pull request #920 from totto82/interpolation_points 
Change the number of integration points in the initialization
 2015-11-09 16:52:30 +01:00
Atgeirr Flø Rasmussen bdd5104bc5 Merge pull request #919 from blattms/fixes-wells-with-perforations-in-overlap 
Fixes well manager for wells crossing into cells that overlap.
 2015-10-28 13:23:35 +01:00
Atgeirr Flø Rasmussen 11cd4d56ad Merge pull request #918 from blattms/allow-zero-initialization-of-rock-properties 
Allow the rock properties to be zero initialized without a deck.
 2015-10-28 13:21:16 +01:00
Atgeirr Flø Rasmussen 6dc67229f1 Merge pull request #917 from blattms/fix-copy-owner-to-all 
[bugfix] Fixes copyOwnerToAll.
 2015-10-28 11:34:27 +01:00
Atgeirr Flø Rasmussen 21412edc97 Merge pull request #915 from akva2/fix_equil 
fix Equilibration test by adding some fuzz
 2015-10-26 12:43:42 +01:00
Atgeirr Flø Rasmussen 7df248d2d6 Remove version.[ch] files. 2015-10-23 13:32:13 +02:00
Atgeirr Flø Rasmussen 40220994c7 Bump version and unify format of dune.module. 2015-10-23 13:18:47 +02:00
Atgeirr Flø Rasmussen 50814d88ce Merge pull request #905 from atgeirr/fix-timestep-bug 
Fix timestep bug
 2015-10-22 13:37:49 +02:00
Atgeirr Flø Rasmussen 62f59fa624 In sim_2p_incomp, avoid running everything twice. 
There were loops (over all timesteps) both in the
main() function and the simulator class.

Note:
This simulator cannot properly handle changing
well configurations, and will now use only the
initial configuration (first report step), instead
of possibly crashing later.
 2015-10-21 15:28:27 +02:00
Atgeirr Flø Rasmussen d460952d08 Make SaturationPropsFromDeck work for two-phase cases. 2015-10-21 15:27:52 +02:00
Atgeirr Flø Rasmussen d94e0fc0f7 Merge pull request #909 from atgeirr/silence-warning-pinchprocessor 
Remove unused arguments in PinchProcessor methods.
 2015-10-21 11:53:44 +02:00
Atgeirr Flø Rasmussen 8a455fbde8 Remove unused arguments in PinchProcessor methods. 
This silences warnings. It also makes it clear that
the cell thicknesses are not used in the current
algorithm, the doc comment has been updated to
reflect this.
 2015-10-21 11:52:31 +02:00
Atgeirr Flø Rasmussen d6a90c990d Merge pull request #906 from totto82/livegas 
Complete undersaturated PVTG tables by extrapolating from existing data
 2015-10-20 20:38:04 +02:00
Atgeirr Flø Rasmussen 3a69e10043 Merge pull request #908 from akva2/update_redhat_packaging 
update redhat packaging
 2015-10-20 18:33:08 +02:00
Atgeirr Flø Rasmussen 8df54df573 Bugfix: currentStepNum() -> reportStepNum() also in RFT writer. 2015-10-20 10:35:25 +02:00
Atgeirr Flø Rasmussen 0cd08a1f12 Merge pull request #904 from akva2/update_debian_packaging 
update debian packaging
 2015-10-20 10:16:12 +02:00
Atgeirr Flø Rasmussen b47640db71 Bugfix: currentStepNum() -> reportStepNum(). 2015-10-20 10:04:56 +02:00
Atgeirr Flø Rasmussen 917d491a91 Improve formatting, comment and use separate scope. 
To make it clear that the variables are only used here.
 2015-10-20 09:58:34 +02:00
Atgeirr Flø Rasmussen f2d735cacb Merge pull request #892 from qilicun/pinchprocessor 
PinchProcessor
 2015-10-19 10:22:44 +02:00
Atgeirr Flø Rasmussen d78e14c1c6 Merge pull request #897 from totto82/crossflow 
Add boolean flag to determine whether crossflow is allowed in a well
 2015-10-14 09:36:27 +02:00
Atgeirr Flø Rasmussen a8e042aeb6 Merge pull request #902 from joakim-hove/rename-memcmp-double 
Renamed memcmp_double -> opm_memcmp_double
 2015-10-14 09:32:45 +02:00
Atgeirr Flø Rasmussen 08eea02316 Merge pull request #899 from andlaus/error_macros_to_opm_common 
Error macros to opm common
 2015-10-12 13:31:42 +02:00
Atgeirr Flø Rasmussen 0d802def88 Merge pull request #887 from osae/equil-water-zone 
Support for equil-initialisation for datum depth outside oil zone.
 2015-10-03 19:04:34 +02:00