Commit Graph

3839 Commits

Author SHA1 Message Date
Joakim Hove
ce8da88764 Added very simple parser test to check a parser can be instantiated and a simple file parsed 2013-11-14 12:52:12 +01:00
Joakim Hove
86439d6a52 Added required dependencies on opm-parser and CJSON 2013-11-14 12:51:12 +01:00
Joakim Hove
dc27dc1adf Changed the check_cxx_source_compiles() in Findopm-parser to look for Deck.hpp; Parser.hpp had uneccasary complicated interaction with cJSON 2013-11-14 10:20:05 +01:00
Bård Skaflestad
b59ec1639a Merge pull request #429 from karbor/master
Output newline after last entry before "/" when outputting grid to file....
2013-11-12 00:33:32 -08:00
Bård Skaflestad
20819e4861 Merge pull request #427 from andlaus/fix_spline
spline: some fixes to make Spline::intersect() work correctly
2013-11-11 12:54:20 -08:00
Andreas Lauser
ff619105eb fixup! spline: avoid bogous "might be used uninitialized" compiler warning on GCC 2013-11-11 18:13:43 +01:00
Kari B. Skjerve
d18a90bced Output newline after last entry before "/" when outputting grid to file. This make gridfile more robust for later usage. 2013-11-11 14:13:38 +01:00
Roland Kaufmann
63f95c317d Merge pull request #428 from andlaus/make_quadmath_test_more_strict
fix test for HAVE_QUAD on some instances of ubuntu 13.10
2013-11-11 04:41:37 -08:00
Andreas Lauser
434a3a8dd5 spline: avoid bogous "might be used uninitialized" compiler warning on GCC 2013-11-10 17:55:41 +01:00
Andreas Lauser
c7703c0949 fix test for HAVE_QUAD on some instances of ubuntu 13.10
I haven't figured out why this happens, but on one of my computers
running kubuntu 13.10 g++ says the following if one tries to use
quadruple precision math:

/home/erne/src/ewoms/ewoms/common/quad.hh: In static member function ‘static quad std::numeric_limits<__float128>::min()’:
/home/erne/src/ewoms/ewoms/common/quad.hh:52:14: error: unable to find numeric literal operator ‘operator"" Q’
     { return FLT128_MIN; }

since this happens only on this machine and only with the c++ (but
not the C) compiler, i suppose that this is either an upgrade issue
with kubuntu or an issue with the ubuntu gcc stack. Strangely enough,
my other kubuntu machine does not have a problem with that...

In any case also testing for assignability of constants and using the
C++ compiler for the quadmath test won't hurt...
2013-11-09 17:04:46 +01:00
Andreas Lauser
ae901534c3 spline: fix the monotinic_() method and creation of monotonic splines
also, extend the unit test for it. (*phew* that was much more fun than
appreciated because of all the index shifts. I'm still not 100% sure
that everything works in all corner cases, but at least my confidence
is at 95%.)
2013-11-07 19:53:31 +01:00
Andreas Lauser
c9067c4bda spline: some fixes to make Spline::intersect() work correctly
most of these issues are fallout from the conversion of the spline
class from a moments (second derivative) based approach to hermite
base functions:

- the second and third derivatives where incorrect, and the third
  derivative was not available in the public interface.
- The unit test did not check the derivatives
- The coefficients for the monomial basis were off by the factors
  stemming from the derivatives
- The intersectIntervall_() method used std::max() instead of
  std::min() at one place and still added the base offset for the x
  values as indicated by Stoer
2013-11-07 15:06:59 +01:00
Atgeirr Flø Rasmussen
86ca995629 Merge pull request #423 from rolk/423_eclbin
Write reservoir state in Eclipse binary format
2013-11-06 02:53:59 -08:00
Roland Kaufmann
55bfa65b30 Merge pull request #418 from joakim-hove/cmake-find-opm-parser
Add cmake capabailities to locate opm-parser and cJSON
2013-11-04 23:50:38 -08:00
Bård Skaflestad
ca9b5e1bee Merge pull request #416 from rolk/416_lib
Allow to search for multiple libraries in package
2013-11-04 10:24:29 -08:00
Bård Skaflestad
5d5ae9e877 Merge pull request #419 from flikka/blackoilstate-equals
Blackoilstate equals function, with tests and data
2013-11-04 06:19:57 -08:00
Kristian Flikka
ed8efaefe1 Replaced include math.h with cmath, and changed from fabs to abs. Fixed an error in the testfile, a filename was wrong 2013-11-04 13:51:32 +01:00
Bård Skaflestad
a848bba93f Merge pull request #417 from rolk/417_shared
Only add option for shared libraries once
2013-11-04 02:05:34 -08:00
Andreas Lauser
07ed5b4339 use bar instead of Pascal as the unit for the pressure field
Eclipse seems to write bars...
2013-11-01 11:36:06 +01:00
Tor Harald Sandve
b935697838 add missing include directives 2013-11-01 11:36:06 +01:00
Andreas Lauser
f7864acc59 add some rates to the summary output, correct values
it turns out that the values within the WellState are surface volumes,
so they can be used directly once converted to daily rates...
2013-11-01 11:36:06 +01:00
Andreas Lauser
0123c3d700 write out water injection and oil production rates
Currently, it still writes out whatever conservation quantity which is
used by the solver (which is probably the mass of the oil/gas
mixture). TODO: convert these solver rates to "pure oil volume without
gas at the surface" and to "gas volume at the surface" rates.

thanks again to Joakim Hove for the pointers where to start kicking!
2013-11-01 11:36:06 +01:00
Andreas Lauser
a9929508a6 write out the reservoir state to the eclipse binary format
most code was shamelessly ripped from opm-core's EclipseGridParser,
but there are some additions (e.g. grids specified using the D[XYZ]V
Eclipse keywords can be used).

The code is located inside the new class "BlackoilEclipseOutputWriter"
(should probably renamed) and hooked up in
SimulatorFullyImplicitBlackoil and sim_fibo_ad.cc.

Also be aware that, to make this code work properly, the newest master
version of ERT is required (i.e. one which includes commit
5e4e9661720). In this context, I would like to thank Joakim Hove for
his support!
2013-11-01 11:36:06 +01:00
Arne Morten Kvarving
f5e6304f7a make redhat packaging compatible with el5 2013-10-30 17:09:28 +01:00
Joakim Hove
443a867c76 Updated modules to find Opm-parser 2013-10-30 14:17:36 +01:00
Joakim Hove
59fb0f04a2 Updated modules for Findcjson and Findopm-parser 2013-10-30 14:17:36 +01:00
Joakim Hove
ae7ba90c09 Added opm-parser-prereqs.cmake 2013-10-30 14:17:35 +01:00
Joakim Hove
2c2174da68 Added CMake find modules opm-parser and cjson 2013-10-30 14:17:35 +01:00
Roland Kaufmann
d847fe0d4f Allow to search for multiple libraries in package
Some packages are split up in several library files, where each of them
doesn't have their own CMake find-module. So we cannot put this list in
the prerequisites. Unlike the headers, where we just add the directory,
all the libraries must be explicitly named on the link line. Thus, we
should allow to specify more than one name in the lib parameter.

The first name specified is designated as the "primary" library and is
assigned to the _LIBRARY variable; the others occur in _LIBRARIES as if
they were prerequisites.

Note that the build system cannot replicate this setup itself; it always
assumes that we are building (at most) one library from the source
files.
2013-10-30 14:17:35 +01:00
Arne Morten Kvarving
dcfdad2166 use a fully qualified source0 url 2013-10-30 12:18:34 +01:00
Joakim Hove
e7e2f6588b Added test with accompanying data for Blackoilstate::equals() 2013-10-28 17:43:29 +01:00
Joakim Hove
9b8e02a621 Added method equals in BlackoilState.hpp 2013-10-28 17:42:32 +01:00
Roland Kaufmann
d10508b760 Only add option for shared libraries once
The way the test was done previously, it was added for *every* option
after `--enable-shared`, not only that one.
2013-10-23 09:22:33 +02:00
Arne Morten Kvarving
28060b694d update packaging 2013-10-22 13:12:55 +02:00
Roland Kaufmann
9e39e04c47 Allow to search for multiple libraries in package
Some packages are split up in several library files, where each of them
doesn't have their own CMake find-module. So we cannot put this list in
the prerequisites. Unlike the headers, where we just add the directory,
all the libraries must be explicitly named on the link line. Thus, we
should allow to specify more than one name in the lib parameter.

The first name specified is designated as the "primary" library and is
assigned to the _LIBRARY variable; the others occur in _LIBRARIES as if
they were prerequisites.

Note that the build system cannot replicate this setup itself; it always
assumes that we are building (at most) one library from the source
files.
2013-10-22 11:39:14 +02:00
Bård Skaflestad
e02a0b1139 Merge pull request #415 from atgeirr/bump-version
Bump version numbers.
2013-10-21 06:16:01 -07:00
Atgeirr Flø Rasmussen
823cc64c78 Bump version numbers.
Since there are a few new APIs and features, but no major changes,
it seems proper to move from 1.0 to 1.1, even though strict
backward compatibility cannot be expected.

Label bumped to 2013.10.
2013-10-21 13:53:29 +02:00
Bård Skaflestad
84f442bfd1 Merge pull request #413 from rolk/413_inst
Install header-only pkgconfig file to generic lib/
2013-10-21 04:13:48 -07:00
Bård Skaflestad
64ac686e8e Merge pull request #411 from rolk/411_doc
Reduce amount of boilerplate in Doxylocal
2013-10-21 04:03:12 -07:00
Roland Kaufmann
ac042e426f Install header-only pkgconfig file to generic lib/
The previous version assumed that we had libraries, and thus always
installs the .pc file in the multi-arch library directory. However,
we now have modules which does not have a library, but whose header
files still need to be located. Since the lib/ directory is usually
in the pkgconfig search path, it is natural to put them there.
2013-10-17 09:39:59 +02:00
Bård Skaflestad
ca427092bd Merge pull request #412 from atgeirr/fix-rockcomp
Fix bug in RockCompressibility class.
2013-10-16 05:31:00 -07:00
Atgeirr Flø Rasmussen
d06c8a53d9 Bugfix: vector was used with size zero. 2013-10-16 14:02:15 +02:00
Roland Kaufmann
16b459f31d Remove options that are stored in the common template
The Doxylocal file now only contains things that are specific to this
project (although most projects still does it like this)
2013-10-16 11:43:02 +02:00
Roland Kaufmann
41be11ebd8 Specify dir. layout and stylesheets in common templates
These options should be common to all OPM modules to get the same look
for the generated documentation.
2013-10-16 11:43:02 +02:00
Bård Skaflestad
0531ef357b Merge pull request #410 from rolk/410_static
Allow static linking for SuiteSparse to be forced
2013-10-11 05:22:16 -07:00
Roland Kaufmann
f0b2f82069 Allow static linking for SuiteSparse to be forced
If -DSUITESPARSE_USE_STATIC=ON, then the build system will only look for
static versions of the libraries that are part of SuiteSparse, even if
dynamic/shared versions are present on the system. Thus, the default of
preferring dynamic libraries can be overridden.

SuiteSparse is rarely built ourselves, but still uncommon enough to not
be present on computing clusters.

This patch allows us to install the libraries on a workstation, for
instance from package suitesparse-devel and link to it statically
without having to maintain our own build tree.
2013-10-10 19:53:16 +02:00
Bård Skaflestad
4ec7c2bc67 Merge pull request #408 from rolk/408_sizet
Use unsigned when iterating through vector indices
2013-10-09 07:15:51 -07:00
Roland Kaufmann
13d145fc1d Use unsigned when iterating through vector indices
A vector can of course never contain a negative number of elements, so
naturally size() returns size_t instead of a regular int. This costs us
a warning unless we also change the loop counter (since it is only used
to index that vector).
2013-10-09 15:09:14 +02:00
Bård Skaflestad
c1c6f5256b Merge pull request #407 from karbor/master
Changed EclipseGridParser and CornerpointChopper to handle NTG
2013-10-09 05:05:22 -07:00
Kari B. Skjerve
09e572a15e changes after pull to opm/opm-core 2013-10-09 13:23:24 +02:00