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
1,356 Commits 31 Branches 117 Tags
d91c49cffd41b1211ebafee364e3a0a1f3da7170
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 320c3332ad Add missing break statements in switch, add default case. 2014-04-24 15:43:54 +02:00
Atgeirr Flø Rasmussen be5af2378a Change option name and generated header names. 2014-04-15 20:21:10 +02:00
Atgeirr Flø Rasmussen 883e955176 Merge branch 'suppress-warnings' into suppress-external-warnings 2014-04-15 19:49:19 +02:00
Atgeirr Flø Rasmussen ba26696d22 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 bd4eef5a86 Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings 2014-04-15 14:35:01 +02:00
Atgeirr Flø Rasmussen b225970686 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Atgeirr Flø Rasmussen cd0d48abbd Avoid signed/unsigned warning. 2014-04-15 13:40:50 +02:00
Atgeirr Flø Rasmussen 645ff76a0b Comment out unused function argument. 2014-04-15 13:40:15 +02:00
Atgeirr Flø Rasmussen 798ef0d070 Comment or add (void) usage of unused arguments. 2014-04-15 13:39:03 +02:00
Atgeirr Flø Rasmussen bbe5a0f776 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 28abf88520 Changed documentation of Wells::comp_frac to match reality. 2014-04-06 23:45:08 +02:00
Atgeirr Flø Rasmussen db88058b34 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 94d45c4c3d Merge remote-tracking branch 'totto82/add_compi_producers' into add_compi_producers 2014-04-05 00:18:38 +02:00
Atgeirr Flø Rasmussen cb9c36df65 Merge pull request #544 from osae/equil-init 
Equil init
 2014-04-04 22:39:37 +02:00
Atgeirr Flø Rasmussen eb19031c17 Bugfix: skin factor, not diameter. 2014-03-31 14:47:16 +02:00
Atgeirr Flø Rasmussen 5a9786aa32 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 a9a3b423f0 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 331342d753 Merge pull request #528 from blattms/fix-nonunifom 
Fixes compilation of BlackoilPropertiesFromDeck.cpp.
 2014-03-19 12:31:05 +01:00
Atgeirr Flø Rasmussen 3d178087e7 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 5fc6cbc16f Made single-argument constructors explicit. 
Avoids unintended implicit conversions.
 2014-03-17 13:27:50 +01:00
Atgeirr Flø Rasmussen a13f7b990f Fix logic related to open/shut wells initialisation. 2014-03-14 11:27:20 +01:00
Atgeirr Flø Rasmussen 5bd306e7f0 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 c0fd117103 Bugfix: || -> && 2014-03-11 12:54:04 +01:00
Atgeirr Flø Rasmussen a592a23153 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 db6a36d1fd Commented choices in initialisation of well rates. 2014-03-11 12:50:58 +01:00
Atgeirr Flø Rasmussen c0ddb9707e 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 85a323e7da 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 ae0464afe3 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen 95a17f847a 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 b40d2e63d0 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Atgeirr Flø Rasmussen c2b647d245 Add test data file for compute_initial_state.cpp. 2014-02-27 15:55:08 +01:00
Atgeirr Flø Rasmussen d13bf03e1f Bugfix in RsSatAtContact: use min(), not max(). 
Also modified test to match output.
 2014-02-27 14:57:38 +01:00
Atgeirr Flø Rasmussen 1c9675605c Fix bug in RS initialisation. 
Also throw if default init is specified and datum != goc depth.
 2014-02-27 14:48:14 +01:00
Atgeirr Flø Rasmussen 200b5372dd Added simple program example for initialisation. 2014-02-27 13:55:15 +01:00
Atgeirr Flø Rasmussen 1b3cac2433 Remove debugging output. 2014-02-27 13:27:07 +01:00
Atgeirr Flø Rasmussen af9c1fc4cc Add computeRs() function and use from InitialStateComputer. 2014-02-27 13:14:48 +01:00
Atgeirr Flø Rasmussen f84162bc39 Add initStateEquil() function. 
It is not quite complete yet for the following reasons:
  - it does not compute state.surfacevol(),
  - the InitialStateComputer class does not compute Rs or Rv,
  - it has not been verified.
 2014-02-27 10:40:14 +01:00
Atgeirr Flø Rasmussen 4aaeff0078 Added Rv field to InitialStateComputer. 
It is currently not computed, as for Rs.
 2014-02-27 10:39:18 +01:00
Atgeirr Flø Rasmussen 0fbc3a1ccb Moved implementation of phaseSaturations() to _impl file. 2014-02-27 09:37:48 +01:00
Atgeirr Flø Rasmussen a1192c09dc Refactor copying of region to global data. 2014-02-27 09:31:48 +01:00
Atgeirr Flø Rasmussen a7c45d4e9f Rename PhasePressureSaturationComputer -> InitialStateComputer. 
Also add (unused so far) rs_ field to class.
 2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen 91ae9df907 Add test for live oil initialisation. 
The test is not finished or verified yet.
 2014-02-27 08:31:51 +01:00
Atgeirr Flø Rasmussen 27743b4a13 Enable live oil in initialisation. 2014-02-27 08:31:03 +01:00
Atgeirr Flø Rasmussen d5ffcc051c Removed redundant calcPressII() method. 
Pressure is also calculated in the calcPressSat() method.
 2014-02-26 14:49:06 +01:00
Atgeirr Flø Rasmussen 38c89f363d Made phase mixing functors a class hierarchy. 
In summary:
 - added RsFunction (base class),
 - made NoMixing, RsVD, RsSatAtContact inherit RsFunction,
 - RS and RV are no longer template arguments for EquilReg class,
 - EquilReg constructor now takes two shared_ptr<Miscibility::RsFunction>,
 - use of constructor updated, mostly using make_shared.
 2014-02-26 14:47:24 +01:00
Atgeirr Flø Rasmussen 8266c52d99 Made NoMixing a class. 
For uniformity with its sibling classes.
 2014-02-26 14:16:51 +01:00
Atgeirr Flø Rasmussen 74573947bb Prune includes. 2014-02-24 16:11:50 +01:00
Atgeirr Flø Rasmussen 7e0bd62205 Moved equilibration utilities to separate file. 2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen 64b6a40191 Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2014-02-24 15:55:14 +01:00
Atgeirr Flø Rasmussen 2b0fcfe748 Move RegionMapping class to its own header, add test. 
Class now resides in opm/core/utility/RegionMapping.hpp.
 2014-02-24 15:19:04 +01:00
Atgeirr Flø Rasmussen c689bc757f Added class RsSatAtContact (not tested). 2014-02-24 13:47:03 +01:00
Atgeirr Flø Rasmussen 83d0487097 Add test case with overlapping transitions. 
Capillary pressure functions and contact depths
have been modified to ensure a large overlap.
 2014-02-21 14:50:45 +01:00
Atgeirr Flø Rasmussen 6c8babc7d2 Fix bug in saturation initialisation. 
We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
 2014-02-21 14:47:14 +01:00
Atgeirr Flø Rasmussen 6ef6b82ab5 Merge branch 'no-spline-default' into initialisation. 
Necessary since test case behaviour depends on changes in
BlackoilPropertiesFromDeck class.
 2014-02-21 11:01:44 +01:00
Atgeirr Flø Rasmussen 50637e1a3b Make linear interpolation default for saturation properties. 
This includes relative permeability and capillary pressure functions.
The default has been to make a monotone spline from the given table
values and use a fine, uniform sampling of that. Now the default
is to use the tables as-is. It is still possible to use the spline
approach. For example in the class BlackoilPropertiesFromDeck one
may pass nonzero values for the 'pvt_tab_size' and 'sat_tab_size'
parameters, corresponding to how fine the spline will be sampled.
 2014-02-21 09:54:47 +01:00
Atgeirr Flø Rasmussen 7d63cb9204 Add test case with capillary transition region. 2014-02-21 08:55:15 +01:00
Atgeirr Flø Rasmussen b2be489e6e Add saturation computation to and rename computer class. 
Opm::equil::DeckDependent::PhasePressureComputer ->
Opm::equil::DeckDependent::PhasePressureSaturationComputer
 2014-02-21 08:52:25 +01:00
Atgeirr Flø Rasmussen dc6bcead91 Add test case for capillary inversion. 2014-02-21 08:32:15 +01:00
Atgeirr Flø Rasmussen 4ec65f2f8f Add another test deck for initialisation. 
This deck includes capillary functions.
 2014-02-20 15:39:15 +01:00
Atgeirr Flø Rasmussen e1069cf39b Fix bugs in saturation initialisation and helpers. 2014-02-20 15:24:27 +01:00
Atgeirr Flø Rasmussen b09dd7750a Add saturation init facilities. 
This adds the function phaseSaturations() and some helpers:
satFromPc() and satFromSumOfPcs().
 2014-02-19 13:42:07 +01:00
Atgeirr Flø Rasmussen ebb6eaf742 Complete pressure test for dead-oil deck. 2014-02-19 13:41:20 +01:00
Atgeirr Flø Rasmussen 2ebaef62a0 Modify test data. 2014-02-19 13:40:02 +01:00
Atgeirr Flø Rasmussen 82216fa24f Add (defaulted) gravity argument in some places. 
This is done to facilitate testing, using gravity = 10 m/s^2 for example.
 2014-02-19 13:38:21 +01:00
Atgeirr Flø Rasmussen 1f2b2eadc5 Merge branch 'master' into initialisation 2014-02-10 13:24:35 +01:00
Atgeirr Flø Rasmussen cb99938c62 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Atgeirr Flø Rasmussen b134fe048a Still working on test_equil.cpp. 2014-02-05 11:26:29 +01:00
Atgeirr Flø Rasmussen 04eea929ba Fix contact depths in test deck. 2014-02-04 10:57:23 +01:00
Atgeirr Flø Rasmussen 45de38a019 Throw exception if datum not in oil zone. 
We are not capable of handling this, and must abort.
 2014-02-04 10:56:09 +01:00
Atgeirr Flø Rasmussen 634b78a9d9 Created simple data for init testing. 2014-02-04 09:38:47 +01:00
Atgeirr Flø Rasmussen 85be4b1263 Add (unfinished) test case. 2014-02-03 15:36:20 +01:00
Atgeirr Flø Rasmussen 30d65e6c32 Removed RK4IVP's inheritance from binary_function. 
Three reasons:
 - class is a unary functor,
 - the typedefs obtained were not used,
 - binary_function is deprecated in C++11.
 2014-02-03 11:32:46 +01:00
Atgeirr Flø Rasmussen 0061b25408 Merge remote-tracking branch 'bska/initialisation' into initialisation 2014-01-31 15:41:58 +01:00
Atgeirr Flø Rasmussen 5ce1d09370 Merge pull request #478 from osae/endscale 
Saturation table scaling and hysteresis.
 2014-01-31 05:48:56 -08:00
Atgeirr Flø Rasmussen 847a8f4f7a Bugfix: vector was used with size zero. 2013-10-16 14:02:15 +02:00
Atgeirr Flø Rasmussen 88011cca2e Modify error message. 2013-10-07 12:57:51 +02:00
Atgeirr Flø Rasmussen d4bb9c0611 Guard against erroneous use of initBlackoilSurfvol(). 2013-10-07 12:46:35 +02:00
Atgeirr Flø Rasmussen 5140d99e60 Merge pull request #386 from totto82/propsMRST 
Changes to the props in order to  sync with MRST (Eclipse)
 2013-10-07 03:41:09 -07:00
Atgeirr Flø Rasmussen dcaac93e23 Remove unneeded term, fixing oil injecting behaviour. 
The 'comp_term' is supposed to be a total divergence term, which is supposed
to be zero for incompressible flow. It was added for improved robustness in
stagnant areas, but as implemented it would not be computed properly for
oil injection scenarios, due to the convention for two-phase transport
source terms (positive terms are inflow of first phase [water], negative
terms are total outflow).
 2013-10-04 13:16:02 +02:00
Atgeirr Flø Rasmussen 13ddbad9a1 Merge pull request #400 from bska/Wunused 
Remove unused "typedef"s
 2013-10-03 06:52:09 -07:00
Atgeirr Flø Rasmussen d7dc0abc13 Further improved WellReport and Watercut docs. 2013-09-24 14:39:41 +02:00
Atgeirr Flø Rasmussen 87466f25d2 Documented WellReport and Watercut classes. 2013-09-24 14:14:54 +02:00
Atgeirr Flø Rasmussen df8981ed2d Merge pull request #376 from rolk/376_warn 
Quelch needless warnings (found by Clang)
 2013-09-19 05:05:00 -07:00
Atgeirr Flø Rasmussen fb77fffdc8 Merge pull request #263 from bska/remove-redef-kluge 
Disable build kluge that is no longer pertinent
 2013-06-24 06:02:10 -07:00
Atgeirr Flø Rasmussen 55e58deea6 Add transMult(), poroMultDeriv() and transMultDeriv(). 2013-06-03 14:33:18 +02:00
Atgeirr Flø Rasmussen 5d457ff708 Ensures well rate initialization actually happens. 
Do not use the well's comp_frac member, only rely on the control's distr
member for initialization. This forced a change to WellsManager's
initialization of the distr member.
 2013-06-02 23:30:43 +02:00
Atgeirr Flø Rasmussen 175cecacda Bugfix in well rate init. 
Do not always try to initialize, also initialize proper phase rates.
 2013-06-02 22:19:43 +02:00
Atgeirr Flø Rasmussen ad4c9a47e0 Refined well state initialization. 
For SURFACE_RATE controlled wells, initialize wellRates() to match.
 2013-06-02 21:58:30 +02:00
Atgeirr Flø Rasmussen c280f2b0dd Initialize rate-controlled well bhp with safety factor. 
Safety factor is 1.01 (INJECTOR) or 0.99 (PRODUCER), similar to
mrst's ad-fi/utils/initWellSolLocal.m > initialize().
 2013-05-30 11:03:08 +02:00
Atgeirr Flø Rasmussen a0a9c482ea Created new initialization routine, using RS from deck. 2013-05-27 15:44:07 +02:00
Atgeirr Flø Rasmussen 6e9a46b34d Added gasoilratio() to BlackoilState. 2013-05-27 12:53:06 +02:00
Atgeirr Flø Rasmussen 125c573461 Added assert to guard against wrong usage. 2013-05-24 09:21:41 +02:00
Atgeirr Flø Rasmussen 1cf0bb465b Fix bug in upwinding code. 
Accidental usage of std::vector's operator< discovered.
 2013-05-24 09:20:46 +02:00
Atgeirr Flø Rasmussen 8592ca825a Added wellRates() member. 2013-05-21 23:54:30 +02:00
Atgeirr Flø Rasmussen 8c92a47b89 Merge remote-tracking branch 'upstream/master' into add-phaseusage-to-interface 2013-05-15 10:10:18 +02:00
Atgeirr Flø Rasmussen d312f760e1 Add phaseUsage() method to BlackoilPropertiesInterface. 
Also implement method in derived classes.
 2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen 9b56384647 Ensure (average of) tracers sum to one for DG1. 2013-05-13 16:17:41 +02:00
Atgeirr Flø Rasmussen 15ab570cd5 Added limiter for tracer. 2013-04-24 11:27:04 +02:00
Atgeirr Flø Rasmussen 5401baf533 Add call to DG tracer computations if user requests. 
Used to throw with an 'unimplemented' message.
 2013-04-24 10:40:56 +02:00
Atgeirr Flø Rasmussen 8a894ca686 Add tracer computations (method solveTofTracer()). 
Same interface as in class TofReorder.
 2013-04-24 10:39:50 +02:00