OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,583 Commits 9 Branches 35 Tags
a6c173abadcf1123e406f8b2b465613139da1865
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen a6c173abad Merge pull request #625 from andlaus/fix_wells_in_summary_output 
EclipseWriter: attempt to fix the well summary output for activeWells != totalWells
 2014-08-14 14:02:54 +02:00
Atgeirr Flø Rasmussen 7e48a7550e Merge pull request #626 from andlaus/better_regex_test 
make the regex test more thorough
 2014-08-12 12:22:02 +02:00
Atgeirr Flø Rasmussen 95879f2556 Merge pull request #629 from totto82/bug_fix110814 
Bug fix #627
 2014-08-12 09:43:19 +02:00
Atgeirr Flø Rasmussen 1d4e672c61 Merge pull request #628 from totto82/constCapPressInit2 
Initialization for constant capillary pressure functions
 2014-08-11 13:49:37 +02:00
Atgeirr Flø Rasmussen 3f002ab6d8 Merge pull request #627 from osae/update-equil-test 
Correcting the equil test.
 2014-08-11 13:43:51 +02:00
Atgeirr Flø Rasmussen a455f23799 Merge pull request #623 from robertk-iris/dune-3.0-compat 
Make code compile with dune trunk version (ie 3.0-git). This should incl...
 2014-08-08 10:14:13 +02:00
Atgeirr Flø Rasmussen 9470ab7997 Merge pull request #620 from bska/satfunc-minor-issues 
Correct a number of minor issues in capillary pressure scaling code
 2014-08-08 10:11:38 +02:00
Atgeirr Flø Rasmussen f32198a040 Properly handle defaulted well reference depths. 2014-08-07 12:57:05 +02:00
Atgeirr Flø Rasmussen 6947423b97 Merge pull request #613 from andlaus/PvtLiveOil_fix_argument_ordering 
PvtLiveOil: fix ordering of arguments
 2014-07-07 14:23:54 +02:00
Atgeirr Flø Rasmussen 0ff5fff701 Merge pull request #611 from andlaus/update_ewoms_prereqs 
Find-ewoms.cmake: update prerequisites
 2014-07-07 14:12:23 +02:00
Atgeirr Flø Rasmussen ace1e3306a Merge pull request #607 from osae/swatinit 
Scaling of capillary pressure / initialisation from kw SWATINIT.
 2014-07-07 14:10:02 +02:00
Atgeirr Flø Rasmussen ec205ace37 Merge pull request #612 from bska/resv-support 
Implement deep copy operation for struct WellControls
 2014-07-04 16:09:13 +02:00
Atgeirr Flø Rasmussen 81c47c07db Merge pull request #605 from atgeirr/fix_mdu 
Fixes for tof and tracer solvers
 2014-07-03 16:03:40 +02:00
Atgeirr Flø Rasmussen e8db63dfb0 Fix initialization of tracer heads, and output ordering. 2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen 59d0ae185f Refactor tracer computations. 
Current version executes reordered solve once for each tracer. The benefit
is a simpler code and the ability to use MDU with tracers. The cost is
potentially higher runtime, compared to doing a single sweep for all
tracers (and tof).
 2014-06-24 09:43:26 +02:00
Atgeirr Flø Rasmussen 11bea99bef Remove unused data member. 2014-06-23 14:18:01 +02:00
Atgeirr Flø Rasmussen 4d2043a3ba Clean up dead code for MDU, update comment. 2014-06-23 14:05:51 +02:00
Atgeirr Flø Rasmussen cf36cbe6d1 Add tracers_ensure_unity parameter. 
When this boolean parameter is true (the default), tracer solutions
will be normalized so that the tracer averages will sum to one in each cell.
This behaviour is the same as before, the change is that it can now be
turned off.
 2014-06-23 14:03:49 +02:00
Atgeirr Flø Rasmussen 8dceb4b08c Activate MDU option, making SMU method its default. 2014-06-23 11:29:14 +02:00
Atgeirr Flø Rasmussen b3454a03b8 Fix bugs in MDU. 2014-06-23 11:23:16 +02:00
Atgeirr Flø Rasmussen d498143488 Add computation of face tofs parts. 
This must be done after the cell tof has been computed since they
depend on it.
 2014-06-23 11:22:14 +02:00
Atgeirr Flø Rasmussen 57cb41217f First compiling version of fixed MDU method. 2014-06-19 15:11:32 +02:00
Atgeirr Flø Rasmussen 1080e37fb0 Fix use of assert. 2014-06-16 13:44:00 +02:00
Atgeirr Flø Rasmussen d788814259 Work in progress fixing multidim upwinding. 2014-06-16 13:14:42 +02:00
Atgeirr Flø Rasmussen 2b6fdc6259 Removed unused debugging output. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen 5e5b9e091d Split method solveSingleCell() for easier maintenance. 2014-06-16 12:49:41 +02:00
Atgeirr Flø Rasmussen eed5892e98 Merge pull request #600 from bska/restore-build 
[buildsystem] Disable search for Boost in parser detection
 2014-06-13 13:04:56 +02:00
Atgeirr Flø Rasmussen 55427b2220 Merge pull request #592 from andlaus/convert_time_to_days_in_ecl_summary_output 
Eclipse summary output: always convert the simulation time to days
 2014-05-20 16:01:16 +02:00
Atgeirr Flø Rasmussen d50b7ab4aa Merge pull request #589 from atgeirr/fix-comparison-warning 
Supress signed-unsigned comparison warning.
 2014-05-12 09:22:42 +02:00
Atgeirr Flø Rasmussen 9690ccc978 Supress signed-unsigned comparison warning. 2014-05-12 09:18:52 +02:00
Atgeirr Flø Rasmussen a681bcf869 Merge pull request #573 from osae/test-eps 
Endpoint scaling - taking advantage of the new parser.
 2014-05-12 08:28:48 +02:00
Atgeirr Flø Rasmussen 7e9fbcba4f Merge pull request #586 from osae/equil-update 
EQLNUM in case of non-trivial ACTNUM
 2014-05-09 21:34:32 +02:00
Atgeirr Flø Rasmussen c830211272 Add missing break statements in switch, add default case. 2014-04-24 15:43:54 +02:00
Atgeirr Flø Rasmussen c62dfe5219 Merge pull request #576 from bska/sync-build 
[buildsystem] Make dune-cornerpoint a suggestion.
 2014-04-22 10:34:57 +02:00
Atgeirr Flø Rasmussen 773cbc96d2 Fix option name to match name in use in conditional. 
Also add a useful doc string.
 2014-04-22 09:50:29 +02:00
Atgeirr Flø Rasmussen 2a29deff1c Change option name and generated header names. 2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen e04cafe57e Merge branch 'suppress-warnings' into suppress-external-warnings 2014-04-15 19:49:19 +02:00
Atgeirr Flø Rasmussen f0692b14e9 Make function in header file inline. 2014-04-15 19:47:04 +02:00
Atgeirr Flø Rasmussen 138f4f7aba Added more warnings to suppression list, sorted list. 2014-04-15 19:46:16 +02:00
Atgeirr Flø Rasmussen bfd3246d33 Fix access to keywords, while still silencing warning. 
Previous fix was wrong because it called getKeyword() outside the
hasKeyword() check. Current version (like original code) uses the
short-circuiting behaviour of && to ensure this.
 2014-04-15 14:52:21 +02:00
Atgeirr Flø Rasmussen c603103a3d Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings 2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen ef5a21d710 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen 6b2bc6c4d6 Avoid signed/unsigned warning. 2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen 3ec1e22f21 Comment out unused function argument. 2014-04-15 13:40:15 +02:00
Atgeirr Flø Rasmussen 049df8bc60 Avoid signed/unsigned mismatch. 2014-04-15 13:39:44 +02:00
Atgeirr Flø Rasmussen 0aa72eda5d Comment or add (void) usage of unused arguments. 2014-04-15 13:39:03 +02:00
Atgeirr Flø Rasmussen f1b4321d28 Merge pull request #569 from atgeirr/fix-incomplete-removal 
Remove grdecl.h from file list.
 2014-04-10 20:54:54 +02:00
Atgeirr Flø Rasmussen 14e93aea75 Remove grdecl.h from file list. 2014-04-10 20:51:06 +02:00
Atgeirr Flø Rasmussen 53690a448f Merge pull request #568 from andlaus/remove_grdecl_h 
remove second grdecl.h header file
 2014-04-10 20:47:54 +02:00
Atgeirr Flø Rasmussen f0c334a901 Merge pull request #563 from osae/testEPS 
New parser; proper handling of ENPTVD/ENKRVD.
 2014-04-08 13:51:43 +02:00
Atgeirr Flø Rasmussen 59bdd5f31e Changed documentation of Wells::comp_frac to match reality. 2014-04-06 23:45:08 +02:00
Atgeirr Flø Rasmussen 3d98f7a77e Use preferred phase of producer well to set comp_fraction. 
This replaces the previous hack, that set comp_fraction to (0,1,0) always.
 2014-04-06 23:33:43 +02:00
Atgeirr Flø Rasmussen 954924064f Merge remote-tracking branch 'totto82/add_compi_producers' into add_compi_producers 2014-04-05 00:18:38 +02:00
Atgeirr Flø Rasmussen c0ecf0bc77 Merge pull request #559 from andlaus/EclipseWriter_fix_summary_output 
Eclipse writer fix summary output
 2014-04-04 23:30:31 +02:00
Atgeirr Flø Rasmussen 55fe6b5b69 Merge pull request #558 from andlaus/EclipseWriter_refactor_writeInit_semantics 
Eclipse writer refactor write init semantics
 2014-04-04 23:24:48 +02:00
Atgeirr Flø Rasmussen 4f330ea07b Merge pull request #557 from andlaus/EclipseWriter_remove_old_parser 
Eclipse writer remove old parser
 2014-04-04 23:02:24 +02:00
Atgeirr Flø Rasmussen 4d5a92e3ff Add test data files needed for test_equil to the right cmake list. 2014-04-04 22:53:34 +02:00
Atgeirr Flø Rasmussen b07cd277a7 Merge pull request #561 from totto82/fix_viscosity_table 
Fix undersaturated viscosity table
 2014-04-04 22:41:11 +02:00
Atgeirr Flø Rasmussen a47c9c7330 Merge pull request #544 from osae/equil-init 
Equil init
 2014-04-04 22:39:37 +02:00
Atgeirr Flø Rasmussen f6e8fbbbfa Bugfix: skin factor, not diameter. 2014-03-31 14:47:16 +02:00
Atgeirr Flø Rasmussen 2a5dc33bb8 Merge pull request #551 from atgeirr/re-add-bhp-eclipsewriter 
Re-add the bhp reports to the summary output.
 2014-03-28 14:11:03 +01:00
Atgeirr Flø Rasmussen 0303a9afab Merge pull request #546 from GitPaean/test_data_for_new_SimulatorTimer 
A new SimulatorTimer and the test code and test data
 2014-03-28 13:51:00 +01:00
Atgeirr Flø Rasmussen 3adcadff42 Remove debug output. 2014-03-28 13:04:32 +01:00
Atgeirr Flø Rasmussen 27a396b439 This re-adds the bhp reports to the summary output. 
It was lost in the shuffling bewteen branches when working on the new parser.
 2014-03-28 13:01:10 +01:00
Atgeirr Flø Rasmussen 62a0cf16c5 Merge pull request #542 from joakim-hove/remove-old-WellsManager 
Removed deprecated WellsManager constructor
 2014-03-25 23:28:22 +01:00
Atgeirr Flø Rasmussen 84ffe95fc1 Merge pull request #541 from GitPaean/fix_timer_bug_temp 
Output correct information for temporary use.
 2014-03-25 10:16:43 +01:00
Atgeirr Flø Rasmussen 417c08e890 Merge pull request #536 from andlaus/EclipseWriter_dont_restrict_pressure 
EclipseWriter: don't convert the pressure field to active cells
 2014-03-21 08:59:41 +01:00
Atgeirr Flø Rasmussen 86ed298439 Merge pull request #540 from joakim-hove/wellsmanager-well-properties 
Changed the access method to well rates/properties
 2014-03-21 08:58:07 +01:00
Atgeirr Flø Rasmussen 0c877459e4 Merge pull request #537 from andlaus/EclipseWriter_workaround_for_gcc_4_4 
EclipseWriter: work around a GCC 4.4 smart_ptr bug
 2014-03-21 08:55:49 +01:00
Atgeirr Flø Rasmussen ef5ee72c8e Merge pull request #539 from blattms/fix-pr-532 
Fixes issues in pull request #532
 2014-03-21 08:53:58 +01:00
Atgeirr Flø Rasmussen ae5d9746e0 Merge pull request #534 from blattms/fixes-issue-533 
Use empty constructor to construct empty shared_ptr.
 2014-03-20 11:00:00 +01:00
Atgeirr Flø Rasmussen 550048b468 Merge pull request #523 from andlaus/EclipseWriter_add_new_parser 
EclipseWriter: add new parser
 2014-03-20 09:03:06 +01:00
Atgeirr Flø Rasmussen b21d61c151 Merge pull request #532 from blattms/add-linsolver-test 
Added a test for the linear solver interface.
 2014-03-20 08:46:17 +01:00
Atgeirr Flø Rasmussen b461e35ae5 Merge pull request #531 from blattms/support-fast-amg-2.3-part2 
Complete cf7f07b PR #530 to support FastAMG with dune-istl 2.3
 2014-03-19 20:47:48 +01:00
Atgeirr Flø Rasmussen f2d3098e50 Merge pull request #530 from blattms/support-fast-amg-2.3 
Makes KAMG and FastAMG solver available with dune-istl 2.3
 2014-03-19 15:28:23 +01:00
Atgeirr Flø Rasmussen 3d9ef44625 Merge pull request #528 from blattms/fix-nonunifom 
Fixes compilation of BlackoilPropertiesFromDeck.cpp.
 2014-03-19 12:31:05 +01:00
Atgeirr Flø Rasmussen f4c899db4b Merge pull request #525 from andlaus/SimulatorTimer_allow_to_be_limited_to_subranges 
SimulatorTimer: allow it to be limited to a sub-range of all report steps
 2014-03-19 12:21:37 +01:00
Atgeirr Flø Rasmussen 830459d9d0 Merge pull request #529 from andlaus/change_default_threephase_model 
endpoint scaling: change default threephase_model to gwseg
 2014-03-19 12:19:28 +01:00
Atgeirr Flø Rasmussen a529dd5ae4 Merge pull request #517 from blattms/issue-516 
Apply changes from commit a953ba8 to new parser code too.
 2014-03-19 08:29:16 +01:00
Atgeirr Flø Rasmussen 847e0b3bcb Merge pull request #527 from andlaus/fix_blackoil_pvt_props_in_new_parser 
fix densities for new parser in BlackoilPvtProperties
 2014-03-18 23:27:31 +01:00
Atgeirr Flø Rasmussen 24e4d087d8 Merge pull request #526 from andlaus/endpoint_scaling_correct_revers_condition 
endpoint scaling: invert condition
 2014-03-18 15:51:16 +01:00
Atgeirr Flø Rasmussen 1ef11653b4 Merge pull request #515 from andlaus/EclipseWriter_cleanups 
Eclipse writer cleanups
 2014-03-17 15:24:07 +01:00
Atgeirr Flø Rasmussen f8f7550782 Made single-argument constructors explicit. 
Avoids unintended implicit conversions.
 2014-03-17 13:27:50 +01:00
Atgeirr Flø Rasmussen 065efc5b0e Merge pull request #520 from qilicun/plyshear 
Read keyword PLYSHEAR.
 2014-03-14 12:36:21 +01:00
Atgeirr Flø Rasmussen d2e6ccec33 Fix logic related to open/shut wells initialisation. 2014-03-14 11:27:20 +01:00
Atgeirr Flø Rasmussen d25b9cd13a Merge pull request #514 from joakim-hove/wells-cpos-manipulation 
Removed cpos = ~cpos constructions for closing a well
 2014-03-14 11:08:53 +01:00
Atgeirr Flø Rasmussen c59727720d Merge pull request #511 from andlaus/initStateFromDeck_reverse_PRESSURE_and_EQUIL 
initStateFromDeck: reverse the priorities of the PRESSURE and EQUIL keywords
 2014-03-13 20:30:31 +01:00
Atgeirr Flø Rasmussen ddf256a451 Merge pull request #512 from karbor/master 
Added support of SWCR and SOWCR in CornerpointChopper
 2014-03-11 20:54:02 +01:00
Atgeirr Flø Rasmussen f1377d9729 Bugfix: || -> && 2014-03-11 12:54:04 +01:00
Atgeirr Flø Rasmussen c46ad990c1 Assert to avoid future surprises. 
Well types must be either INJECTOR or PRODUCER for now, if
we change this in the future, we should check this part of
the code as well.
 2014-03-11 12:51:49 +01:00
Atgeirr Flø Rasmussen dbd0635fda Commented choices in initialisation of well rates. 2014-03-11 12:50:58 +01:00
Atgeirr Flø Rasmussen e510dde102 Initialize well rates better. 
Instead of making well rates zero for wells that are not controlled by
surface volume, we initialize them to a small value with the correct
sign (positive for injectors, negative for producers).
 2014-03-10 13:30:43 +01:00
Atgeirr Flø Rasmussen 9edbe36b58 Remove extra semicolon. 2014-03-06 08:24:00 +01:00
Atgeirr Flø Rasmussen ec22c9b491 Remove warning pragmas. 
They are only available on gcc 4.6 and newer, and clang.
 2014-03-05 08:41:53 +01:00
Atgeirr Flø Rasmussen f35c193b38 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen 97328b5a17 Suppress warnings from included istl code. 
This is done using #pragma GCC and works also in clang.
 2014-03-04 11:31:16 +01:00
Atgeirr Flø Rasmussen 37ddb928cf Merge pull request #505 from bska/prereqs-nit 
Fix a few nits in "opm-core-prereqs.cmake"
 2014-03-04 10:37:54 +01:00
Atgeirr Flø Rasmussen 73926a1b21 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Atgeirr Flø Rasmussen 55d0055d84 Merge pull request #503 from bska/503_cmake 
[CMake] Propagate Boost.Iostreams to all modules
 2014-03-03 10:45:01 +01:00
Atgeirr Flø Rasmussen 0eb32276fb Allow direct interpolation of props with new parser. 
After transitioning to use the new parser, the SinglePvtDead class was never
used even when the 'samples' argument used to control usage was zero or negative.
The resulting construction of SinglePvtDeadSpline objects was then failing.

This change adds a new constructor to SinglePvtDead, and restores the ability
to control spline usage with the samples argument.
 2014-03-03 09:17:11 +01:00