OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,128 Commits 9 Branches 35 Tags 15 MiB
master
Commit Graph

416 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
82079418db Changed tot_porevol -> tot_porevol_init. Initialise rock_comp object. 2012-03-20 10:33:37 +01:00
Atgeirr Flø Rasmussen
a103933e2b Fixed bugs and changed interface for Gauss-Seidel segregation solver. 2012-03-16 13:41:10 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6 Added experimental Gauss-Seidel segregation solver. Not yet functioning. 2012-03-16 08:33:00 +01:00
Atgeirr Flø Rasmussen
fc3357e98a Production must be computed with the correct saturation. 
The bug was the following: the reordering transport solvers accounts for
sources and sinks, and modifies saturation accordingly. This saturation is
the one we must use for computing sink outflow (= fracflow(s)*outflux).
If we wait until after segregation, saturation is changed, and we
compute fracflow(s')*outflux instead.
 2012-03-15 14:15:57 +01:00
Atgeirr Flø Rasmussen
eccf52af0c Minor comment changed. 2012-03-14 12:51:51 +01:00
Atgeirr Flø Rasmussen
06d72587cc Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
86284d06c1 Reformatting only. 2012-03-14 11:16:48 +01:00
Atgeirr Flø Rasmussen
de1c0e8874 Untabify. 2012-03-14 10:40:41 +01:00
Atgeirr Flø Rasmussen
b56c397fa2 Use wellsToSrc() from utility, minor reordering of #includes. 2012-03-14 09:52:05 +01:00
Atgeirr Flø Rasmussen
df3592473a Minor additions to output, comments. 2012-03-14 09:38:43 +01:00
Bård Skaflestad
ba3cf61c2e Adjust white-space for previous commit. 
No functional change.
 2012-03-14 00:03:17 +01:00
Bård Skaflestad
1130baf6d7 Staticise several functions to suppress warnings about missing prior declarations. 2012-03-14 00:01:45 +01:00
Atgeirr Flø Rasmussen
f72bac2432 Printing volume balance report, although somewhat messy. Writing watercut curve to file. 2012-03-13 15:58:09 +01:00
Atgeirr Flø Rasmussen
c8f542fc3f Added water-oil contact init (scenario 4), controllable from param or deck. 2012-03-13 11:41:11 +01:00
Atgeirr Flø Rasmussen
bf142b7eda Added warning for segregation scenario. 2012-03-12 17:29:42 +01:00
Atgeirr Flø Rasmussen
e2f00b66a4 Now using SimulatorTimer class (therefore supporting TSTEP). 2012-03-12 16:20:13 +01:00
Atgeirr Flø Rasmussen
f5ad161409 Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
9c226c1b24 Simple well handling done (only simple rates -> src terms). 2012-03-09 15:51:17 +01:00
Atgeirr Flø Rasmussen
bac0b16c77 Initialising wells (unused for the moment). 2012-03-09 14:39:31 +01:00
Atgeirr Flø Rasmussen
33fbc02490 Fixed s_min/s_max bug in ad hoc fluid, improved saturation init, print average sat. 2012-03-09 11:47:32 +01:00
Atgeirr Flø Rasmussen
f919da439b Improved saturation initialization, new parameter 'init_sat'. 2012-03-08 15:54:24 +01:00
Atgeirr Flø Rasmussen
be892f5059 Follow change to IncompTpfa (adding BCs). 2012-03-07 09:33:28 +01:00
Atgeirr Flø Rasmussen
e33c204832 Pass tol and maxit to column solver, clean up a scenario message and reindent. 2012-03-06 22:33:19 +01:00
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Atgeirr Flø Rasmussen
e5802e0532 Added optional column segregation solver (parameter "use_column_solver"). 2012-03-02 13:55:54 +01:00
Atgeirr Flø Rasmussen
c2a18bc7ca Added parameter "use_segregation_split", implemented using ImplicitTransport. 2012-03-01 10:32:58 +01:00
Bård Skaflestad
8a2aff536f Start solver messages on new line following "Scenario" output. 2012-02-28 09:42:21 +01:00
Bård Skaflestad
9c00ad8fe9 Support non-integral Cartesian cell sizes. 2012-02-27 23:43:58 +01:00
Bård Skaflestad
3ea1a823c8 Inspect global Cartesian cell when determining scenario 2 "left" reservoir half. 
Assume that c_grid()->global_cell==0 signifies identity mapping (i.e.,
global_cell[cell]==cell).
 2012-02-27 20:04:16 +01:00
Bård Skaflestad
84aad52d81 Fix logic error in defining "left" reservoir half in scenario 2. 
Specifically, we must map into 0..cd[0]-1 and not some other
interval.  Moreover, as the "i" index cycles the most rapidly in
lexicographical ordering, a simple first dimension modulus operator is
sufficient.

On the other hand, this code does assume lexicographical ordering of
the cells which may or may not be guaranteed by the grid constructor.
The Cartesian constructors observe this behaviour, but other
constructors may not...
 2012-02-27 19:59:01 +01:00
Bård Skaflestad
363c6564d9 Fully initialise the transport model gravity contributions when using gravity. 
This initialisation used to be a part of the model construction, but
was refactored out in change-set 86c734a0ba48 and must thus be called
separately.
 2012-02-27 17:34:57 +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
0e1107f195 Output estimated cell velocities. 2012-02-25 22:29:35 +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
8d74253c64 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +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
03c995e4c0 Added parameters "dx", "dy", "dz" controlling cell size in the cartesian case. 2012-02-20 17:06:13 +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
18d2b226de Using GridManager class instead of ad-hoc grid class. 2012-02-20 11:34:51 +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
b5270c2c5a Added "nl_tolerance" and "nl_maxiter" parameters. 2012-02-17 14:18:03 +01:00
Atgeirr Flø Rasmussen
f7b4762472 Added gravity (no segregation). Added "scenario" parameter. 2012-02-15 22:43:56 +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
2061e7fcd8 Added timers. 2012-02-09 23:15:14 +01:00
Atgeirr Flø Rasmussen
660a45440d Using new reorderTransportTwophase() function. 2012-02-09 16:09:24 +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
a3eb09032b Catch up with unified grid construction/destruction, simplifying grid management. 2012-02-01 15:58:32 +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
02a94c1f79 Work in progress on reading all props and grid from deck. No output yet. 2012-01-31 09:44:52 +01:00
Atgeirr Flø Rasmussen
4470ac6cb5 Now the non-reorder transport solver also uses new fluid props. 2012-01-27 11:43:14 +01:00
Atgeirr Flø Rasmussen
a120cdc80f Moved typedefs, refined output. 2012-01-27 09:19:59 +01:00
Bård Skaflestad
1b7a2fa9ac Add appropriate Boost libraries needed in specific executables. 2012-01-26 21:34:16 +01:00
Atgeirr Flø Rasmussen
63942cbd1d Now reorder code requires new property object, not using it yet (work in progress). 2012-01-24 16:17:05 +01:00
Atgeirr Flø Rasmussen
a3662637c1 Always warn about unused parameters, even if no solution output requested. 2012-01-24 16:00:16 +01:00
Atgeirr Flø Rasmussen
148c5a27d3 Added "output_dir" param, unused parameter warning and output of parameters used. 2012-01-24 15:22:51 +01:00
Atgeirr Flø Rasmussen
3424e0211b C++ified reordering transport solver facade. 2012-01-24 13:47:00 +01:00
Atgeirr Flø Rasmussen
9e0a018103 Modify example viscosity to match (temporarily) hardcoded reorder fluid. 2012-01-24 13:20:41 +01:00
Atgeirr Flø Rasmussen
b0ab8d093a Default stepsize now 1 day. 2012-01-24 10:07:10 +01:00
Atgeirr Flø Rasmussen
9faafdbf73 Correct mistake in transport source initialization. 2012-01-24 09:58:24 +01:00
Atgeirr Flø Rasmussen
e797a81108 Gave new, more-or-less reasonable default rates and timesteps. 2012-01-24 09:52:15 +01:00
Atgeirr Flø Rasmussen
98ab0cabfd Replaced Rock class with IncompPropertiesBasic, preserving behaviour. 2012-01-23 13:47:00 +01:00
Atgeirr Flø Rasmussen
ffcb9e0748 Reorganized and commented initialization section to prepare for change. 2012-01-23 13:06:25 +01:00
Atgeirr Flø Rasmussen
38cbdf5121 Re-introduced reorder functionality. 2012-01-23 12:43:37 +01:00
Atgeirr Flø Rasmussen
80ec53241f Merged. 2012-01-23 12:41:06 +01:00
Bård Skaflestad
0a8df0e33d Back out reorder option. We're not ready to begin using this. 2012-01-23 00:57:13 +01:00
Bård Skaflestad
a07f5b3eee Suppress warnings about missing previous function declarations. 2012-01-23 00:32:59 +01:00
Atgeirr Flø Rasmussen
efcd191ea1 Added "output" parameter for turning file output on/off. 2012-01-20 15:51:29 +01:00
Atgeirr Flø Rasmussen
da0bcc13a4 Added "use_reorder" parameter and implemented the option. 2012-01-20 15:36:52 +01:00
Atgeirr Flø Rasmussen
30d70fd0f8 Fix compilation error due to change in twophasetransport() prototype. 2012-01-20 14:07:56 +01:00
Atgeirr Flø Rasmussen
54a9d038c9 New parameters "guess_old_solution", "verbosity", "max_it" and "max_it_ls". 2012-01-19 23:51:09 +01:00
Atgeirr Flø Rasmussen
b2ce765133 Now writes output in vtk format. 2012-01-19 16:48:27 +01:00
Atgeirr Flø Rasmussen
df31c95197 Moved output of report struct into dedicated operator<<(). 2012-01-19 14:24:39 +01:00
Atgeirr Flø Rasmussen
2f5bba3835 Now a primitive simulator. 2012-01-19 14:12:53 +01:00
Atgeirr Flø Rasmussen
de59283a19 Now spu_2p is a (very) simple simulator, work in progress. 2012-01-19 13:58:25 +01:00
Atgeirr Flø Rasmussen
46b76fb04d Backed out changeset d0cd4424dd9a 2012-01-19 13:56:55 +01:00
Atgeirr Flø Rasmussen
80f9164948 Merge. 2012-01-19 13:55:11 +01:00
Bård Skaflestad
6346dcd93c Quash a number of buglets. 
Specifically, tighten the array sizes and offsets.

While here, remove pressure output to 'stderr'.
 2012-01-17 16:09:02 +01:00
Bård Skaflestad
77518c012b Don't modify external source terms in qfs(). 
While here, make compilable as strict C90 code.
 2012-01-17 15:00:47 +01:00
Jostein R. Natvig
5d058ca8da Add demonstration for bare-bones reordering implementation. 2012-01-17 14:41:00 +01:00
Atgeirr Flø Rasmussen
9729768794 Now the libtool library will reference its dependencies. 2011-12-23 12:49:06 +01:00
Bård Skaflestad
6eb6054290 Make $(LIBS) and $(FLIBS) the final libraries on link line. 2011-12-19 18:31:57 +01:00
Halvor M. Nilsen
81d804ca31 Fixed makefiles. 2011-12-19 17:18:57 +01:00
Atgeirr Flø Rasmussen
23a61cb167 Changed code to use new include path: <opm/core/...> 2011-12-12 11:28:09 +01:00
Atgeirr Flø Rasmussen
14dad62014 Moved umfpack-dependent programs into conditional block. 2011-12-12 10:30:40 +01:00
Atgeirr Flø Rasmussen
0e84c3de31 Replaces std::array with std::tr1::array for improved compatibility (not requiring c++11). 2011-12-12 10:29:40 +01:00
Bård Skaflestad
70104f5aa8 Staticise 'compute_porevolume()' to avoid warning about missing prior declaration. 2011-12-08 16:41:27 +01:00
Bård Skaflestad
7bda6e5d53 Conform to C90 standard (don't mix declaration and code). 2011-12-08 16:40:43 +01:00
Bård Skaflestad
74b8fe759a Reference headers using canonical (installed) paths. 2011-12-08 16:18:33 +01:00
Bård Skaflestad
953507907e Update include paths and link to OPM core library. 2011-12-08 16:17:13 +01:00
Bård Skaflestad
e4fa3dbc4f Catch up to changing location of 'scaneclipsedeck' example. 
While here, remove MEX related grid processing from core library.
 2011-12-08 15:08:04 +01:00
Bård Skaflestad
5248a6f51f Move 'scaneclipsedeck' to example programs. 2011-12-08 15:06:23 +01:00
Bård Skaflestad
66b82865d4 Complete cset ad3d926031e7. 2011-12-08 14:49:09 +01:00
Bård Skaflestad
16780b8312 Remove remnants of previous Autotools build system. 2011-12-08 13:58:10 +01:00
Bård Skaflestad
ec3586697f Incorporate OPMTransport into OPM core library directory structure. 2011-12-08 13:48:16 +01:00
Bård Skaflestad
e66dc789f3 Merge from upstream. 2011-12-05 19:30:30 +01:00
Bård Skaflestad
95ebbb3899 changeset: 451:4120bd6d7e8f 
tag: tip
user: Andreas Lauser <andreas.lauser@iws.uni-stuttgart.de>
date: Mon Dec 05 19:07:44 2011 +0100
summary: fix compile
 2011-12-05 19:22:20 +01:00
Bård Skaflestad
ca041be109 Parametrise vector assignment to support line search on ::std::vector<>'s. 
Implement the (_AXPY-like) interface for containers (base-vectors)
that support a begin()/end() iterator pair (e.g., ::std::vector<>).
Finally, update examples accordingly.

This restores independent build of OPMTransport (when used outside Dune).
 2011-11-25 19:17:17 +01:00
Bård Skaflestad
420b14af05 Properly initialise the cell_facepos. 2011-10-24 10:01:13 +02:00
Bård Skaflestad
6442d3fda2 Don't reference (non-existent) Dune directories. Remove disabled code. 2011-10-13 19:38:33 +02:00
Halvor M. Nilsen
7ac7bdfbac moved dune definishins for dune to porsol/common 2011-10-13 13:52:38 +02:00
Halvor M. Nilsen
0a1fc38fd0 checking after changing back to grid interface euler in traits and adding boundary conditions for fixed, the code finialy does something 2011-10-13 10:26:51 +02:00
Halvor M. Nilsen
27cecaabef changes the code compile: runs: and give wrong results 2011-10-12 16:10:51 +02:00
Halvor M. Nilsen
f5fa61eb13 definitions to use opmtransport in dune-upscaling 2011-10-11 14:55:11 +02:00
Halvor M. Nilsen
ee62a57dc7 added EulerUpstreamImplicit, added implicit traits: does notthing now 2011-10-11 11:42:40 +02:00
Bård Skaflestad
ee43437183 Increase problem size, and report solver meta data upon completion. 2011-10-06 17:25:13 +02:00
Bård Skaflestad
da683da206 Add a simple saturation dump using vector_write() from OPMPressure. 2011-10-06 15:12:43 +02:00
Bård Skaflestad
c56215bdcd Use control parameters that don't lead to singular matrices. 2011-10-06 15:07:00 +02:00
Bård Skaflestad
b0e35ca07a Honour ImplicitTransport requirement introduced in cset af1c979d2947. 
We need to define a coefficient matrix clearing operator.
 2011-10-06 15:02:15 +02:00
Bård Skaflestad
72953ac126 Add an example program demonstrating the use of the ImplicitTransport solver. 
Building contingent upon availability of both OPMPressure *and* UMFPACK.
 2011-10-05 20:06:03 +02:00
Bård Skaflestad
b1f35c50b1 Add a POD representation of transport problem source terms. 2011-10-05 20:04:21 +02:00
Bård Skaflestad
8fa1eecce6 Import Jostein R. Natvig's implementation of a Cartesian grid. 2011-10-05 20:03:43 +02:00
Bård Skaflestad
f1c44286cc Import glue code for calling into UMFPACK using an OPMPressure CSRMatrix. 2011-10-05 20:03:07 +02:00