Commit Graph
145 Commits
Author SHA1 Message Date
Júlio Hoffimann 8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Bård Skaflestad d332129676 Merge pull request #274 from blattms/non-tr1
Changed std::tr1 occurences to boost.
2013-07-04 12:01:51 -07:00
Markus Blatt 68eb3fbcb1 Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:04:35 +02:00
Bård Skaflestad 33320270fc Disable build kluge that is no longer pertinent
The <have_boost_redef.hpp> header was introduced (commit 82369f9) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules.  Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems.  Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always

  #define HAVE_BOOST 1

i.e., as an explict true/false value.

Therefore, we need no longer include <have_boost_redef.hpp> .  The
header will be removed at a later time.
2013-06-20 23:14:39 +02:00
Bård Skaflestad f5d67fafc8 Favour std::vector<> over variably-sized arrays.
Variably-sized arrays of the form

   int n = 6;
   double a[n];

are an extension to the language that will illicit a suitably
persnickety diagnostic from GCC when invoked with "-pedantic".
2013-06-05 17:14:33 +02:00
Bård Skaflestad f16b9f10e7 Mark deck as FIELD units.
The numbers in the deck are more indicative of FIELD unit conventions
than METRIC unit conventions, so allow the input parser to interpret
the data in that manner.
2013-06-05 12:24:23 +02:00
Tor Harald Sandve a89b081ac0 A test that compares the blackoil fluid based on the [p,r] interface
with the blackoil fluid based on the [p,z] interface
2013-06-05 11:21:47 +02:00
Tor Harald Sandve 01bb02f4cd Adds the new interface to SinglePvtLivGas 2013-05-27 11:14:39 +02:00
totto82 1c904aa451 Add new fluid interface
- in progress
2013-05-22 12:57:18 +02:00
Andreas Lauser 884c5ab027 make config.h the first header to be included in any compile unit
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen ee29f32ee8 Whitespace cleanup. 2013-03-23 23:46:05 +01:00
Atgeirr Flø Rasmussen 83c93a1e3b Added test for class UniformTableLinear.
Moved from opm-porsol.
2013-03-22 21:39:32 +01:00
Atgeirr Flø Rasmussen c26b40702f Added test for class NonuniformTableLinear.
Formerly lived in opm-porsol.
2013-03-22 16:24:52 +01:00
Atgeirr Flø Rasmussen b32674f3ea Moved ColumnExtract and initState.
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen d7353145c1 Update to follow previous moves and deletes. 2013-03-18 12:40:34 +01:00
Atgeirr Flø Rasmussen 2405758e2d Renamed newwells.h -> wells.h.
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen 0a935774d2 Move GridManager to grid subdir.
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen 6e48999ede Removed unused SimpleFluid and SimpleFluid2pWrapper classes. 2013-03-14 13:33:26 +01:00
Atgeirr Flø Rasmussen 34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen 25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Roland Kaufmann 9d56966bab Remove superfluous local variable
The collections have been checked for equal size, we then only need the
size of one of them to iterate. The other boundary pointer is never used
and only generate needless compiler warnings that pollutes the output.
2013-02-12 00:18:24 +01:00
Roland Kaufmann b53a6bf2df Remove Autotools 2013-02-12 00:18:24 +01:00
Roland Kaufmann 4dbc976cbd Merge branch 'cmake' 2013-02-12 00:18:19 +01:00
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
Bård Skaflestad fb482740d4 Catch up to changing location of ERT headers 2013-02-05 15:18:17 +01:00
Atgeirr Flø Rasmussen eeadbe60ce Merge pull request #121 from rolk/compgeo2d
Compute (extra) geometry properties for 2D grids
2013-01-31 00:19:55 -08:00
Bård Skaflestad 3437ec8b32 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-01-25 17:35:21 +01:00
Roland Kaufmann 591cf88ccd Unit test the geometry computations for 2D grids 2013-01-22 23:21:26 +01:00
Atgeirr Flø Rasmussen 95b80590b7 Added test for DG basis classes.
Only 2d so far.
2013-01-17 14:35:50 +01:00
Atgeirr Flø Rasmussen ff1bfc810a Implemented 2d quadrature rules for degree 1 and 2 (order 2 and 3).
Also added cartesian 2d cell testcase.
2012-12-14 12:22:56 +01:00
Atgeirr Flø Rasmussen 1c51623f48 Add test program for quadratures.
So far only tests on a single cartesian 3D cell.
2012-12-04 20:57:09 +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