Bård Skaflestad
0eb32742d4
Include <cassert> to bring in declaration of assert()
2013-02-20 12:59:40 +01:00
Bård Skaflestad
b4fe38e3fd
Reduce module prerequisites.
...
There is no need to include <iostream> or <fstream> when all we need is
contained in the services defined by <istream> and <ostream>.
2013-02-19 11:27:54 +01:00
Bård Skaflestad
a29e5db8e1
writeVector(): Avoid unneeded type conversion
...
std::floor() returns a double so assigning it to an int introduces a
type conversion. There is no need to do that. In the process, do away
with the restriction that we only write entire lines.
2013-02-19 11:27:54 +01:00
Bård Skaflestad
a39e5a1366
Use an integer type for "maxit_" counter.
...
The "maxit_" counter is an upper limit on the number of non-linear
iterations in a single cell. Declaring this as a "double" is counter
intuitive unless one expects the number to be *really* high.
Present since
- Commit 93d4bd8
(TransportModelTwophase.hpp)
- Commit e0d38cf
(TransportModelTwophaseCompressible.hpp)
2013-02-19 11:27:54 +01:00
Bård Skaflestad
11425efe81
Index into vectors using integers.
...
This commit corrects an error that has been present since the
introduction of function wellsToSrc() in commit a50bb8f
but was never
detected. Although the conversion int->double->std::size_t is likely to
be loss-less, it is better to not introduce any more steps than are
actually needed.
2013-02-18 11:49:52 +01:00
Bård Skaflestad
4d6eca1847
Merge pull request #135 from atgeirr/doc-improvements
...
Doc and comment improvements
2013-02-06 01:26:29 -08:00
Atgeirr Flø Rasmussen
ab5183f1c3
Merge pull request #140 from bska/ert-cleanup
...
Ert cleanup
2013-02-05 23:44:36 -08:00
Atgeirr Flø Rasmussen
a80141092d
Minor mod: removed text about low-level interfaces.
2013-02-06 08:42:02 +01:00
Atgeirr Flø Rasmussen
974cf9c33f
Merge pull request #138 from bska/release-cleanup
...
Correct a number of latent issues in `tarjan.c`
2013-02-05 23:38:25 -08:00
Bård Skaflestad
9d2191dd37
Catch up to changing location of ERT headers.
2013-02-05 15:20:12 +01:00
Bård Skaflestad
c245a0ae7a
Catch up to ERT library reorganisation
...
Specifically, changing locations of headers and library renaming
libgeometry.a -> libert_geometry.a
2013-02-05 15:19:36 +01:00
Bård Skaflestad
fb482740d4
Catch up to changing location of ERT headers
2013-02-05 15:18:17 +01:00
Arne Morten Kvarving
af388bb81c
Update import of ERT-Eclipse headers to new location
2013-02-05 15:07:35 +01:00
Bård Skaflestad
edeb9d7551
Replace an assignment with intended equality test
...
This corrects a latent error that has been present since the inception
of this module.
2013-02-01 16:30:45 +01:00
Bård Skaflestad
089988aa16
Eliminate redundant explicit type conversion.
...
The pointers in question are already type 'int *'. There is no need to
explicitly convert them to that type too.
2013-02-01 16:25:46 +01:00
Bård Skaflestad
cf922e73ce
Eliminate release-mode build warning.
...
The 'cbottom' variable is only used within an assert(). Don't define
the variable in release (i.e., "NDEBUG") mode.
2013-02-01 16:15:35 +01:00
Bård Skaflestad
8f6be16ac3
Use portable method of zeroing vector of ints.
...
The memset() technique is only applicable to platforms for which
numerical zero is represented by all bits zero.
2013-02-01 16:06:39 +01:00
Atgeirr Flø Rasmussen
1ca82a7e9f
Merge pull request #136 from bska/release-cleanup
...
Avoid clobbering existing tests for SuperLU
2013-01-31 00:20:37 -08:00
Atgeirr Flø Rasmussen
eeadbe60ce
Merge pull request #121 from rolk/compgeo2d
...
Compute (extra) geometry properties for 2D grids
2013-01-31 00:19:55 -08:00
Bård Skaflestad
845db22a52
Avoid clobbering existing tests for SuperLU
...
We inherited this test from the Dune repositories, but failed to install
sufficient protection in the form of symbol renaming to guarantee that
both tests could coexist.
This issue was exposed by a recent pull request in the OPM-Porsol
repository, namely OPM/opm-porsol#16 .
2013-01-30 19:50:32 +01:00
Atgeirr Flø Rasmussen
954b0b6e2b
Minor fixes to top-level docs.
2013-01-29 14:02:49 +01:00
Atgeirr Flø Rasmussen
f23d14a309
Changed OpenRS->OPM in copyright notices and #include guards.
2013-01-29 13:42:24 +01:00
Atgeirr Flø Rasmussen
8995543467
Changed OpenRS->OPM in copyright notices and #include guards.
2013-01-29 13:29:44 +01:00
Atgeirr Flø Rasmussen
8e30215f16
Changed OpenRS->OPM in copyright notices and #include guards.
2013-01-29 13:17:01 +01:00
Atgeirr Flø Rasmussen
c6d07f76ab
Remove info about low-level assembler routines.
2013-01-29 12:48:44 +01:00
Atgeirr Flø Rasmussen
6cbc7e3e60
Added some top-level docs: wells and pressure solvers.
2013-01-29 11:10:17 +01:00
Atgeirr Flø Rasmussen
e7e9a7d701
Exclude embedded TinyXML library from doc generation.
2013-01-29 11:09:42 +01:00
Atgeirr Flø Rasmussen
2b2b877de2
Merge branch 'master' into doc-improvements
2013-01-29 10:14:55 +01:00
Atgeirr Flø Rasmussen
6f9eac0c50
Merge pull request #134 from bska/release-cleanup
...
Assorted clean-ups in preparation of release
2013-01-28 05:30:03 -08:00
Bård Skaflestad
3437ec8b32
Fix DisjointColumn test case
...
The test started failing in commit 7d7f62e
, but this was not detected
due to no automatic test environment. The commit changed the cell
numbering from "per-column (K,I,J)-ordering" to "per-plane
(I,J,K)-ordering". Consequently, the "correct_answer" seized to be
correct.
This change restores the "correct_answer" in the ordering introduced by
commit 7d7f62e
.
While here, adjust style of the DisjointColumn test case for legibility.
2013-01-25 17:35:21 +01:00
Bård Skaflestad
f46bd9b95a
Bring ParameterGroup interface into scope.
...
The constructor accepts a parameter::ParameterGroup reference and thus
needs a valid interface in scope. Relying on header pollution is
unwise.
2013-01-23 17:35:05 +01:00
Bård Skaflestad
d4363a04e9
Merge pull request #120 from atgeirr/dg-improvements
...
Further DG time-of-flight improvements
2013-01-23 04:38:26 -08:00
Atgeirr Flø Rasmussen
8f1aa94481
Merge remote-tracking branch 'upstream/master' into dg-improvements
2013-01-23 10:06:01 +01:00
Atgeirr Flø Rasmussen
b719bc8b1e
Added evalFunc() method.
...
This public method is not virtual, and implemented in the base class using calls to
the virtual methods. Not yet used by the DG solver.
2013-01-23 09:51:30 +01:00
Atgeirr Flø Rasmussen
5bdaeeafa0
Refactored applyMinUpwindLimiter().
2013-01-23 09:50:25 +01:00
Roland Kaufmann
591cf88ccd
Unit test the geometry computations for 2D grids
2013-01-22 23:21:26 +01:00
Atgeirr Flø Rasmussen
91658a40b9
Merge pull request #124 from akva2/add_license
...
Add COPYING file with license
2013-01-22 05:02:04 -08:00
Arne Morten Kvarving
77f733d424
added: license
2013-01-22 13:42:40 +01:00
Roland Kaufmann
ccf3edb00f
Set size properties in grid when allocating structure
...
There is little chance that the client want to set them otherwise since
that would make the structure inconsistent, and having all the clients
do the work is just needless duplicate labour.
2013-01-21 23:15:55 +01:00
Roland Kaufmann
4fb25b91ef
Compute properties for cells in 2D
2013-01-21 23:15:55 +01:00
Roland Kaufmann
701526596d
Compute properties for edges in 2D
2013-01-21 23:15:55 +01:00
Roland Kaufmann
7d8511fdaf
Prepare for processing two-dim. grid
...
Allow a two-dimensional grid to be sent to compute_geometry() without
the assertion triggering. Route three-dimensional grids to the existing
implementation.
2013-01-21 23:15:55 +01:00
Atgeirr Flø Rasmussen
940f1299a9
Add methods totalFlux() and minCornerVal().
...
Also started refactoring applyMinUpwindLimiter() using the
added methods.
2013-01-21 14:55:27 +01:00
Atgeirr Flø Rasmussen
dc50e61a01
Use functionAverage() instead of direct coefficient access.
...
This fixes the issue with limiters on multilinear basis.
2013-01-21 11:09:43 +01:00
Atgeirr Flø Rasmussen
de66f358b0
Added functionAverage() method to DGBasis classes.
2013-01-21 11:09:07 +01:00
Atgeirr Flø Rasmussen
1113e65eec
Refactored limiter functions.
...
The two limiter functions were very similar, and were unified in a single
method, with a bool argument to choose method variety.
2013-01-21 10:46:06 +01:00
Atgeirr Flø Rasmussen
5521278813
Merge remote-tracking branch 'upstream/master' into dg-improvements
2013-01-21 09:59:31 +01:00
Atgeirr Flø Rasmussen
40f9970eb8
Merge pull request #117 from bska/master
...
Release preparation: Fix out-of-bounds indexing in context of shut wells
2013-01-18 04:30:26 -08:00
Bård Skaflestad
6fffbe97d5
Merge remote-tracking branch 'upstream/master'
2013-01-18 13:23:52 +01:00
Bård Skaflestad
a93532e1ce
Opm::WellState::init(): Handle shut wells
...
This is a minor bugfix to account for the presence of shut wells
(characterised by "ctrls[w]->current < 0"). The existing code would
lead to indexing outside the "ctrls" array in the context of a shut
well.
2013-01-18 13:23:37 +01:00