Atgeirr Flø Rasmussen
980d6eb482
CellQuadrature works only for 3D, enforce it.
2012-12-04 20:56:05 +01:00
Atgeirr Flø Rasmussen
8132cb21b9
Adapt to moved [Cell|Face]Quadrature classes.
...
Also fix a minor issue with potentially buggy error output after LAPACK failure.
2012-12-04 16:11:05 +01:00
Atgeirr Flø Rasmussen
d347d86f82
Moved FaceQuadrature and CellQuadrature classes to their own files.
2012-12-04 16:10:07 +01:00
Bård Skaflestad
8741c93a1a
Merge pull request #107 from blattms/issue-106-superlu
...
Make superlu available in all OPM modules again.
2012-12-03 15:04:06 -08:00
Markus Blatt
2c63359542
Added a guard to the SuperLU test. If HAVE_SUPERLU is 1 from a run of the
...
SuperLU test within DUNE, we skip testing for it again as the additional test
would fail in some cases.
2012-12-03 16:47:04 +01:00
Bård Skaflestad
3419c69623
Merge pull request #104 from atgeirr/no-ert-conditional
...
Made compilation of writeECLData.[ch]pp unconditional.
2012-12-03 00:13:10 -08:00
Atgeirr Flø Rasmussen
696d038ebc
Bugfix: update prototype of no-ert writeECLData().
2012-12-03 08:55:58 +01:00
Atgeirr Flø Rasmussen
eeed5ca337
Include writeECLData.[ch]pp with the rest of the files.
...
Removed all traces of the ert conditional.
2012-12-03 08:54:43 +01:00
Bård Skaflestad
bcfdd8698c
Merge pull request #105 from rolk/dash
...
Package files (.pc and -config.cmake) consistent with DUNE
2012-12-02 05:26:58 -08:00
Roland Kaufmann
76fb33037a
Provide CMake config mode file on par with pkg-config
...
Rename the module from 'opmcore' to 'opm-core' to be consistent with
DUNE, retrieve the settings from pkg-config instead of having them
written by Autotools, as the PkgConfig module does all untangling of
options for us.
2012-11-30 13:36:45 +01:00
Roland Kaufmann
ea2bb23bf8
Include all libraries and headers necessary to build
...
List all dependencies of opm-core as well as the library itself;
otherwise the user must generate the list of dependencies, including
all the probes.
2012-11-30 13:36:45 +01:00
Atgeirr Flø Rasmussen
013c7dc162
Made compilation of writeECLData.[ch]pp unconditional.
2012-11-30 12:26:34 +01:00
Atgeirr Flø Rasmussen
2d8610d773
Merge pull request #101 from atgeirr/new-interface-for-ecl-output
...
Made saveEGRID() method available unconditionally.
2012-11-26 05:03:31 -08:00
Atgeirr Flø Rasmussen
26b3053989
Made saveEGRID() method available unconditionally.
...
Will throw if called without ERT support, though.
2012-11-26 14:01:06 +01:00
Atgeirr Flø Rasmussen
63bed78c11
Merge pull request #100 from atgeirr/new-interface-for-ecl-output
...
New interface for ecl output
2012-11-26 03:25:59 -08:00
Atgeirr Flø Rasmussen
205f8c887b
Changed interface of writeECLData().
2012-11-26 10:51:20 +01:00
Atgeirr Flø Rasmussen
81c022e79a
Make DataMap.hpp properly include its dependencies.
2012-11-26 10:50:09 +01:00
Atgeirr Flø Rasmussen
0526657355
Document function currentDateTime().
2012-11-26 10:49:15 +01:00
Halvor Møll Nilsen
b6301d37e0
Corrected include statements after renaming files.
2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
0db443553b
Continued renaming of transpormodels to transportsolver*reorder
2012-11-16 16:06:01 +01:00
Halvor Møll Nilsen
4224e1f463
Changed name of all TransportModels which was reorder solvers
2012-11-16 16:00:56 +01:00
Halvor Møll Nilsen
8d9fdbf03a
Corrected spelling of implicit in filename and class name
2012-11-16 13:50:52 +01:00
Halvor Møll Nilsen
a69b10d90d
Corrected error of name of impl hpp file.
2012-11-16 13:47:35 +01:00
Halvor Møll Nilsen
2003ea5887
Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes
2012-11-16 13:38:03 +01:00
Halvor Møll Nilsen
aaa10cf17b
Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp
2012-11-15 15:01:12 +01:00
Halvor Møll Nilsen
a30e42b962
Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled
2012-11-15 13:20:49 +01:00
Bård Skaflestad
a2dccf7a8f
Merge pull request #99 from atgeirr/binary_io
...
Add missing header file to distribution.
2012-11-15 03:28:59 -08:00
Atgeirr Flø Rasmussen
96f941b840
Merge branch 'master' into binary_io
2012-11-15 09:28:37 +01:00
Atgeirr Flø Rasmussen
3bf22a67b2
Merge pull request #97 from atgeirr/relax-function-call-semantics
...
Remove unneeded assert.
2012-11-14 23:55:43 -08:00
Atgeirr Flø Rasmussen
2b0e570842
Make explicit intention to do nothing on empty input.
2012-11-15 08:54:45 +01:00
Atgeirr Flø Rasmussen
d58dded067
Merge pull request #98 from bska/use-standard-lin-index
...
Derive 'start' from traditional linear index expression
2012-11-14 23:51:20 -08:00
Bård Skaflestad
0d1603d705
Derive 'start' from traditional linear index expression
...
In particular, this replaces the opaque 'off'-based expression with one
that is easier to verify on inspection.
2012-11-14 21:33:45 +01:00
Atgeirr Flø Rasmussen
e17d5e6499
Remove unneeded assert().
...
Function is safe to call with empty vectors.
2012-11-14 15:30:25 +01:00
Bård Skaflestad
800b20b70c
Merge pull request #96 from atgeirr/bugfix-preprocessing
...
Fix bug in computing correct ZCORN indices for grid cell.
2012-11-14 06:09:14 -08:00
Atgeirr Flø Rasmussen
ebf9514686
Improve clarity of previous bugfix (no functional change).
2012-11-14 15:05:53 +01:00
Atgeirr Flø Rasmussen
0a6a723ae9
Fix bug in computing correct ZCORN indices for grid cell.
2012-11-14 14:31:51 +01:00
Atgeirr Flø Rasmussen
fab3ea9723
Merge pull request #93 from bska/ert-nondefault-location-build-fix
...
Fix build if ERT is installed in a non-default location
2012-11-08 23:31:48 -08:00
Atgeirr Flø Rasmussen
8af339d6be
Merge pull request #92 from bska/signed-vs-unsigned-ert
...
Fix signed-vs-unsigned comparison warning
2012-11-08 23:30:45 -08:00
Atgeirr Flø Rasmussen
a53b71233a
Add missing header file to distribution.
2012-11-08 14:15:15 +01:00
Bård Skaflestad
55263da177
Fix build if ERT is installed in non-default location
...
The existing description did not properly account for ERT (or, more
appropriately, the "libecl" part of ERT) being installed in a
non-default location (e.g., somewhere below ${HOME}).
As EclipseGridParser.hpp declares various ERT-dependent types and
functions if a build configuration supports ERT (activated by the
`--with-ert' configure option), we need a proper include path to
reference the ERT headers. The fix is simple--just insert the
$(ERT_CPPFLAGS) into the already existing $(AM_CPPFLAGS).
2012-11-08 13:59:19 +01:00
Bård Skaflestad
44f54cb712
Fix signed-vs-unsigned comparison warning
...
The existing code compared the output of data->size(), which is a
std::vector<double>::size_type (typically std::size_t) and therefore an
unsigned integer type to the number 'grid.number_of_cells' which is a
(signed) 'int'. This leads to an annoying warning when increasing the
warning level in GCC.
While here, also insert code to verify that the 'stride' is a positive
number lest the subsequent assignment loop reference (*data) elements
out of bounds.
2012-11-07 17:23:45 +01:00
Bård Skaflestad
eb4bf0a373
Merge pull request #91 from joakim-hove/writeEclActive
...
Write ecl active
2012-11-07 06:40:00 -08:00
Joakim Hove
43adfaeda5
Added start_date_ property to the SimulatorTimer class
2012-11-07 14:53:26 +01:00
Joakim Hove
a3efb49de2
Added comments + make sure to only export active cells in writeEclData
2012-11-07 13:31:46 +01:00
Bård Skaflestad
d399b2d7cc
Merge pull request #89 from atgeirr/gravity-in-wells
...
Gravity in wells
2012-11-07 03:53:04 -08:00
Joakim Hove
f1d2a0db95
Merge pull request #90 from atgeirr/binary_io
...
Fix for writeECLData()
2012-11-06 22:28:08 -08:00
Atgeirr Flø Rasmussen
ae6c388546
Fix incorrect size in ecl_kw_alloc() call.
...
Also, add more checks to ensure sanity.
2012-11-06 20:45:49 +01:00
Atgeirr Flø Rasmussen
5ca3f98725
Update CompressibleTpfa wellbore gravity handling.
...
Should now be in sync with cfs_tpfa_residual C interface. Simple well
gravity model implemented.
More flexibility in well gravity models would be a natural future extension.
2012-11-06 19:28:22 +01:00
Atgeirr Flø Rasmussen
bbc80e4b83
Add HAVE_ERT guards to writeECLData.cpp.
2012-11-06 16:18:22 +01:00
Bård Skaflestad
9a33a3266e
Merge branch 'master' into gravity-in-wells
2012-11-06 15:37:06 +01:00