OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,103 Commits 9 Branches 35 Tags 15 MiB
7cc0802f3e
Commit Graph

4103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
7cc0802f3e 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
5a00d85467 Enable live oil in initialisation. 2014-02-27 08:31:03 +01:00
Atgeirr Flø Rasmussen
db06c2eb80 Removed redundant calcPressII() method. 
Pressure is also calculated in the calcPressSat() method.
 2014-02-26 14:49:06 +01:00
Atgeirr Flø Rasmussen
8ef54b7c64 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
75ca41805e Made NoMixing a class. 
For uniformity with its sibling classes.
 2014-02-26 14:16:51 +01:00
Atgeirr Flø Rasmussen
c80ffbefbb Prune includes. 2014-02-24 16:11:50 +01:00
Atgeirr Flø Rasmussen
4a8c0dd955 Moved equilibration utilities to separate file. 2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen
14276f9175 Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2014-02-24 15:55:14 +01:00
Atgeirr Flø Rasmussen
34595ae225 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
2caf790c29 Added class RsSatAtContact (not tested). 2014-02-24 13:47:03 +01:00
Atgeirr Flø Rasmussen
2b8deb20fd 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
f9195b8243 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
2fefe256a4 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
a953ba8659 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
c7af2aa8ca Add test case with capillary transition region. 2014-02-21 08:55:15 +01:00
Atgeirr Flø Rasmussen
e6d21e31d3 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
5e1ad40afd Add test case for capillary inversion. 2014-02-21 08:32:15 +01:00
Atgeirr Flø Rasmussen
4408ea669b Add another test deck for initialisation. 
This deck includes capillary functions.
 2014-02-20 15:39:15 +01:00
Atgeirr Flø Rasmussen
c4b3bcae41 Fix bugs in saturation initialisation and helpers. 2014-02-20 15:24:27 +01:00
Atgeirr Flø Rasmussen
71245ded79 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
e81aa92c03 Complete pressure test for dead-oil deck. 2014-02-19 13:41:20 +01:00
Atgeirr Flø Rasmussen
f6f4a1a0da Modify test data. 2014-02-19 13:40:02 +01:00
Atgeirr Flø Rasmussen
0d7ec9cce0 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
b3ac9529c8 Merge branch 'master' into initialisation 2014-02-10 13:24:35 +01:00
Atgeirr Flø Rasmussen
995064635f Merge pull request #492 from flikka/initialize-bug 
Initializing do_hyst_ to false, this caused random segfaults in sim_fibo...
 2014-02-06 23:38:59 +01:00
Kristian Flikka
5cc903bbe0 Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad 2014-02-06 21:17:36 +01:00
Atgeirr Flø Rasmussen
45b080b5be Merge pull request #489 from atgeirr/fix-more-warnings 
Fix more warnings found by clang
 2014-02-05 18:26:57 +01:00
Atgeirr Flø Rasmussen
91c1131aff Merge pull request #487 from atgeirr/fix-warnings 
Fix some warnings
 2014-02-05 18:26:43 +01:00
Atgeirr Flø Rasmussen
d2e1eb8d02 Merge pull request #485 from atgeirr/fix-initial-call-eclipsewriter 
Fix SimulatorTimer-related bug in EclipseWriter.
 2014-02-05 18:25:29 +01:00
Atgeirr Flø Rasmussen
54b0c90a07 Merge pull request #488 from atgeirr/fix-eclipsewriter-for-clang 
Fix eclipsewriter for clang
 2014-02-05 18:24:31 +01:00
Atgeirr Flø Rasmussen
a9bcbd64db Fix unused argument warning and wrong behaviour. 
The class WarnAndContinueOnError should write warnings irrespective
of the status of the OPM_VERBOSE symbol.
 2014-02-05 15:07:17 +01:00
Atgeirr Flø Rasmussen
6100f1758f Fix variable shadowing warning. 2014-02-05 15:05:26 +01:00
Atgeirr Flø Rasmussen
9396d8b3ed Fix unused argument warnings. 2014-02-05 15:04:56 +01:00
Atgeirr Flø Rasmussen
9d0dd9c961 Removed unused argument from buildTracerHeadsFromWells(). 2014-02-05 15:03:35 +01:00
Atgeirr Flø Rasmussen
2250d7bb95 Suppressed some unused parameter warnings. 2014-02-05 14:46:22 +01:00
Atgeirr Flø Rasmussen
8ad4dd172f Moved explicit template instantiation inside namespace. 
Clang requires this to happen inside the namespace of the class
(which is in the anonymous namespace) and issues an error diagnostic.
 2014-02-05 14:44:58 +01:00
Atgeirr Flø Rasmussen
543230c8cf Suppress warnings in unimplemented functions. 
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
 2014-02-05 14:27:51 +01:00
Atgeirr Flø Rasmussen
708f9a2fa3 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Joakim Hove
42f3dec6d0 Merge pull request #486 from osae/fixCmake 
Added SatFuncBase.hpp to CMakeLists_files.cmake
 2014-02-05 12:52:39 +01:00
osae
25b5f23f37 Added SatFuncBase.hpp to CMakeLists_files.cmake 2014-02-05 12:22:50 +01:00
Atgeirr Flø Rasmussen
a2b7f0a4e4 Fix SimulatorTimer-related bug in EclipseWriter. 
Since writeTimeStep() now gets called also before the first timestep is done,
the EclipseWellTotal::update() method was in error, always calling
SimulatorTimer::stepLengthTaken(). That method cannot be called if the
timer's currentStepNum() is 0, so that is checked for and intercepted.
The total rate in that case is of course zero.
 2014-02-05 11:28:40 +01:00
Atgeirr Flø Rasmussen
4396130765 Still working on test_equil.cpp. 2014-02-05 11:26:29 +01:00
Atgeirr Flø Rasmussen
b1ffc25476 Fix contact depths in test deck. 2014-02-04 10:57:23 +01:00
Atgeirr Flø Rasmussen
c409bd2874 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
f7a2989697 Created simple data for init testing. 2014-02-04 09:38:47 +01:00
Atgeirr Flø Rasmussen
562b00effb Add (unfinished) test case. 2014-02-03 15:36:20 +01:00
Atgeirr Flø Rasmussen
5a37091d4e 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
Bård Skaflestad
1513712e6b Merge pull request #481 from atgeirr/fix-summary-output 
Fix summary output, now contains output for all steps.
 2014-01-31 11:49:58 -08:00
Atgeirr Flø Rasmussen
48f210ebbd Merge remote-tracking branch 'bska/initialisation' into initialisation 2014-01-31 15:41:58 +01:00
Atgeirr Flø Rasmussen
93632eb092 Merge pull request #476 from andlaus/fix_eigen3_version 
Corrects required version and make Eigen3 download work.
 2014-01-31 05:49:57 -08:00