Commit Graph

1436 Commits

Author SHA1 Message Date
Bjørn Spjelkavik
ae5c38e739 Untabified. 2012-02-27 11:15:33 +01:00
Bjørn Spjelkavik
4c1ae099aa Added reading of polymer related keywords. 2012-02-27 11:13:08 +01:00
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
Atgeirr Flø Rasmussen
0e1107f195 Output estimated cell velocities. 2012-02-25 22:29:35 +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
65bd117d6b Bugfix, make vector of sufficient size to hold expected data. 2012-02-21 22:45:01 +01:00
Atgeirr Flø Rasmussen
1a62734e98 Added EXPERIMENT_ISTL-guarded code for testing Istl linear solver. 2012-02-21 22:14:01 +01:00
Atgeirr Flø Rasmussen
433b6cea3f Added -ldunecommon to link flags. 2012-02-21 22:13: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
06a476476a Added LinearSolver* classes to build (not the ...Istl class though).
Adding LinearSolverIstl would require a bit of work (making it optional etc.).
2012-02-21 21:31:49 +01:00
Atgeirr Flø Rasmussen
6fe19a73f5 Fixed include path bug, added new LinearSolver* classes to build.
Note that the LinearSolverIstl class requires dune-common and
dune-grid to be installed in f.ex. /usr/local, but since the
cmake build support is experimental we add it for now.
2012-02-21 21:29:26 +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
222b706835 Added rudimentary CMake build support.
- Only tested on a single workstation.
  - Requires non-standard FindUmfPack.cmake module to be installed.
  - Only builds library and spu_2p. No install or test targets.
  - Lacks lots of include and flags statements for robustness.
2012-02-21 14:49:31 +01:00
Atgeirr Flø Rasmussen
a61bd0cf6d Added #if HAVE_CONFIG_H guards around #include "config.h". 2012-02-21 14:46:28 +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
Bård Skaflestad
0ea6352b46 Build IncompTpfa class only if UMFPACK is available.
This is a temporary stop-gap to restore the build on systems for which
the UMFPACK library is not available.  We need a better solution for
the general problem.
2012-02-21 10:35:56 +01:00
Atgeirr Flø Rasmussen
03c995e4c0 Added parameters "dx", "dy", "dz" controlling cell size in the cartesian case. 2012-02-20 17:06:13 +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
452be898dc Made s_min() and s_max() behave properly, using underlying props' satRange(). 2012-02-20 13:50:45 +01:00
Atgeirr Flø Rasmussen
5633f9398b Using IncompTpfa instead of ad hoc class. 2012-02-20 13:42:42 +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
18d2b226de Using GridManager class instead of ad-hoc grid class. 2012-02-20 11:34:51 +01:00
Atgeirr Flø Rasmussen
13e4e0fb15 Added GridManager class. 2012-02-20 11:34:27 +01:00
Atgeirr Flø Rasmussen
d7d2c3cb2f Add missing newwells.h to distributed files. 2012-02-20 08:59:58 +01:00
Atgeirr Flø Rasmussen
d0d4ba7fce Now using writeVtkData() from the writeVtkData.hpp header. 2012-02-19 21:32:35 +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
b5270c2c5a Added "nl_tolerance" and "nl_maxiter" parameters. 2012-02-17 14:18:03 +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