Bård Skaflestad
2bc15fb31b
Generate 2D normals of length equal to face area.
2012-02-27 10:09:06 +01:00
Bård Skaflestad
53f05d3eab
Don't assume that num_phases==2 when calculating total mobility.
2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8
Moved simulator utility functions to opm/core/utility/miscUtilities.hpp.
...
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
85f321fc44
Added experimental code guarded by EXPERIMENT_GAUSS_SEIDEL #define.
2012-02-26 00:30:36 +01:00
Atgeirr Flø Rasmussen
0abaa508aa
Adding data for experiments, left alone if unused.
2012-02-26 00:29:39 +01:00
Atgeirr Flø Rasmussen
e939202760
Added more inactive experimental code.
2012-02-25 22:39:01 +01:00
Atgeirr Flø Rasmussen
ccda9308ce
Proper vtk output of multicomponent fields (i.e. saturation, velocity).
2012-02-25 22:36:07 +01:00
Xavier Raynaud
e36c5bd46f
Decrease tolerance requirement for x1-x0 in modifiedregularFalsi
2012-02-24 17:17:05 +01:00
Bård Skaflestad
203a384324
Merge from upstream.
2012-02-22 23:53:34 +01:00
Bård Skaflestad
9f74500a9f
Generate 3D normals of length equal to face area.
2012-02-22 01:58:45 +01:00
Bård Skaflestad
4c5f982811
Add support for variable top-node depths in 3D tensor grid.
2012-02-22 01:56:24 +01:00
Atgeirr Flø Rasmussen
b863ac37fd
Removed copied text accidentally left in.
2012-02-21 22:02:16 +01:00
Atgeirr Flø Rasmussen
fe91b1ba70
Fixed class comments, LinearSolverUmfpack::solve() properly returns a report.
2012-02-21 21:54:46 +01:00
Atgeirr Flø Rasmussen
8d74253c64
IncompTpfa now takes a linear solver as a constructor argument.
2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
d9ed7cadad
Made the solve() methods const.
2012-02-21 21:36:09 +01:00
Atgeirr Flø Rasmussen
5d502f1c46
Using LinearSolverUmfpack for the linear solver.
2012-02-21 21:32:11 +01:00
Atgeirr Flø Rasmussen
af260d3d75
Added LinearSolverInterface and two subclasses, using Umfpack and Istl.
2012-02-21 21:27:15 +01:00
Atgeirr Flø Rasmussen
4839b56e98
Remove #include "config.h".
...
- Since many other files don't.
- We may want to establish a policy on this, that works with CMake.
An alternative (not chosen) could have been to wrap the #include in
#ifdef HAVE_CONFIG_H etc.
2012-02-21 13:53:54 +01:00
Atgeirr Flø Rasmussen
6165fa2ba6
Bugfix: must always initialize gpress_omegaweighted_, even if no gravity.
2012-02-20 17:05:28 +01:00
Atgeirr Flø Rasmussen
4ba285ec21
Ensuring gravity feature is used consistently.
2012-02-20 13:39:40 +01:00
Atgeirr Flø Rasmussen
b2e390aef2
Throws if it fails to initialise grid.
2012-02-20 13:35:47 +01:00
Atgeirr Flø Rasmussen
2fa1f1b5f2
Added class IncompTpfa.
2012-02-20 13:23:01 +01:00
Atgeirr Flø Rasmussen
13e4e0fb15
Added GridManager class.
2012-02-20 11:34:27 +01:00
Atgeirr Flø Rasmussen
f1502b722b
Renamed function that was already renamed in header.
2012-02-19 21:31:58 +01:00
Atgeirr Flø Rasmussen
0395d7725e
Moved writeVtkData() functions to utility/, added a test program.
2012-02-19 21:24:59 +01:00
Bård Skaflestad
a3a45519a2
Fill_geometry_3d(): Support tensor product of variable cell sizes.
...
Also: Re-implement create_hexa_grid_3d() in terms of
create_tensor_grid_3d().
2012-02-18 00:36:37 +01:00
Atgeirr Flø Rasmussen
93d4bd80f7
Added tol and maxit arguments. Using Incomp*::satRange() for initial s-bracket.
2012-02-17 14:17:16 +01:00
Atgeirr Flø Rasmussen
153a656539
Added satRange() method to Incomp* classes and Saturation* classes.
...
So far not yet added to BlackoilPropertiesInterface.
2012-02-17 14:15:25 +01:00
Atgeirr Flø Rasmussen
ccdacb791c
Added lots of (inactive) experimental code.
...
The code attempts to improve #iterations in the Gauss-Seidel-like
multicell solver by improving ordering. In general, experiment failed
to improve #iterations, except for one: totally random order was the
best (for the 100x100 case tried)!
2012-02-17 09:39:45 +01:00
Atgeirr Flø Rasmussen
8a2a3c3ff8
Added compute_sequence_graph(), which also returns the upwind graph.
2012-02-17 09:29:56 +01:00
Bård Skaflestad
e6649ad25d
Remove two instances of EOL whitespace.
2012-02-16 02:19:10 +01:00
Bård Skaflestad
eb86ac92ad
Use a sane definition of areas and volumes in 2D tensor grid.
2012-02-16 02:12:49 +01:00
Bård Skaflestad
911ce3b145
Fill_geometry_2d(): Support tensor product of variable cell sizes.
...
Also: Re-implement create_cart_grid_2d() in terms of
create_tensor_grid_2d().
2012-02-16 01:58:57 +01:00
Bård Skaflestad
a609175f79
Change grid creation semantics: Return NULL in case of allocation failure.
...
Let caller handle out of memory conditions. We are in no business to
enforce a particular failure handling policy.
2012-02-16 01:12:46 +01:00
Bård Skaflestad
ddfcd4a1e3
Extract Cartesian dimensions from grid when filling topology/geometry.
...
The dimensions are already set in the grid structure during allocation.
2012-02-16 01:04:35 +01:00
Atgeirr Flø Rasmussen
af1dc247d5
Merge.
2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
541813ace5
Made reordersequence a C++ source file, in order to use std::sort().
...
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
2012-02-15 22:42:07 +01:00
Atgeirr Flø Rasmussen
c8e0d59611
Added solveMultiCell() interface and implementation.
...
- Added solveMultiCell() virtual method.
- TransportModelInterface::reorderAndTransport() now calls solveMultiCell()
instead of aborting if encountering multi-cell components.
- Implemented solveMultiCell() in TransportModelTwophase by solving
each cell individually with solveSingleCell() and repeating until
saturation change is small (hardcoded 1e-9 for now).
2012-02-15 22:38:45 +01:00
Bård Skaflestad
f3f261b9a2
Reference per-cell fluid matrix when calculating phase densities.
...
This change repeats change-set f3bd5169811e of sibling class
BlackoilPropertiesBasic .
2012-02-15 15:37:02 +01:00
Bård Skaflestad
ba7b0f05b9
Reference per-cell fluid matrix when calculating phase densities.
2012-02-14 20:23:13 +01:00
Bård Skaflestad
3a004d21ac
Include <gridinterface.h> for free_grid(), compute_geometry() and preprocess().
2012-02-10 14:12:19 +01:00
Bård Skaflestad
8a2d216a83
Refactor inflow tests and flux assignments.
2012-02-10 11:40:21 +01:00
Bård Skaflestad
deb868c233
Fix spelling (interiour -> interior).
2012-02-10 11:26:48 +01:00
Bård Skaflestad
24ceea4ad0
Remove #include<> statement that refers to file removed in cset b4feb4a932de.
2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
a48b261a3c
TransportModel* classes are now expected to have a custom solve() method. More:
...
- Using new solve() method in spu_2p.
- solve() implemented in terms of protected superclass method reorderAndTransport().
- Removed unused code being replaced by solve().
2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
11e5f76813
Removed legacy blackoil fluid code. Further information:
...
- These classes were imported (copied) from the dune-porsol repository,
and copies remain there for the time being.
- Some of the black oil fluid classes that are in opm-core, such as the
SinglePvt* classes, are direct descendants of the Miscibility* classes
that have been removed.
- At some point, we may modify dune-porsol to use the new fluid interfaces
from opm-core, but for now we keep using the existing code as-is.
2012-02-10 09:28:05 +01:00
Atgeirr Flø Rasmussen
da1159061a
Removed unused files.
2012-02-09 23:39:18 +01:00
Atgeirr Flø Rasmussen
05ac35ed14
Cleaned up and removed unused code.
2012-02-09 23:35:43 +01:00
Atgeirr Flø Rasmussen
c076a8a6b9
Made grid argument of compute_sequence() const.
2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
7767e1cc81
Refactored internals, now using modifiedRegulaFalsi() template for performance.
2012-02-09 23:17:08 +01:00