OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,530 Commits 9 Branches 35 Tags
2a4ca8a34e0b5ddc0a65ace6a0401f20be786559
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Atgeirr Flø Rasmussen 014d6177bc Make grid in deck have larger number of cells. 
This makes some tests succeed that use this deck only
for its properties and not its grid: if the grid in the
deck has fewer cells than the grid that is used for the
test we will fail in the SATNUM mapping.
 2015-10-01 15:20:08 +02:00
Atgeirr Flø Rasmussen fbd6fce24f Merge pull request #888 from totto82/avoid_throw_wellManager 
WARN instead of THROW if completion is not found in the grid
 2015-09-28 10:02:06 +02:00
Atgeirr Flø Rasmussen 4353f9c6a6 Merge pull request #884 from dr-robertk/PR/timestepping-terminal-output 
AdaptiveTimeStepping: pass variable terminal output to avoid multiple outputs in parallel.
 2015-09-16 18:43:59 +02:00
Atgeirr Flø Rasmussen 2f15b4f32d Merge pull request #885 from akva2/fix_sibling_builds 
fixed: make sure opm-common can be (re-)found
 2015-09-16 16:27:36 +02:00
Atgeirr Flø Rasmussen 44c3c91f7b Merge pull request #882 from dr-robertk/PR/ParallelDebugOutput 
WellState: move mapping from well name to well index to here.
 2015-09-16 12:49:49 +02:00
Atgeirr Flø Rasmussen 6246c24e4b Merge pull request #872 from bska/active-regions 
RegionMapping<>: Support arbitrary active regions
 2015-09-16 09:04:44 +02:00
Atgeirr Flø Rasmussen 5bd95582d2 Remove unnecessary include. 2015-09-15 14:53:46 +02:00
Atgeirr Flø Rasmussen 1ca5300f6e Move implementation to .cpp file. 2015-09-15 14:45:07 +02:00
Atgeirr Flø Rasmussen 7cfc09aa85 Use compressedToCartesian() to avoid possible null reference. 2015-09-15 14:23:10 +02:00
Atgeirr Flø Rasmussen f2c6344d04 Moved compressedToCartesian() to its own file. 2015-09-15 14:13:58 +02:00
Atgeirr Flø Rasmussen 65e6fe79cd Merge pull request #881 from totto82/fix_dz 
Use cell thickness from EclipseGrid in the well transsmissibility
 2015-09-15 13:17:18 +02:00
Atgeirr Flø Rasmussen 1cee1e038c Cleanup SaturationPropsFromDeck interface. 
Unused methods and arguments have been removed,
and we avoid including the EclMaterialLawManager
in the header. Clients IncompPropertiesFromDeck
and BlackoilPropertiesFromDeck have been updated.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 541e8a66f5 Remove unused implementation header. 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 355c90279a Remove unused args from constructor. 
Also from init() function. This means the methods are no longer templates,
and have been moved to the cpp file.
 2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen 530aef5032 Merge pull request #880 from dr-robertk/PR/simulator-state-export-numcells 
SimulatorState: export num_cells_ and num_faces_.
 2015-09-14 13:58:16 +02:00
Atgeirr Flø Rasmussen 3473008ad1 Merge pull request #862 from osae/cell_center_depth 
Cell center depth also from zcorn average.
 2015-09-11 14:00:23 +02:00
Atgeirr Flø Rasmussen ce0c928903 Merge pull request #874 from akva2/rename_common 
changed: sync with renaming to opm-common
 2015-09-09 11:37:26 +02:00
Atgeirr Flø Rasmussen 99cf5299b6 Merge pull request #876 from blattms/wells-completion-might-cross-overlap 
Allow a few well completions in the overlap.
 2015-09-09 10:41:47 +02:00
Atgeirr Flø Rasmussen 4448a557f0 Merge pull request #875 from totto82/change_default 
Change default values
 2015-09-08 17:55:28 +02:00
Atgeirr Flø Rasmussen 56c23d1a5a Merge pull request #873 from blattms/fix-parallel-wellsmanager-for-partly-shut-wells 
[bugfix] Account for shut completions when checking well in parallel
 2015-09-08 11:01:44 +02:00
Atgeirr Flø Rasmussen de011f0bd2 Merge pull request #871 from dr-robertk/PR/remove-warnings 
[BlackoilPropsFromDeck] remove sign/unsigned warnings.
 2015-09-07 10:07:06 +02:00
Atgeirr Flø Rasmussen c17488888e Merge pull request #867 from babrodtk/fix_warnings 
Fixed several warnings
 2015-09-04 14:13:34 +02:00
Atgeirr Flø Rasmussen c042a1912a Merge pull request #869 from blattms/fix-for-loop-initial-decl 
Fix complaint about initial declaration in foor loops.
 2015-09-04 14:10:46 +02:00
Atgeirr Flø Rasmussen 3ddf2a7139 Merge pull request #834 from andlaus/satfunc_refactoring 
use opm-material for the saturation functions
 2015-09-02 15:23:12 +02:00
Atgeirr Flø Rasmussen bf7276280a Merge pull request #866 from blattms/fixes-getting-next-timestep 
[bugfix] Allow querying the current time step even if we are done.
 2015-09-01 23:10:00 +02:00
Atgeirr Flø Rasmussen 943a5d1e4c Merge pull request #861 from osae/zero_poro_hack 
Zero-porosity cells and MINPV.
 2015-08-31 13:35:19 +02:00
Atgeirr Flø Rasmussen 78e30cc7e0 Merge pull request #859 from totto82/time-stepping 
Use estimated time-step instead of average in next report step
 2015-08-25 13:50:10 +02:00
Atgeirr Flø Rasmussen eac0e84f0f Merge pull request #844 from babrodtk/vfpprod 
Vertical flow performance tables
 2015-08-19 13:26:37 +02:00
Atgeirr Flø Rasmussen eba000bf17 Do thp init() differently. 2015-08-19 13:12:15 +02:00
Atgeirr Flø Rasmussen 7a76766f79 Fix bug in test program. 2015-08-19 13:12:14 +02:00
Atgeirr Flø Rasmussen 11062bf13a Merge pull request #853 from atgeirr/fix-init-order 
Match init order to member order.
 2015-08-19 11:36:10 +02:00
Atgeirr Flø Rasmussen 13d443473e Match init order to member order. 
In a constructor initialisation list, the order should be the same
as the order in which the variables actually are initialised, which
is given by the order they are declared in the class and not by the
order in the initialisation list.
 2015-08-19 11:33:29 +02:00
Atgeirr Flø Rasmussen c1332b8b83 Merge pull request #852 from GitPaean/testing_new_adaptive_timestepping 
adding command line option full_timestep_initially_
 2015-08-18 10:24:51 +02:00
Atgeirr Flø Rasmussen 932d686408 Merge pull request #851 from atgeirr/catch-more-istl-exceptions 
Catch more istl exceptions
 2015-08-17 14:48:01 +02:00
Atgeirr Flø Rasmussen 64b83989d5 Correct comment. 2015-08-17 13:02:37 +02:00
Atgeirr Flø Rasmussen e88e62a68d Catch MatrixBlockError in the adaptive time stepper. 
This can be thrown by the ILU0 preconditioner when using the
interleaved solver approach.
 2015-08-17 12:59:31 +02:00
Atgeirr Flø Rasmussen 9c6cabcd9a Use the correct (new) method from the Group class for group RESV. 
Production controls now are no longer initialised from injection control data.
 2015-08-13 10:21:24 +02:00
Atgeirr Flø Rasmussen 0147d28257 Merge pull request #848 from atgeirr/fix-bugs-explicitarraysfluidstate 
Fix bugs related to ExplicitArraysFluidState
 2015-08-12 15:25:29 +02:00
Atgeirr Flø Rasmussen f2572066b7 Merge pull request #849 from joakim-hove/memcmp_double 
Added small utility memcmp_double()
 2015-08-12 14:41:59 +02:00
Atgeirr Flø Rasmussen 6921bd2af9 Make saturation functions work with two phases again. 
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
 2015-08-12 13:38:32 +02:00
Atgeirr Flø Rasmussen 6c821aef10 Bugfix: add forgotten setIndex() call. 2015-08-12 13:38:10 +02:00
Atgeirr Flø Rasmussen 547018d3c7 Merge pull request #845 from atgeirr/fix-abs-bug-and-warnings 
Fix abs bug and warnings
 2015-08-12 12:50:31 +02:00
Atgeirr Flø Rasmussen 8a0010527c Suppress warnings. 2015-08-10 16:07:45 +02:00
Atgeirr Flø Rasmussen 1ead8dd458 Fix bug in floating-point comparison. 
The function used integer abs() instead of fabs(), in C abs() only
takes integers so this is an error. Also needed to add comparison
with absolute tolerance to get reasonable behaviour (comparing 0 versus
0.0000000000001 is ok here).
 2015-08-10 16:05:00 +02:00
Atgeirr Flø Rasmussen d8edb3db92 Merge pull request #838 from andlaus/initialize_SatHyst 
properly initialize the attributes of the SatHyst class
 2015-08-10 14:26:54 +02:00
Atgeirr Flø Rasmussen 2e4a8da02c Remove warning-suppression utility headers. 
They have been moved upstream to opm-parser.
 2015-08-10 10:52:52 +02:00
Atgeirr Flø Rasmussen 20c22294f1 Merge pull request #840 from dr-robertk/PR/remove-warnings 
TofDiscGalReorder and TofReader: remove warnings due to new boost version.
 2015-08-07 12:59:31 +02:00
Atgeirr Flø Rasmussen 06c9d7d7e5 Merge pull request #839 from atgeirr/handle-new-umfpack 
Define the UF_long type if necessary.
 2015-08-07 11:11:23 +02:00
Atgeirr Flø Rasmussen 596eba610a Define the UF_long type if necessary. 
The UF_long type is deprecated in UMFPack, and actually seems
to be removed from the latest versions.
 2015-08-06 09:54:05 +02:00
Atgeirr Flø Rasmussen 59c344204e Do not use pressure() until after init() in BlackoilState. 2015-07-08 17:58:38 +02:00
Atgeirr Flø Rasmussen 959e4e95b3 Merge pull request #825 from dr-robertk/PR/revise-simulator-states 
Revise SimulatorState and BlackoilState.
 2015-07-08 17:41:16 +02:00
Atgeirr Flø Rasmussen 7df516896d Fix unused argument warnings. 2015-07-08 12:37:11 +02:00
Atgeirr Flø Rasmussen 038fb6913d Merge pull request #823 from andlaus/use_fluidstates_for_satfuncs 
Use fluidstates for satfuncs
 2015-07-01 12:57:55 +02:00
Atgeirr Flø Rasmussen 590a4898b8 Add missing include statement. 2015-06-22 13:04:14 +02:00
Atgeirr Flø Rasmussen ae378c691b Merge pull request #819 from edbru/OPM-188 
Opm 188 Read and write of RESTART wellstate data
 2015-06-22 12:34:31 +02:00