Commit Graph

2113 Commits

Author SHA1 Message Date
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
9a1bcaf496 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
8fa0140e66 Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorTwophase.cpp
2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
f582627f2a Merge pull request #14 from hnil/master
Corrected use of boost header.
2012-08-17 02:26:51 -07:00
Atgeirr Flø Rasmussen
08e966eff1 Small improvements, outputs unused params at the correct time. 2012-08-17 11:20:42 +02:00
Halvor Møll Nilsen
bdad2c449c Changed header for boost. 2012-08-17 10:59:26 +02:00
Atgeirr Flø Rasmussen
48acb816ff Merge remote-tracking branch 'upstream/master' 2012-08-17 10:58:12 +02:00
Atgeirr Flø Rasmussen
6ed0b0a817 Merge pull request #13 from hnil/master
Changed output to be easier to read from matlab.
2012-08-17 01:55:18 -07:00
Halvor Møll Nilsen
b0cbc3d7f4 Reintroduced writing of param. 2012-08-16 16:10:28 +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
d89395f486 Merge pull request #12 from bska/master
Coding Style and Diagnostics Clean-up.
2012-08-14 05:01:08 -07:00
Bård Skaflestad
7ccf0350bc Tighten grammar of "HAVE_AGMG" symbol description. 2012-08-14 12:55:57 +02:00
Bård Skaflestad
05410ac950 Always #define "HAVE_DUNE_ISTL".
Define the symbol to zero (false) if unavailable.  This prevents a
diagnostic message concerning an undefined preprocessor symbol when used
in the form

    #if HAVE_DUNE_ISTL
       /* ... */
    #endif
2012-08-14 12:49:56 +02:00
Bård Skaflestad
736020e6fe Always #define "HAVE_AGMG".
Define the symbol to zero (false) if unavailable or unwanted.  This
prevents a diagnostic message concerning an undefined preprocessor
symbol (i.e., "HAVE_AGMG") when used in the form

    #if HAVE_AGMG
       /* ... */
    #endif
2012-08-14 12:42:47 +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
Bård Skaflestad
b4175e5c2b Merge pull request #11 from hnil/master
Changes: Poromult extapolate outside table. Facetages add to grid. Default of fluid is linear.
2012-08-14 01:13:40 -07: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
Bård Skaflestad
3d45ca3512 Merge pull request #10 from atgeirr/master
Improvements in grid creation and compressible solvers.
2012-08-10 01:34:44 -07: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
193d4d3921 Adapt to possibility for Cartesian grids from deck input.
Now we may have a grid generated from deck input using the
keywords DXV, DYV, DZV, which will have a null pointer for
the global_cell mapping. We check if this pointer is null,
and create an identity mapping in this case. The mapping is
needed by the *PropertiesFromDeck classes (and helpers).
2012-08-09 14:35:00 +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
8fefee7295 Merge pull request #9 from bska/master
Document Several Low- and Mid-Level Routines Related to Grid Construction
2012-07-18 03:13:02 -07: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
ab03dfafbf Merge pull request #8 from bska/master
Bring in Various Build-System Fixes
2012-07-12 07:04:55 -07:00
Bård Skaflestad
9f47cf0f54 Explicitly substitute absolute path variables.
Apparently, Automakes prior to 1.10 do not automatically substitute
the absolute path directory variables

   abs_srcdir    abs_top_srcdir
   abs_builddir  abs_top_builddir

that Autoconf computes (since ca. 2003) into the Makefiles.  This
leads to a subtle error when OPM-Core is used in conjunction with
dune-common's DUNE_CHECK_MODULES (or, more appropriately, our own
OPM_CORE_CHECK_MODULES) macro that gets invoked through dunecontrol.

The *_CHECK_MOUDLES macro contains an unconditional statement that
uses 'abs_top_srcdir' to compute the absolute path to the current
module's top source directory.  When abs_top_srcdir is unset, the
root becomes unset too, whence the subsequent existence and validity
checks fail due to incorrect CPPFLAGS and/or LDFLAGS.  It will also
fail to locate the 'dune.module' dependency file.

By explicitly substituting the above variables into the Makefiles,
as was also done in revisions 5819 and 5845 of dune-common's
Subversion repository, we're guarding against this particular
failure mode.

Tested on: CentOS 5.8 (Autoconf 2.59, Automake 1.9.6)
2012-07-12 14:37:23 +02:00
Bård Skaflestad
20b0c8f83b Use have_boost_redef.hpp rather than direct override. 2012-07-12 14:36:36 +02:00