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
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
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
Atgeirr Flø Rasmussen
95b80590b7
Added test for DG basis classes.
...
Only 2d so far.
2013-01-17 14:35:50 +01:00
Bård Skaflestad
8b482cadda
Merge pull request #116 from atgeirr/master
...
More DG time-of-flight improvements.
2013-01-16 06:54:19 -08:00
Atgeirr Flø Rasmussen
c3f9e64c9c
Complete separation of basis func classes.
...
Also:
- Add use_tensorial_basis parameter allowing run-time choice of basis.
- Remove degree argument from solveTof() method, degree is instead obtained
from parameters in constructors. Modified compute_tof* programs to match.
2013-01-16 15:13:45 +01:00
Atgeirr Flø Rasmussen
fb060da933
Implement (empty) virtual destructor, make methods public.
2013-01-16 15:11:46 +01:00
Atgeirr Flø Rasmussen
564db5df87
Increased quadrature order in a term.
...
This is for the benefit of bi/tri-linear basis functions, as stated
in the comments.
2013-01-16 13:45:15 +01:00
Atgeirr Flø Rasmussen
33cc611ced
Moved DG basis to separate classes in its own file.
...
Also introduced interface (base) class and changed the api, not used yet by the tof solver.
2013-01-16 13:38:02 +01:00
Atgeirr Flø Rasmussen
52c164040a
Add methods addConstant() and multiplyGradient() to multilinear basis.
...
Not tested yet, though.
2013-01-15 20:44:28 +01:00
Atgeirr Flø Rasmussen
d822b92e1c
Implement limiters with addConstant() and multiplyGradient().
...
This is instead of directly manipulating the coefficients, requiring
assumptions on the basis used.
2013-01-15 13:52:44 +01:00
Atgeirr Flø Rasmussen
ae2016e063
Added addConstant() and multiplyGradient() methods.
...
So far only to class DGBasisBoundedTotalDegree.
2013-01-15 13:44:18 +01:00
Atgeirr Flø Rasmussen
b5a2556df7
Added class DGBasisMultilin.
...
Multilinear DG1 basis functions added. Will not work with current limiter.
2013-01-15 13:42:05 +01:00
Atgeirr Flø Rasmussen
4000eeaef6
Reduce source sum failure from error to warning.
...
Should extend to sum over sources and boundaries before reinstating.
2013-01-15 13:39:35 +01:00
Atgeirr Flø Rasmussen
a2f2fcdfbb
Renamed class DGBasis -> DGBasisBoundedTotalDegree.
2013-01-15 13:37:39 +01:00
Atgeirr Flø Rasmussen
6e716db0f9
Do not require unnecessary high quadrature precision.
2013-01-15 13:33:55 +01:00
Atgeirr Flø Rasmussen
d670f37131
Added (disabled) extra output for debugging purposes.
...
Enable by defining EXTRA_VERBOSE.
2013-01-15 13:17:43 +01:00
Atgeirr Flø Rasmussen
b25f81cf58
Do not assume that the first basis function is the constant 1.
...
Properly integrate b_i * porosity over the cell for all basis functions b_i.
2013-01-15 13:10:09 +01:00
Bård Skaflestad
a197dbdd0b
Merge pull request #111 from atgeirr/dg-improvements
...
Further improvements to limiters for DG time-of-flight computations
2013-01-08 07:45:40 -08:00
Atgeirr Flø Rasmussen
c6087791d4
Merge branch 'master' into dg-improvements
2013-01-08 16:01:52 +01:00
Atgeirr Flø Rasmussen
33e9952074
Added MinUpwindAverage limiter method, made it default.
2013-01-08 16:00:17 +01:00
Atgeirr Flø Rasmussen
9df613913e
Documented new available limiting options in constructor doc.
2013-01-08 13:34:50 +01:00
Atgeirr Flø Rasmussen
67fc1074de
Change constructor to take ParameterGroup argument.
...
Also make tof to limit against >= 0.0, for case when upstream cell values go
below zero.
Disabled some debug output.
2013-01-08 13:14:26 +01:00
Atgeirr Flø Rasmussen
d6596a87af
Improvements to DG1 flux limiter.
...
Skeleton in place for increased flexibility in methods and usage.
(So far behaviour choices are hardcoded, though.)
Added relative flux thresholding to existing limiter to avoid flux noise
strongly affecting solution. For example no-flow boundaries could be treated
as inflow boundaries and make the minimum upwind face limiter meaningless.
2013-01-08 11:04:43 +01:00
Atgeirr Flø Rasmussen
86eb45bd88
Add methods sequence() and components().
2013-01-08 11:04:07 +01:00