Commit Graph

89 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
d83ab5856d Fix: forgotten multiply by cell volume in a quadrature. 2012-09-27 09:49:36 +02:00
Atgeirr Flø Rasmussen
04a76988d9 Add sink term contribution. 2012-09-26 15:15:04 +02:00
Atgeirr Flø Rasmussen
93094ebeec Fix argument order in call. 2012-09-26 14:21:00 +02:00
Atgeirr Flø Rasmussen
99a12a7edc Initial version of DG(1) for tof implemented.
Basis functions, quadratures and velocity interpolation are basic versions,
not handling any higher than DG(1) for now. These are currently in helper
classes and functions. The code in the main solver class is written with
the aim of supporting DG(n) generally.
2012-09-26 13:30:54 +02:00
Atgeirr Flø Rasmussen
1a227dbf86 Added skeleton of general order DG tof solver. 2012-09-26 08:58:03 +02:00
Atgeirr Flø Rasmussen
b9a2c14113 Add proper support for source terms.
This fixes the problem with infinite tofs at sinks.
2012-09-25 14:00:17 +02:00
Atgeirr Flø Rasmussen
026863c95d Merge branch 'master' into reorder_tof 2012-09-05 14:21:47 +02:00
Xavier Raynaud
680276debf Fixed documentation. 2012-09-05 14:07:51 +02:00
Xavier Raynaud
1d98e043a5 Fixed source term (measured at reservoir conditions). 2012-09-05 13:34:25 +02:00
Atgeirr Flø Rasmussen
fa2fc1e914 Merge branch 'master' into reorder_tof 2012-09-05 12:32:38 +02:00
Xavier Raynaud
3d01a60099 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
8c68fd0373 Add initial guess in root solver for gravity residual. 2012-09-04 15:13:55 +02:00
Xavier Raynaud
55793cc909 Use same search interval in computation of flux and gravity residuals. 2012-09-04 15:01:14 +02:00
Xavier Raynaud
ff78e358f0 Removed unappropriate conversion from water saturation to complete saturation. 2012-09-04 14:22:56 +02:00
Xavier Raynaud
876d23942c Use porevolume of last step in computation of gravity residual. 2012-09-04 14:21:51 +02:00
Xavier Raynaud
9aa349b1e5 Corrected comment. 2012-08-28 13:12:54 +02:00
Atgeirr Flø Rasmussen
214546ece9 Merge branch 'master' into reorder_tof 2012-08-27 17:02:50 +02:00
Atgeirr Flø Rasmussen
931dcc4a3d Implemented rudimentary solveMultiCell().
Simply calls solveSingleCell() once for each cell in block.
2012-08-27 11:26:51 +02:00
Atgeirr Flø Rasmussen
0a8ac1ddb5 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
3e9cc74922 Initial commit of tof computation by reordering. 2012-08-24 16:08:26 +02:00
Atgeirr Flø Rasmussen
46fb488410 Minor code cleanup in TransportModelTwophase. 2012-08-24 13:31:23 +02:00
Atgeirr Flø Rasmussen
3dfb2eb29b Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
a26c6779c6 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Atgeirr Flø Rasmussen
caff665c10 Fixed solveGravity(): now properly modifies surfacevolume.
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
96327164cc Added computeSurfacevol() method.
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
2012-08-23 08:57:48 +02:00
Atgeirr Flø Rasmussen
010715ad03 Document and check (primitive) for non-miscibility requirement. 2012-08-22 12:31:59 +02:00
Xavier Raynaud
9ed0923279 Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Halvor Møll Nilsen
5743225be2 added writing of reorder iterations for each cell 2012-08-21 15:23:46 +02:00
Xavier Raynaud
b470ab8d50 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Atgeirr Flø Rasmussen
ded1424cc9 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
f90f313af6 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Atgeirr Flø Rasmussen
6ab7487218 Whitespace cleanup. 2012-07-19 15:34:42 +02:00
Atgeirr Flø Rasmussen
eb7d46accf Transport solver partially complete (segregation solver remains). 2012-07-19 14:02:26 +02:00
Atgeirr Flø Rasmussen
cc7250628e Improved documentation. 2012-06-09 18:11:02 +02:00
Atgeirr Flø Rasmussen
61995b97be Changed interface of solve() and solveGravity() to accept full saturation (both phases) input. 2012-06-09 14:56:29 +02:00
Atgeirr Flø Rasmussen
d1a4fa6dcd Made many methods private, and added some documentation. 2012-05-30 15:10:59 +02:00
Atgeirr Flø Rasmussen
30324f84e6 Made the virtual methods private. 2012-05-30 15:10:38 +02:00
Atgeirr Flø Rasmussen
299ea28afe Reordering 2p transport solver now takes full saturation (all phases) as input. 2012-05-30 14:39:09 +02:00
Atgeirr Flø Rasmussen
ad2dff642b Initial version of compressible transport. Work in progress. 2012-05-28 09:12:09 +02:00
Atgeirr Flø Rasmussen
5c15895e74 Implemented more error policies for regula falsi solver. Use in reorder code.
We have switched to WarnAndContinueOnError instead of ThrowOnError,
to reduce the annoyance factor when suffering from a minor error in
a long simulation run.
2012-05-24 10:21:38 +02:00
Atgeirr Flø Rasmussen
733129a1a9 Policy-based design enables custom error handling in scalar regula falsi. 2012-05-24 10:02:14 +02:00
Bård Skaflestad
36d21ec747 Fix spelling: Furhtermore -> Furthermore. 2012-05-21 20:04:04 +02:00
Bård Skaflestad
e53ec76d78 Re-adjust comment white-space. 2012-05-21 20:01:55 +02:00
Bård Skaflestad
fa2d0904b5 Enforce singular agreement. 2012-05-21 20:00:08 +02:00
Bård Skaflestad
71a3ac9e17 Fix misprint concerning the valid components.
These are 0..*ncompoents-1, not 0..*ncomponents inclusive.
2012-05-21 19:58:02 +02:00
Bård Skaflestad
5b9ff02633 Mention that the flux parameter is assumed to include the boundary. 2012-05-21 19:56:46 +02:00
Bård Skaflestad
c99a9a798a Add doxygen documentation of compute_sequence*(). 2012-05-21 19:20:32 +02:00
Bård Skaflestad
7c7c4f1b31 Assert that the number of strongly connected components is in [1 .. nc]. 2012-05-21 18:53:08 +02:00
Bård Skaflestad
1eeafa1918 White-space adjustments. Mostly splitting long lines in declarations. 2012-05-21 16:37:06 +02:00
Bård Skaflestad
874e6f6bce M-x whitespace-cleanup 2012-05-21 15:27:32 +02:00