Commit Graph

115 Commits

Author SHA1 Message Date
Bård Skaflestad
49faa85241 Fix DisjointColumn test case
The test started failing in commit 7d7f62e, but this was not detected
due to no automatic test environment.  The commit changed the cell
numbering from "per-column (K,I,J)-ordering" to "per-plane
(I,J,K)-ordering".  Consequently, the "correct_answer" seized to be
correct.

This change restores the "correct_answer" in the ordering introduced by
commit 7d7f62e.

While here, adjust style of the DisjointColumn test case for legibility.
2013-02-11 23:06:36 +01:00
Roland Kaufmann
8c6302f123 Restructure tests directory to unit tests
Every program that relies on manual inspection has been moved to a new
(hopefully short-lived) directory called not-unit/; every remaining
file has been given the prefix test_ to indicate that this is the
executable test to be run.
2013-02-11 22:38:01 +01:00
Roland Kaufmann
0443b80cfc Include configuration file without directory spec.
If the program is built out-of-source-tree then the configuration file
(which is generated and not part of the source) will not be available
relative to the source code file.
2013-02-11 22:36:49 +01:00
Atgeirr Flø Rasmussen
1b31b207fe Added class WachspressCoord. 2012-10-29 14:55:44 +01:00
Roland Kaufmann
14818d49b4 Add Boost unit test framework to test case linking 2012-10-23 15:36:48 +02:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Atgeirr Flø Rasmussen
aec8029e85 Added unit test for velocity interpolation. 2012-10-17 21:33:09 +02:00
Roland Kaufmann
3521a0bdc6 Use round parenthesis for Make variables 2012-10-14 10:19:35 +02:00
Atgeirr Flø Rasmussen
0f549358a9 Squash warnings. 2012-10-12 14:23:55 +02:00
Bård Skaflestad
31174cf727 Merge remote-tracking branch 'upstream/master' into ert
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
2012-10-12 00:43:51 +02:00
Atgeirr Flø Rasmussen
cdffe6cf35 Merge pull request #48 from blattms/superlu-support
Superlu support
2012-10-08 02:19:01 -07:00
Bård Skaflestad
47ab22fce0 New function clone_wells()
Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
2012-10-05 10:14:44 +02:00
Markus Blatt
0db6439b9b Merged latest changes from upstream branch 2012-10-05 10:11:31 +02:00
Atgeirr Flø Rasmussen
b2ce32b329 Merge pull request #42 from bska/read-grid
Grid Input Support
2012-10-04 23:30:46 -07:00
Bård Skaflestad
203728109f Honour exact interfaces of LAPACK routines.
The size type, MAT_SIZE_T, is not necessarily equivalent to 'int'.
2012-10-05 00:54:33 +02:00
Bård Skaflestad
66ee40c809 Add a simple test to demonstrate grid input.
Should be extended to test that the input is sane, too.
2012-10-05 00:24:06 +02:00
Markus Blatt
ae52de0426 Added test for SuperLU and adapted the Makefile.am to support it 2012-10-04 11:37:28 +02:00
Atgeirr Flø Rasmussen
3e8b6a389d Update ert test program to make it compile again. 2012-09-30 15:42:13 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 Merge branch 'master' into ert
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
2012-09-05 13:36:19 +02:00
Atgeirr Flø Rasmussen
064d408b20 Merge branch 'master' into nonuniform_fluid_tables
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
2012-09-04 13:34:30 +02:00
Atgeirr Flø Rasmussen
d8bc458631 Minor cleanup. 2012-09-04 13:08:30 +02:00
Atgeirr Flø Rasmussen
e25512a646 Changed std::copy() statements to account for n != 1.
However, there are more changes needed to make the program
support n != 1, this is just to reduce the surprise factor a little.
2012-09-04 13:00:51 +02:00
Atgeirr Flø Rasmussen
a07d894500 Merge branch 'master' into nonuniform_fluid_tables
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
2012-09-04 11:42:31 +02:00
Atgeirr Flø Rasmussen
47b40c034e Fixed spontaneous grid structs, avoid variable-sized arrays. 2012-09-03 16:01:07 +02:00
Halvor Møll Nilsen
ed2aa9da38 Introduced posibility to change number of sample points for pvt.
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
2012-08-31 17:01:07 +02:00
Halvor Møll Nilsen
7b1501cead Added new SatFuncSimple fluid.
Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
2012-08-28 16:41:06 +02:00
Halvor Møll Nilsen
48360d23a1 Added param initializer on fluids with param to addjust table length.
Moved internal class SatFunc to SatFuncStone2.
2012-08-28 14:27:14 +02:00
Atgeirr Flø Rasmussen
547dc1648c Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
2012-08-27 16:48:21 +02:00
Halvor Møll Nilsen
ea09af47f4 Added programs to test test fluids. 2012-08-27 12:21:25 +02:00
Atgeirr Flø Rasmussen
9a23b8db74 Constructors of *FromDeck classes now take an UnstructuredGrid.
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
2012-08-10 10:12:45 +02:00
Bård Skaflestad
6c35b9679b Don't clobber LDFLAGS user variable
Fix a misunderstanding that's been present since the inception.  The
LDFLAGS variable is entirely at the builder's disposal.  Flags needed
for system-internal settings must go in the AM_* equivalents.
2012-07-10 13:46:30 +02:00
Bård Skaflestad
31788277f9 Don't link in Fortran support libraries
This is an experiment, not strictly sanctioned by the AX_LAPACK macro
documentation, to avoid linker errors related to missing symbol MAIN__
in the (GFortran) run-time support libraries.  Strictly speaking, we
should be using the method outlined in the Autoconf manual, but we'll
try the easier way for now.

This commit is more or less equivalent to forward-porting commits
dd6e0fd3, c437eba2, and 9e885dc7 from the "ert" branch.
2012-07-10 13:38:33 +02:00
Bård Skaflestad
6b57a00b17 Avoid Clobbering Dune's Boost Support.
When OPM-Core is used as a Dune module (e.g., as enabled by commit
789bc5ca7), we stand the risk of creating multiple, conflicting
defintions of crucial <config.h> symbols (e.g. `HAVE_BOOST') and
build variables (e.g., `BOOST_CPPFLAGS' and `BOOST_LDFLAG').

Avoid this situation by prefixing these symbols with an `OPM_'
string such that Dune's `ENABLE_BOOST' solution works as intendend
in modules that are derived in the OPM context.
2012-07-09 17:42:56 +02:00
Bård Skaflestad
9005e4353c Build the library in a lib/ sub-directory of $(builddir)
Suggested by: Andreas Lauser
2012-07-03 16:44:03 +02:00
Joakim Hove
c437eba207 Removed $(FLIBS) from linking. 2012-06-28 16:19:04 +02:00
Bård Skaflestad
6f26b3b46e Update ERT references to those output by m4/ert.m4 macro. 2012-06-28 14:44:37 +02:00
Joakim Hove
d782ba15cb Merge branch 'master' of github.com:OPM/opm-core into ert 2012-06-28 13:10:08 +02:00
Joakim Hove
bb066aa23b Added functionality to save results in ECLIPSE format from ERT libraries. 2012-06-27 20:20:05 +02:00
Bård Skaflestad
be1ca06fa3 Use dynamic Boost.Test mode only if supported
Use result of OPM_DYNLINK_BOOST_TEST to determine whether or not to
#define the Boost symbol BOOST_TEST_DYN_LINK .

While here, replace an unprintable character with the proper UTF-8
encoding in a comment.
2012-06-27 16:51:37 +02:00
Joakim Hove
d06028cb49 Merged master into ert branch 2012-06-27 08:22:26 +02:00
Joakim Hove
3e789272fd Added configure.ac + Makefile.am support for including ert 2012-06-27 08:06:22 +02:00
Bård Skaflestad
7d7f62ebc3 Merge branch 'preprocess-svn-reintegrate'
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/facetopology.c
	opm/core/grid/cpgpreprocess/mxgrdecl.c
	opm/core/grid/cpgpreprocess/preprocess.c
	opm/core/grid/cpgpreprocess/sparsetable.c
	opm/core/grid/cpgpreprocess/sparsetable.h
	opm/core/grid/cpgpreprocess/uniquepoints.c

This merge brings a new, more resilient and feature-complete
corner-point processing.  In particular, the new code features
exact, in-plane vertex coordinates for face nodes that arise as a
result of fault processing and which are not located on pillars.
Secondly, the resulting grid's cells are ordered lexicographically
with the I index cycling the most rapidly, followed by J and
finally K.

Finally, this merge also brings automatic handling of left-handed
coordinate systems which, until now, have produced negative cell
volumes as a result of face vertices being ordered such that
interface normals point from cell 2 to cell 1 in this case.
Left-handed coordinate systems are recognised using a simplistic
triple-product characterisation akin to the implementation of
function "processGRDECL" of MRST.

This code is now an (almost) exact replica of revision 1001 of
https://public.ict.sintef.no/viewvc/openrs/trunk/dune-cornerpoint/grid/preprocess/

The merge also removes opm/core/grid/cpgpreprocess/readvector*, so
remove tests/test_readvector.cpp (and accompanying Make rule) to
maintain a buildable tree.
2012-06-26 19:52:21 +02:00
Bård Skaflestad
2a1561a246 Insert a few blank lines for grouping purposes. 2012-06-12 23:10:38 +02:00
Bård Skaflestad
37b49e31ed Use canonical library set for LAPACK. 2012-06-12 23:09:55 +02:00
Bård Skaflestad
91fb55af2c Libraries must follow the pertinent "-L" flags. 2012-06-12 23:08:59 +02:00
Bård Skaflestad
833268a33f Remove a per-target LDADD that's automatically satisfied. 2012-06-12 23:05:33 +02:00
Bård Skaflestad
ed24f7d43d Sort list of test executables (and _SOURCES). 2012-06-12 23:05:04 +02:00
Halvor M. Nilsen
4f7f678017 Started on adding generation of other maps 2012-06-11 15:52:10 +02:00
Halvor M. Nilsen
efc3cc3324 Added convert function from vag grid to opm::unstructed. In the process it was added a convenience function to allocate unstructured grid in grid.h. Compute geometry is used to calculate the new geometry. 2012-06-08 20:50:41 +02:00
Halvor M. Nilsen
839920fab2 Added copyright on newly added files 2012-06-08 15:47:18 +02:00