Commit Graph

967 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
185ec1a816 Added SaturationPropsBasic class. 2012-01-17 10:25:49 +01:00
Atgeirr Flø Rasmussen
9b49b0d089 Added RockBasic class. 2012-01-17 09:31:25 +01:00
Atgeirr Flø Rasmussen
9b6aabd284 Minor typo fix. 2012-01-17 09:31:05 +01:00
Atgeirr Flø Rasmussen
5dc31a5806 Added operators += and *= for SmallVec. 2012-01-17 09:30:43 +01:00
Jostein R. Natvig
3ba7623d41 Remove debug output. 2012-01-16 13:36:09 +01:00
Jostein R. Natvig
3b32089890 Whitespace cleanup. 2012-01-16 13:32:32 +01:00
Jostein R. Natvig
5e049918b7 Do not check monotonicity of ZCORN in inactive cells. 2012-01-16 13:31:39 +01:00
Bård Skaflestad
96b9ab737e Fix corner case in neighbour definition. 2012-01-13 13:36:36 +01:00
Bård Skaflestad
ed7b7e5dab Catch up to removal of grid.h from cart_grid.h .
Forgotten in change-set c503348e6d54 .
2012-01-13 12:23:37 +01:00
Bård Skaflestad
e2095a250c Forward-declare "struct UnstructuredGrid" to eliminate grid.h dependency. 2012-01-13 12:21:44 +01:00
Atgeirr Flø Rasmussen
bfb1e1f03b AM_PROG_CC_C_O needed because of subdir objects. 2012-01-06 11:22:35 +01:00
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