Commit Graph

3384 Commits

Author SHA1 Message Date
Bård Skaflestad
7add6048cc Merge pull request #240 from atgeirr/tof-improvements
Ensure (average of) tracers sum to one for DG1.
2013-05-14 02:28:21 -07:00
Roland Kaufmann
34acf3ecd0 Make implementation class "package" visible
Since a definition of the class is not in the header, no other
compilation units can safely access the internals of the Impl class
anyway, so it may as well be a regular struct so that the outer class
(SimulatorIncompTwophase) can access it.
2013-05-14 11:11:18 +02:00
Atgeirr Flø Rasmussen
9f927ca6df Merge pull request #241 from bska/double-refpress
Always interpret 'ref_pressure' as a double
2013-05-14 01:40:13 -07:00
Bård Skaflestad
53b082af28 Always interpret 'ref_pressure' as a double
Otherwise, when specifying (e.g.)

   ref_pressure=1.0e-5

(1 Pascal in bars), the value gets reinterpreted as

   ref_pressure=1

which is one bar.
2013-05-14 10:19:12 +02:00
Tor Harald Sandve
80ec30c22f Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-14 08:21:13 +02:00
Atgeirr Flø Rasmussen
6d1b47e419 Merge pull request #238 from rolk/238_dtd
Provide DTD schema to describe parameter file format
2013-05-13 07:21:38 -07:00
Atgeirr Flø Rasmussen
280bf30a26 Add phaseUsage() method to BlackoilPropertiesInterface.
Also implement method in derived classes.
2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen
238bd6b891 Ensure (average of) tracers sum to one for DG1. 2013-05-13 16:17:41 +02:00
Bård Skaflestad
7db46d507f Merge pull request #239 from rolk/239_stlcheck
Probe for library without using STL
2013-05-13 02:44:52 -07:00
Roland Kaufmann
229cf6d134 Probe for library without using STL
If dune-grid has been compiled with _GLIBCXX_DEBUG, linking the test
program will fail since probing doesn't get the flags that are specified
for the main project, and thus configuration halts. Instead, we use a
smaller test program which doesn't need proper STL linkage to compile
and link.
2013-05-13 11:28:37 +02:00
Roland Kaufmann
0fb4f14b28 Provide DTD schema to describe parameter file format
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
2013-05-13 10:50:22 +02:00
Atgeirr Flø Rasmussen
1d5e210822 Merge pull request #235 from joakim-hove/ert-master
Minor update to build opm-core with current ert master
2013-05-02 13:24:27 -07:00
Joakim Hove
1281d17b60 Changed writeECLDate() to write UNFORMATTED restart files. 2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610 Updated calls to ecl_util_fmt_file() - result is by reference 2013-05-02 19:04:09 +02:00
Bård Skaflestad
0ed065586a Merge pull request #234 from atgeirr/tof-improvements
New and improved capabilities for time-of-flight and tracer partitioning computations.
2013-04-24 23:24:37 -07:00
Atgeirr Flø Rasmussen
61829dd238 Added limiter for tracer. 2013-04-24 11:27:04 +02:00
Atgeirr Flø Rasmussen
da5ea0ccae Add call to DG tracer computations if user requests.
Used to throw with an 'unimplemented' message.
2013-04-24 10:40:56 +02:00
Atgeirr Flø Rasmussen
1a84b4fe7d Add tracer computations (method solveTofTracer()).
Same interface as in class TofReorder.
2013-04-24 10:39:50 +02:00
Atgeirr Flø Rasmussen
3086d5d815 Update doc, only initialize tracerhead_by_cell_ if needed. 2013-04-24 10:36:52 +02:00
Atgeirr Flø Rasmussen
8552347080 Tracer computations are now fixed and robust.
- Handles noisy source terms.
 - Works with repeated solve calls (multi-cell block solves).
2013-04-23 15:35:47 +02:00
Atgeirr Flø Rasmussen
2fbf3bd7cb Implement solveMultiCell() with Gauss-Seidel. 2013-04-23 13:38:47 +02:00
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