Commit Graph

2983 Commits

Author SHA1 Message Date
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
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
9b2bfe40d3 Blackoil fluid test programs now compile. 2011-12-22 12:59:42 +01:00
Atgeirr Flø Rasmussen
a55b664eb9 Now fluid cpp files compile successfully. 2011-12-21 13:29:15 +01:00
Atgeirr Flø Rasmussen
cbe5d3015b Work in progress on adapting to opm-core. 2011-12-21 13:22:26 +01:00
Atgeirr Flø Rasmussen
7c0998e197 Moved blackoil fluid classes to their proper place. 2011-12-21 13:09:12 +01:00
Bård Skaflestad
a98386f5aa Don't shadow name() method with a 'name' variable in read(). 2011-12-20 17:37:21 +01:00
Bård Skaflestad
1f1b58c56c Don't shadow field iterator 'i' with an index into that particular field. 2011-12-20 17:36:08 +01:00
Bård Skaflestad
617b160534 Compute perforation fluxes (no gravity adjustments).
Requires additional parameter 'pmobc' (phase mobilities per cell) in
public function cfs_tpfa_res_flux().
2011-12-20 02:13:50 +01:00
Atgeirr Flø Rasmussen
bd4236eda9 Now compiles parameter testcase, removed extraneous imported makefiles. 2011-12-19 16:02:51 +01:00
Atgeirr Flø Rasmussen
8f7bbddced Merged. 2011-12-19 15:31:24 +01:00
Atgeirr Flø Rasmussen
81a72be23b Now detects boost and compiles some tests. 2011-12-19 15:26:26 +01:00
Bård Skaflestad
940ec1a996 Merge from upstream. 2011-12-19 14:59:28 +01:00
Bård Skaflestad
959c694e2d Impose outflow sign convention when assembling w->c contributions. 2011-12-19 14:09:27 +01:00
Bård Skaflestad
7eed98118b Only perform incompressible adjustment if there are no BHP wells. 2011-12-19 14:07:57 +01:00
Bård Skaflestad
18d33a3859 Don't immediately clear the freshly allocated geometry storage... 2011-12-19 13:27:54 +01:00
Atgeirr Flø Rasmussen
81b58a0acf Now library contents build. Headers and tests not done yet. 2011-12-19 12:36:56 +01:00
Atgeirr Flø Rasmussen
7e90e732d9 Imported items from dune-cornerpoint/dune/common. 2011-12-19 11:34:50 +01:00
Atgeirr Flø Rasmussen
38fe05cb27 Moved GridAdapter to opm/core. Fixes include paths. 2011-12-16 10:17:40 +01:00
Bård Skaflestad
5610898bc9 Allocate storage for geometry in preprocess().
This allows recomputing the geometric primitives if (e.g.) we change
some of the node coordinates after constructing the grid.
2011-12-14 10:48:23 +01:00
Bård Skaflestad
c84e9dc53c Initialise 'Nx' and 'nxf' before use in fill_cart_topology_2d(). 2011-12-14 10:23:34 +01:00
Bård Skaflestad
1ccd7971e3 Remove unused variables. 2011-12-14 10:20:31 +01:00
Bård Skaflestad
f770effb3f Don't re-declare destroy_cart_grid(). It's already in cart_grid.h . 2011-12-14 10:18:24 +01:00
Jostein R. Natvig
04f9d46c10 Add tensor grid constructors. 2011-12-14 09:30:25 +01:00
Jostein R. Natvig
d25ce5c002 Restructure code to prepare for reuse in future tensor_grid_* constructors. 2011-12-14 09:17:07 +01:00
Jostein R. Natvig
35a1070a5b Merge from upstream. 2011-12-14 07:02:47 +01:00
Bård Skaflestad
9b50c604e4 Merge from upstream. 2011-12-13 17:07:47 +01:00
Atgeirr Flø Rasmussen
8b2fee4774 Minor bugfix: avoid accessing empty (but non-zero capacity) vector. 2011-12-13 11:18:38 +01:00
Bård Skaflestad
c4f986316c Add field for specifying which surface volume fraction is injected. 2011-12-12 18:43:11 +01:00
Atgeirr Flø Rasmussen
23a61cb167 Changed code to use new include path: <opm/core/...> 2011-12-12 11:28:09 +01:00
Atgeirr Flø Rasmussen
4655108f98 Moved code from opmcore/ to opm/core/ 2011-12-12 11:13:54 +01:00