Commit Graph
18 Commits
Author SHA1 Message Date
osae dbe6d2911d Endpoint scaling and hysteresis for gwseg.
Activation of eps and hysteresis treatment for gwseg. Also some
additional initialization.
2014-02-18 13:49:35 +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 9396d8b3ed Fix unused argument warnings. 2014-02-05 15:04:56 +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
osae fa470063ca Saturation table scaling and hysteresis.
This commit implements some additional scaling keywords.  This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables.  The old parser has been somewhat extended for
testing purposes.  The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
2014-01-28 16:36:55 +01:00
Tor Harald Sandve f7857a51a8 Changes in the 3p relperm definition
The relperm of water and gas is now evaluated at the water and gas
saturation, respectivly. The relperm of oil is still a combination of
the the 2p relperm of water/oil and oil/gas.
2013-11-28 15:56:17 +01:00
Tor Harald Sandve f36a27595f Changes releative permeability to synch with Mrst
The derivative of the relative permeability at the minimum saturation
are no longer zero
2013-11-28 15:56:17 +01:00
Tor Harald Sandve 62f81859cd Extend relperm and capilary pressure tables with constant values such
that the derivatives at the endpoints are zero
2013-09-24 11:14:22 +02:00
Andreas Lauser c25ec5999e convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
Andreas Lauser 19e5d5cea2 convert THROW to OPM_THROW 2013-09-05 13:04:37 +02:00
Andreas Lauser d11db08084 include iostream in the files which use std::cerr or std::cout
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.

While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
2013-09-05 13:04:37 +02:00
Júlio Hoffimann 8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Atgeirr Flø Rasmussen 8f722702c6 Fix SatGwseg* to handle no-gas situation gracefully. 2013-05-29 00:30:50 +02:00
Andreas Lauser 884c5ab027 make config.h the first header to be included in any compile unit
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen 7f9a47d64c Use markup for parameter lists. 2013-03-22 11:09:38 +01:00
Atgeirr Flø Rasmussen 34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen fa31f17885 Moved fluid -> props and subdirs.
This is a non-compiling commit.
2013-03-14 09:56:48 +01:00