Commit Graph

3463 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
fd4ac88334 Minor fix: do not read tracer heads unless compute_tracer is true. 2013-04-23 09:54:52 +02:00
Atgeirr Flø Rasmussen
8b6faffe00 Work in progress on tracers.
- Changed interface.
 - Read tracerheads (tracer start locations) from file in compute_tof_from_files.
 - Initialize tracerheads from wells in compute_tof.
2013-04-22 14:02:45 +02:00
Atgeirr Flø Rasmussen
a2125fee09 Fix typo and minimize formatting changes. 2013-04-22 11:29:59 +02:00
Atgeirr Flø Rasmussen
cf38c91f74 Removed experimental multi-cell solver code.
Since the Gauss-Seidel approach seems to be both simplest and
fastest, all parts dealing with assembling multicell systems
have been removed.
2013-04-22 11:22:23 +02:00
Atgeirr Flø Rasmussen
489c41d60d Optimize multi-cell solve and add new Gauss-Seidel variant. 2013-04-22 11:11:55 +02:00
Atgeirr Flø Rasmussen
7c172fe192 Make multidim upwind more forgiving of bad grids.
Now it will no longer trigger assertation failure when grids are not
edge-conformal (faulted cornerpoint grids processed by our code will
usually not be). Minor algorithm change to handle this.
2013-04-22 11:07:41 +02:00
Atgeirr Flø Rasmussen
3d3173d04f More refined and concise output of block info. 2013-04-17 13:18:22 +02:00
Atgeirr Flø Rasmussen
b7acc70ab7 Implement solveMultiCell() properly.
Interface change: solver now requires a linear solver (for the multi-cell blocks only).

Implementation uses new private method assembleSingleCell(), that is a modified copy
of solveSingleCell(). Should refactor.
2013-04-17 12:58:15 +02:00
Atgeirr Flø Rasmussen
88f4cd894d Bugfix: do not compute MDU terms for noflow faces. 2013-04-17 10:38:08 +02:00
Tor Harald Sandve
62246111db Merge branch 'release/2013.03' of git://github.com/OPM/opm-core 2013-04-17 10:33:29 +02:00
Roland Kaufmann
64e61739e1 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:13:11 +02:00
Roland Kaufmann
66b6dda219 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:07:50 +02:00
Roland Kaufmann
49606fc925 Corrected mismatched if-else-endif arguments 2013-04-16 14:02:00 +02:00
Roland Kaufmann
f75090e876 Read /etc/system-release if others not parseable 2013-04-16 12:11:35 +02:00
Lars Vingli Odsæter
d2921faec8 Quote possibly empty variable to avoid error message
On RedHat 6.4 workstation the module doesn't find the necessary system
information, and gives an error message when the last parameter to the
string function is not present.
2013-04-16 12:01:57 +02:00
Bård Skaflestad
d645965706 Merge pull request #231 from andlaus/fix_doxygen
Fix a few doxygen issues with the tutorials
2013-04-15 10:11:13 -07:00
Andreas Lauser
7ed3fe69c0 Fix a few doxygen issues with the tutorials 2013-04-15 18:59:55 +02:00
Arne Morten Kvarving
92ee97274e final packaging for 2013.03 2013-04-11 15:52:04 +02:00
Atgeirr Flø Rasmussen
f42cfa79c3 Merge pull request #230 from andlaus/fix_build
opm.h -> config.h
2013-04-10 06:24:13 -07: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
Andreas Lauser
b20cb0f909 remove the include statement for omp.h in geometry.c
this fixes the build on clang
2013-04-10 12:41:28 +02:00
Atgeirr Flø Rasmussen
8bc4b6efed Merge pull request #229 from rolk/229_log
Give example of how and where to report build failures
2013-04-09 02:13:32 -07:00
Atgeirr Flø Rasmussen
5e30cbccef Merge pull request #228 from rolk/228_arch
Report target architecture when configuring
2013-04-09 02:13:23 -07:00
Atgeirr Flø Rasmussen
d95607ddba Merge pull request #227 from rolk/227_apel
Version entry URL for repository
2013-04-09 02:13:15 -07:00
Atgeirr Flø Rasmussen
eeba969080 Merge pull request #226 from rolk/226_release
Build release library by default
2013-04-09 02:12:56 -07:00
Roland Kaufmann
28f5eabcbc Build release library by default
If you just download the source, compile and install, you get the
release library. Users who want to develop the code, must do setup
in their environment.
2013-04-09 11:03:07 +02:00
Atgeirr Flø Rasmussen
f5b5cee768 Merge pull request #225 from rolk/225_cxxflags
Let the user set compilation flags
2013-04-09 00:43:44 -07:00
Atgeirr Flø Rasmussen
5722d85ed1 Merge pull request #224 from rolk/224_findupsc
Fix erroneous trailing empty dependency
2013-04-09 00:43:10 -07:00
Roland Kaufmann
f11158f521 Give example of how and where to report build failures 2013-04-07 15:14:43 +02:00
Roland Kaufmann
5a17857d7b Report target architecture compiling for 2013-04-07 13:03:08 +02:00
Roland Kaufmann
878fe026f9 Minor refactoring to make code more readable 2013-04-07 00:46:58 +02:00
Roland Kaufmann
43cf58231a Version entry URL for repository
Different set of packages may be necessary for various versions of the
RPM-based distros. Thus we need a way to know which one is indended to
be used (through the selection of the right url).

Also add a version number to the stem of the URL, so that later aliases
can be introduced to let one stay at previous versions.
2013-04-06 01:21:43 +02:00
Roland Kaufmann
0b26514f0f Allow whole program optimization to be switched off 2013-04-05 00:14:26 +02:00
Roland Kaufmann
2386325e57 Allow user to override our non-standard defaults
CMake loads option defaults from the platform file and then usually
proceeds to write these to the cache, so it is not possible to see
if an option was specified by the user, or was the default.

By setting CMAKE_NOT_USING_CONFIG_FLAGS, we regain control over the
options and can then set this to what we think is suitable, provided
that the user hasn't specified something for us.
2013-04-05 00:14:26 +02:00
Roland Kaufmann
e8e3960f47 Detect empty elements in dependency list
These errors are usually an extra trailing semi-colon, which is easy
to put in there for symmetry with the other lines. Give a warning on
this but proceed with the build as usual afterwards.
2013-04-04 10:43:51 +02:00
Roland Kaufmann
adb2dcef32 Remove trailing empty element on dependency list
An extra semi-colon had snuck in here which caused the project to be
dependent on a module called "", which of course failed further down
the line.

This error was previously undetected because we didn't have anything
that depended on opm-upscaling.
2013-04-04 10:33:25 +02:00
Arne Morten Kvarving
0838152259 update: debian packaging version 2013-04-03 12:28:47 +02:00
Atgeirr Flø Rasmussen
fa43244633 Merge pull request #223 from rolk/223_cmake
CMake rollup
2013-04-03 03:19:03 -07:00
Roland Kaufmann
fcaa85e18b Add more support for configuring MPI
Handles options --enable-mpi and --with-mpi-prefix for compatibility
with other autotools projects which uses these settings to tell the
build system where the local MPI library is.
2013-04-03 10:52:57 +02:00
Roland Kaufmann
81cf91fae9 Teach configure wrapper to know about modules 2013-04-03 10:19:09 +02:00
Roland Kaufmann
760739bf2d Also look in corresponding build-dir as ourself
If we are building in a sub-dir to the source tree, guess that a
dependent module is also that, and that the directory that is given
is for the suite, not for the project alone.
2013-04-03 10:16:56 +02:00
Roland Kaufmann
0054c55019 Allow packages to be installed directly in suite dir
Let us specify e.g. --with-dune=/usr, so that the _ROOT variable is
set to e.g. /usr/dune-common, but then backtrack to the parent directory
again if we don't find anything there and search directly in suite dir.
2013-04-03 10:16:55 +02:00
Roland Kaufmann
1754474df1 Give better diagnostics in case probe fails
The standard argument handling report which item that failed
(_INCLUDE_DIR, _LIBRARY og HAVE_) but it doesn't provide information
about the root that was used to search for these. Given that we now
automatically search a lot of other places, the _ROOT variables should
be reported before the error is raised.
2013-04-03 10:16:54 +02:00
Roland Kaufmann
9d65dec0ac Provide suite info for those not in name convention 2013-04-03 10:16:54 +02:00
Roland Kaufmann
83fb758b74 Search for module in suite directory if specified
Instead of having to specify each and every project in a suite such as
DUNE or OPM, allow a root directory for the entire suite to be specified
and then assume that each module is located in a sub-directory to this.

Each individual project can still have its path explicitly specified, if
a special build of those are required.

The suite variable itself will be written to cache by being specified
on the command line. Each individual project directory will NOT be
written to cache, because then we cannot get rid of it by specifying a
new suite directory.
2013-04-03 10:16:53 +02:00
Arne Morten Kvarving
b254e6c4ed added: missing file 2013-04-02 13:25:18 +02:00
Atgeirr Flø Rasmussen
3b57a319f4 Merge pull request #222 from akva2/update_debian_packaging
Update debian packaging
2013-04-02 04:09:54 -07:00
Atgeirr Flø Rasmussen
bcf098e65f Merge pull request #221 from akva2/redhat_package_apps
updated: package applications on redhat
2013-04-02 04:09:32 -07:00
Arne Morten Kvarving
771cf19d6e added: package applications for debian 2013-04-02 13:05:40 +02:00
Arne Morten Kvarving
0418a3d2d8 changed: don't use the build-depends-indep field in debian packaging
the apt in precise has a bug preventing this from working
2013-04-02 13:05:40 +02:00