Commit Graph

1085 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
af1dc247d5 Merge. 2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
f7b4762472 Added gravity (no segregation). Added "scenario" parameter. 2012-02-15 22:43:56 +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
ef1fc80c07 Initialise maths support early. 2012-02-10 14:59:40 +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
Atgeirr Flø Rasmussen
2061e7fcd8 Added timers. 2012-02-09 23:15:14 +01:00
Atgeirr Flø Rasmussen
909007942e Re-added necessary include files. 2012-02-09 23:14:50 +01:00
Atgeirr Flø Rasmussen
660a45440d Using new reorderTransportTwophase() function. 2012-02-09 16:09:24 +01:00
Atgeirr Flø Rasmussen
c51d9f1a6c Added new top-level reorder free function, reorderTransportTwoPhase(). 2012-02-09 16:08:53 +01:00
Atgeirr Flø Rasmussen
54c89db47b Added classes TransportModelInterface and TransportModelTwophase. 2012-02-09 16:07:53 +01:00
Atgeirr Flø Rasmussen
ba13070a74 Added new function create_hexa_grid_3d(). 2012-02-08 15:00:56 +01:00
Atgeirr Flø Rasmussen
30ec82a02c Fix order of arguments for error messages. 2012-02-08 13:52:19 +01:00
Atgeirr Flø Rasmussen
be308f8bd5 Improved bracketing error message from nonlinear solvers. 2012-02-08 13:50:08 +01:00
Atgeirr Flø Rasmussen
c0ded27f8d Put brackets for nonlinear solvers into NonlinearSolverCtrl struct. 2012-02-08 13:37:52 +01:00
Bjørn Spjelkavik
08fb3df82c bugfix 2012-02-07 10:22:47 +01:00
Bård Skaflestad
2566bbc01f Solidify checks for maths-related functions.
Specifically, bring in maths library through AC_SEARCH_LIBS and add
checks for sqrt() and pow() only after we've established which library
might contain these functions.  Similarly, rely on AC_SEARCH_LIBS
adding -lamd to ${LIBS} if needed in which case it is not necessary to
manually bring these libraries in while searching for UMFPACK.

Finally, add check for memset().  Needed by Tarjan implementation.
2012-02-07 00:25:40 +01:00
Bård Skaflestad
2de58be3fd Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +01:00
Atgeirr Flø Rasmussen
da16edf8bc Removed unnecessary (potentially misleading) assignment. 2012-02-06 10:45:21 +01:00
Bård Skaflestad
32f5ae1030 Implement basic memory management for new well interface.
Hook up to build, but actual location is likely to change...
2012-02-03 21:35:19 +01:00
Jostein R. Natvig
9def4966cc Remove old function "create_cart_grid", please use "create_cart_grid_3d". 2012-02-03 10:56:28 +01:00
Atgeirr Flø Rasmussen
bdd7bcb50f Fixed saturation initialization and updating of total mobilities. 2012-02-02 14:24:49 +01:00
Atgeirr Flø Rasmussen
41f9f06df4 Fallout from removal of grid_t typedef. 2012-02-01 20:29:05 +01:00
Atgeirr Flø Rasmussen
a3eb09032b Catch up with unified grid construction/destruction, simplifying grid management. 2012-02-01 15:58:32 +01:00
Atgeirr Flø Rasmussen
3c3db99076 Include necessary header for free_grid(). 2012-02-01 15:57:02 +01:00
Jostein R. Natvig
7439640098 Unify grid destructors: new common function is called free_grid(...). 2012-02-01 15:45:13 +01:00
Jostein R. Natvig
98919ced76 Merge. 2012-02-01 14:57:20 +01:00
Jostein R. Natvig
fb99d7bdaf 1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid.
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
2012-02-01 14:56:38 +01:00
Bård Skaflestad
b5ebdd41b6 Use explicit string constructor for keywords SWFN, SOF2, and TUNING.
Keywords are supposed to be strings anyway, and it's better to enforce
this restriction explicitly rather than to rely on implicit conversion
from character literals.
2012-02-01 14:55:49 +01:00
Jostein R. Natvig
e577b74a48 Add new version of well datastructure. 2012-02-01 12:16:05 +01:00
Atgeirr Flø Rasmussen
9a51f77538 Merged. 2012-01-31 22:36:03 +01:00
Atgeirr Flø Rasmussen
7711b3920c Now using reorder solver by default. 2012-01-31 22:35:50 +01:00
Atgeirr Flø Rasmussen
48cd13228f Vtk output for general grids. Grid read from deck can use DIMENS or SPECGRID. 2012-01-31 22:33:48 +01:00
Atgeirr Flø Rasmussen
7eb2d297bf Fix error message. 2012-01-31 22:30:24 +01:00
Bård Skaflestad
89fcb2d082 Merge from upstream. 2012-01-31 10:21:08 +01:00
Bård Skaflestad
b93709a8ba Implement read support for "RS" keyword (initial gas/oil solution ratio). 2012-01-31 10:20:37 +01:00
Atgeirr Flø Rasmussen
02a94c1f79 Work in progress on reading all props and grid from deck. No output yet. 2012-01-31 09:44:52 +01:00