Commit Graph
878 Commits
Author SHA1 Message Date
Xavier Raynaud 9e480cd997 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Xavier Raynaud f15a6e03f0 Added common root name for vtk file names. 2012-08-20 15:14:01 +02:00
xavier d706f4ea36 Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 11:04:56 +02:00
Atgeirr Flø Rasmussen a23f8d1706 Added parameter output_vtk.
Defaults to true, if false do not write .vtu output.
2012-08-17 13:54:19 +02:00
Atgeirr Flø Rasmussen f3169d7dc5 Merge branch 'master' into rock_comp_tpfa 2012-08-17 12:55:41 +02:00
Atgeirr Flø Rasmussen 9a1bcaf496 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen 08e966eff1 Small improvements, outputs unused params at the correct time. 2012-08-17 11:20:42 +02:00
Atgeirr Flø Rasmussen 48acb816ff Merge remote-tracking branch 'upstream/master' 2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen 6e778b9641 Bugfix: call *comprock* method only if active rock compressibility. 2012-08-17 10:56:27 +02:00
Atgeirr Flø Rasmussen dec8ed5760 Class CompressibleTpfa now handles rock compressibility. 2012-08-17 10:38:41 +02:00
Atgeirr Flø Rasmussen aa49d56d9c Added function cfs_tpfa_res_comprock_assemble().
This is intended to handle cases with both fluid and rock compressibility.
2012-08-17 10:36:57 +02:00
Halvor Møll Nilsen 5a05af55eb Merge remote-tracking branch 'upstream/master' 2012-08-16 16:01:52 +02:00
Halvor Møll Nilsen 2da6650b97 Moved output of quantities to separate directoirs inside the outdir.
This is done to get a cleaner putput.
2012-08-16 15:29:57 +02:00
Atgeirr Flø Rasmussen b427125a4f Merge remote-tracking branch 'upstream/master' 2012-08-14 15:27:30 +02:00
Atgeirr Flø Rasmussen 17383ca91f Merge remote-tracking branch 'upstream/master' 2012-08-14 11:31:54 +02:00
Bård Skaflestad f8825976f0 Restore original method spacing.
No functional changes.
2012-08-14 11:26:07 +02:00
Atgeirr Flø Rasmussen a81df458e3 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Bård Skaflestad 0841cea042 Restore coding conventions.
Inadvertently lost in commit 064184b.
2012-08-14 11:05:09 +02:00
Bård Skaflestad 5986b4a24d Re-adjust Doxygen layout for commit 9d9691a. 2012-08-14 11:03:33 +02:00
Bård Skaflestad 9d9691a927 Fix misprints in Doxygen comment. 2012-08-14 11:01:39 +02:00
Bård Skaflestad 56cd291080 Replace <tab>s by eight spaces.
While here, fix a misprint in comment.
2012-08-14 11:00:47 +02:00
Bård Skaflestad 7a48d13424 Remove an unused header.
We don't need <string> to define the public interface of
LinearsSolverAGMG.
2012-08-14 10:57:06 +02:00
Bård Skaflestad 624d6177df Restore coding conventions.
Inadvertently lost in commit 064184b.
2012-08-14 10:44:17 +02:00
Halvor Møll Nilsen 064184bd0c Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
Atgeirr Flø Rasmussen 9a23b8db74 Constructors of *FromDeck classes now take an UnstructuredGrid.
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
2012-08-10 10:12:45 +02:00
Atgeirr Flø Rasmussen abb4264b48 Made vector function argument a const reference. 2012-08-10 09:43:33 +02:00
Atgeirr Flø Rasmussen b00532c6d9 Whitespace cleanup. 2012-08-09 14:48:44 +02:00
Atgeirr Flø Rasmussen 1de03f017c Support using DXV, DYV, DZV in deck to create grid. 2012-08-09 14:28:13 +02:00
Atgeirr Flø Rasmussen 91a96307be Added TOPS keyword to deck parser. 2012-08-09 14:24:08 +02:00
Atgeirr Flø Rasmussen a0b5ec9658 Merge remote-tracking branch 'upstream/master' 2012-08-09 10:55:23 +02:00
Bård Skaflestad 0f2b0bd33e Use read-only types for non-scalar input parameters.
This allows the compiler to explicitly enforce conventions that
previously were only stated in the documentation.
2012-07-20 16:04:45 +02:00
Bård Skaflestad 0cfa7223c4 Fix misprint in comment. 2012-07-20 11:36:02 +02:00
Atgeirr Flø Rasmussen f2e1801219 Whitespace cleanup. 2012-07-19 15:34:42 +02:00
Atgeirr Flø Rasmussen 342a2f2668 Merge remote-tracking branch 'upstream/master' 2012-07-19 15:29:14 +02:00
Atgeirr Flø Rasmussen 2dc1744bce Bugfix in CompressibleTpfa for gravity case.
Gravity acceleration should be a factor in the face gravity potential.
2012-07-19 14:45:15 +02:00
Atgeirr Flø Rasmussen 59611a2d18 Transport solver partially complete (segregation solver remains). 2012-07-19 14:02:26 +02:00
Bård Skaflestad 0858cbfc16 Document public interface of Cartesian grid constructors. 2012-07-18 12:05:53 +02:00
Bård Skaflestad 642eaf6c29 Document public interface of cpg-processing module. 2012-07-18 11:22:43 +02:00
Bård Skaflestad 426cb97003 Fix misprint. 2012-07-18 11:21:42 +02:00
Bård Skaflestad 46b89cf1a9 Document public corner-point processing interfaces. 2012-07-18 11:17:59 +02:00
Bård Skaflestad e690659bc5 Hook file into Doxygen.
While here, doxygenise the information describing convert::to() and
convert::from(), and the prefixes as well.
2012-07-18 11:00:50 +02:00
Bård Skaflestad 20b0c8f83b Use have_boost_redef.hpp rather than direct override. 2012-07-12 14:36:36 +02:00
Bård Skaflestad 82369f9109 Add facility for overriding `HAVE_BOOST' from Dune.
This is, at best, a work-around for an issue that presents when
earlier versions of Autoconf (e.g., 2.59) are used to process Dune's
DUNE_BOOST_BASE macro (introduced in dune-common@6480,
dune-istl@1492).  For reasons I've been unable to determine, the
HAVE_BOOST symbol just gets #define-d, not set to `ENABLE_BOOST' as
was intended.  Some kind of race condition?

Anyway, the Dune ISTL module uses statements such as

   #if HAVE_BOOST
     /* ... */
   #endif

to determine if particular software features should be enabled.
This breaks down if `HAVE_BOOST' is simply defined.  Following
commit fb614100, the symbol `OPM_HAVE_BOOST' is always defined (as a
Boolean state), so if we override ISTL's notion of `HAVE_BOOST', the
above construction continues to work.

We will, however, happily remove thise kluge if a better solution
arises in the core Dune modules.
2012-07-12 14:20:59 +02:00
Andreas Lauser 6f69de969a opm-core: make it work nicely with clang 2012-07-05 12:42:49 +02:00
Bård Skaflestad c2eaa97049 Add partial Doxygen markup to public interfaces.
More work needed.
2012-07-03 01:30:18 +02:00
Bård Skaflestad 1235b8ecbc Document public interface for transmissibility calculation. 2012-07-03 01:29:34 +02:00
Bård Skaflestad 8e436e174a Include missing headers. 2012-07-02 22:29:47 +02:00
Bård Skaflestad 02e715fe14 makefhfQPeriodic(): Use less branch'y implementation. 2012-07-02 19:09:58 +02:00
Bård Skaflestad 4c36b397fd EquilLine: Initialise all members in default constructor. 2012-07-02 18:30:56 +02:00
Bård Skaflestad 4ffd9198bf Initialise all members in default constructor. 2012-07-02 17:44:16 +02:00