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 |
|
Atgeirr Flø Rasmussen
|
ceed7387ae
|
Merged in some black-oil fluid tests.
|
2011-12-22 10:40:14 +01:00 |
|
Bård Skaflestad
|
47659519d8
|
Distribute TinyXML's tinystr.h and tinyxml.h headers.
|
2011-12-21 13:56:30 +01:00 |
|
Atgeirr Flø Rasmussen
|
a55b664eb9
|
Now fluid cpp files compile successfully.
|
2011-12-21 13:29:15 +01:00 |
|
Atgeirr Flø Rasmussen
|
3914dcb8e9
|
Merged in UniformTableLinear.hpp and friends.
|
2011-12-21 13:22:57 +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 |
|
Atgeirr Flø Rasmussen
|
0f0912c894
|
Merged in blackoil fluid subsystem.
|
2011-12-21 13:06:23 +01:00 |
|
convert-repo
|
409c275131
|
update tags
|
2011-12-21 11:21:09 +00: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 |
|
Bård Skaflestad
|
a10273ea18
|
Eliminate duplicate 'readvector.hpp' listing amongst _HEADERS .
|
2011-12-20 01:20:19 +01:00 |
|
Bård Skaflestad
|
6eb6054290
|
Make $(LIBS) and $(FLIBS) the final libraries on link line.
|
2011-12-19 18:31:57 +01:00 |
|
Halvor M. Nilsen
|
81d804ca31
|
Fixed makefiles.
|
2011-12-19 17:18:57 +01:00 |
|
Atgeirr Flø Rasmussen
|
bf24a90d2b
|
Added headers to install target.
|
2011-12-19 16:08:43 +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 |
|
Jostein R. Natvig
|
369a438f13
|
Add function create_cart_grid_2d. Preliminary implementation.
|
2011-12-14 06:58:02 +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 |
|
Atgeirr Flø Rasmussen
|
5e509537c4
|
Minor fix, dimens are ints, not doubles.
|
2011-12-13 10:36:44 +01:00 |
|