Bård Skaflestad
20b58124c1
Remove warning about missing function declaration.
2012-01-06 00:05:05 +01:00
Atgeirr Flø Rasmussen
b0bdd2e422
Added missing method implementations.
2012-01-05 21:55:19 +01:00
Atgeirr Flø Rasmussen
d7193e5492
Merged.
2012-01-05 21:44:58 +01:00
Atgeirr Flø Rasmussen
0c15624617
Implemented matrix() method.
2012-01-05 21:39:33 +01:00
Bård Skaflestad
0e2ebf49de
Sort headers.
2012-01-05 21:37:15 +01:00
Bård Skaflestad
7fa44121f3
Add missing headers.
2012-01-05 21:36:59 +01:00
Bård Skaflestad
9bdc974afa
Catch up to changing constructor interface in cset 4459fdac9389 .
2012-01-05 21:36:02 +01:00
Atgeirr Flø Rasmussen
f278f87f14
Now initializes rock properties.
2012-01-05 16:43:57 +01:00
Atgeirr Flø Rasmussen
8e627bf820
Implemented init() function.
2012-01-05 16:43:36 +01:00
Atgeirr Flø Rasmussen
aabc457c4c
Implemented rock interface in terms of RockFromDeck.
2012-01-05 15:39:13 +01:00
Atgeirr Flø Rasmussen
8bec1ad1cf
Implemented trivial parts of RockFromDeck, init() remains.
2012-01-05 15:38:50 +01:00
Bård Skaflestad
22f909d9c2
Implement numPhases() to fix link errors.
2012-01-05 13:12:27 +01:00
Atgeirr Flø Rasmussen
762a414bd4
Now implemented with new pvt and satprop classes.
2012-01-05 11:41:52 +01:00
Atgeirr Flø Rasmussen
f6408d9083
Minor typo fix.
2012-01-05 11:40:58 +01:00
Atgeirr Flø Rasmussen
3d30d615cd
Changed behaviour of surfaceDensities(), now only returns densities of active components.
2012-01-05 11:40:29 +01:00
Atgeirr Flø Rasmussen
536d58fe4e
Added class SaturationPropsFromDeck.
2012-01-05 11:17:52 +01:00
Atgeirr Flø Rasmussen
91e7b75a2d
Added inline keyword for correct linkage.
2012-01-05 11:17:29 +01:00
Atgeirr Flø Rasmussen
88379706a3
Moved active phase determination into own function.
2012-01-05 09:34:05 +01:00
Atgeirr Flø Rasmussen
1c4a621ea5
Moved phase configuration state into PhaseUsage struct.
2012-01-05 09:28:57 +01:00
Atgeirr Flø Rasmussen
7ad68f93e0
Disabling copying of BlackoilPvtProperties class.
2012-01-04 23:32:21 +01:00
Atgeirr Flø Rasmussen
7548172cdf
Added BlackoilPvtProperties class.
2012-01-04 23:28:54 +01:00
Atgeirr Flø Rasmussen
6b797c66c0
Documentation improvements.
2012-01-04 23:28:13 +01:00
Atgeirr Flø Rasmussen
a8f7e79b7b
Merged.
2012-01-04 22:17:06 +01:00
Atgeirr Flø Rasmussen
0ba5699d0a
Made all the SinglePvt* classes conform to new, more bare-bones interface.
2012-01-04 22:15:26 +01:00
Ingeborg Ligaarden
355f9ebee7
Correct cart_grid fields face_nodepos for 2D/3D and facepos for 2D.
2012-01-04 18:19:25 +01:00
Atgeirr Flø Rasmussen
f8ad8b8bf0
Copied and renamed basic building blocks for black oil pvt.
2012-01-04 15:44:53 +01:00
Atgeirr Flø Rasmussen
dd4c0c2b1b
Adding class BlackoilPropertiesFromDeck and test program.
2012-01-04 14:44:55 +01:00
Atgeirr Flø Rasmussen
44eb3cf277
Adding virtual destructor.
2012-01-04 14:43:48 +01:00
Atgeirr Flø Rasmussen
ae16a657d3
Initial version of suggested interface for fluid and rock properties.
2012-01-04 12:37:12 +01:00
Bård Skaflestad
403cf40dd0
Merge from upstream.
2012-01-03 20:39:52 +01:00
Bård Skaflestad
65ee11ea69
Check for ranlib utility and strtod function.
...
Suggested by: autoscan.
2012-01-03 20:38:31 +01:00
Bård Skaflestad
b48a4d6f27
There is (currently) no need to invoke 'AM_PROG_CC_C_O'.
...
Specifically, we don't (currently) use per-target compilation or
linking flags, and therefore do not need a portability aid in our
current build process.
2012-01-03 20:31:51 +01:00
Bård Skaflestad
d23f325e9b
Prefer to initialise Libtool using the 'LT_INIT' macro.
...
Fall back to 'AC_PROG_LIBTOOL' if 'LT_INIT' is not available.
2012-01-03 20:24:19 +01:00
Bård Skaflestad
93556dc60d
Provide diagnostic message when failing to locate UMFPACK library.
...
Not all processors support the 'AM_COND_IF' macro (introduced in
Automake 1.11), so only call the macro if it is available in the
processor.
2012-01-03 20:20:16 +01:00
Atgeirr Flø Rasmussen
f5edbe9c4b
Improved robustness of WCONINJE and WCONPROD reading.
2012-01-03 16:06:15 +01:00
Atgeirr Flø Rasmussen
9b0005d132
Added SOIL keyword.
2012-01-03 16:05:43 +01:00
Bård Skaflestad
891f6a4e2a
Merge from upstream.
2012-01-03 13:59:51 +01:00
Bård Skaflestad
eb991cefab
Restore UMFPACK header check to its original position.
...
We should check for existence of all headers before inspecting their
contents, e.g., to establish types or particular functions.
2012-01-03 10:02:06 +01:00
Bjørn Spjelkavik
7e3d000ec8
Minor reformatting.
2012-01-03 09:58:08 +01:00
Bjørn Spjelkavik
9a12c4566c
Use flat vector for TSTEP, implement convertToSI().
2012-01-03 09:57:41 +01:00
Bjørn Spjelkavik
79ba5608c5
Implemented keyword TSTEP
2012-01-03 09:38:38 +01:00
Atgeirr Flø Rasmussen
f6146bd8bf
Added BOOST_LDFLAGS to LIBS to get it into libtool dependency.
2011-12-23 14:11:47 +01:00
Atgeirr Flø Rasmussen
9729768794
Now the libtool library will reference its dependencies.
2011-12-23 12:49:06 +01:00
Atgeirr Flø Rasmussen
328353a9c2
Stop using std::tr1::array<> since it is padded (alignment) on gcc 4.1 (CentOS 5.7).
2011-12-22 14:43:23 +01:00
Atgeirr Flø Rasmussen
b86f835023
BOOST_CPPFLAGS must be available when compiling library.
2011-12-22 14:42:11 +01:00
Atgeirr Flø Rasmussen
1d62669325
Merged.
2011-12-22 13:07:35 +01:00
Atgeirr Flø Rasmussen
267486516c
Added headers to makefile.
2011-12-22 13:06:10 +01:00
Atgeirr Flø Rasmussen
a1e851a237
Ignoring test executables.
2011-12-22 13:00:48 +01:00
Atgeirr Flø Rasmussen
9b2bfe40d3
Blackoil fluid test programs now compile.
2011-12-22 12:59:42 +01:00
Atgeirr Flø Rasmussen
7d705bb763
Moved tests to proper place.
2011-12-22 10:40:43 +01:00
