Atgeirr Flø Rasmussen
765ce23c3e
Work in progress on well flux equations.
2013-06-02 08:58:30 +02:00
Atgeirr Flø Rasmussen
74a5e10f7b
Renames variables dtpv->pvdt and Rs->rs.
2013-06-02 08:19:21 +02:00
Atgeirr Flø Rasmussen
adf291a30c
Work in progress on well flux equations.
2013-06-02 08:17:13 +02:00
Bård Skaflestad
2606d94935
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
2013-05-31 16:07:12 +02:00
Bård Skaflestad
7a44eb8254
Remove blank lines at EOF
2013-05-31 16:07:03 +02:00
Atgeirr Flø Rasmussen
9a3bad000a
Do not evaluate properties at well perforation pressures.
...
Always use quantities derived from cell properties.
2013-05-31 16:03:00 +02:00
Atgeirr Flø Rasmussen
adbbebeeea
Properly compute well pressure differentials.
...
Properly here means using a simple algorithm like
in CompressibleTpfa and ImpesTPFAAD.
2013-05-31 15:02:03 +02:00
Atgeirr Flø Rasmussen
514c48aa31
Use DUMP macro in useful places.
2013-05-31 15:01:28 +02:00
Atgeirr Flø Rasmussen
d49be41cae
Corrected fluidDensity() function to account for dissolved gas.
2013-05-31 14:59:56 +02:00
Atgeirr Flø Rasmussen
59e36f72b3
Add DUMP macro for debugging.
2013-05-31 14:59:24 +02:00
Atgeirr Flø Rasmussen
526b4d26e3
Actually initialize densities_ member.
2013-05-31 14:57:04 +02:00
Bård Skaflestad
bac1a3a364
Add a couple of debugging aids to assist in FIBO development.
2013-05-30 18:43:11 +02:00
Bård Skaflestad
d23a1c3066
Coalesce two adjacent '!NDEBUG' sections into one.
2013-05-30 17:56:49 +02:00
Atgeirr Flø Rasmussen
932660a18c
New updateState() method, changes to fluid interfaces.
...
- updateState() is a new method that modifies the state object after solution,
this was formerly done in solveJacobianSystem().
- Implemented Appleyard chop (not verified yet) for handling variable switching.
- Added rs as input to fluid interfaces to include rs-derivatives.
2013-05-30 14:43:32 +02:00
Atgeirr Flø Rasmussen
62d0ad85b8
Use BlackoilPropsAdFromDeck in fully implicit simulator.
2013-05-27 22:28:17 +02:00
Atgeirr Flø Rasmussen
e3f39504f4
Fixed error in include guard macros.
...
Header file started life as a copy of another header, but include
guard macro was not changed. Time to go for #pragma once?
2013-05-27 22:26:52 +02:00
Atgeirr Flø Rasmussen
f26207d430
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 22:01:20 +02:00
Atgeirr Flø Rasmussen
6f6979e173
Now initialize with new code (for gas-oil ratio).
2013-05-27 22:00:34 +02:00
Atgeirr Flø Rasmussen
a6dba405dd
Merge remote-tracking branch 'totto82/newfluid' into fully-implicit
2013-05-27 15:46:22 +02:00
Tor Harald Sandve
1cf1e3383b
Add new interface to BlackoilPropsAdFromDeck
...
-- not finished --
2013-05-27 14:55:32 +02:00
Atgeirr Flø Rasmussen
2c206e0cd4
Finished initial attempt at miscibility support.
...
Not yet tested. Also, no way to initialize gas-oil ratio yet.
2013-05-27 11:32:35 +02:00
Atgeirr Flø Rasmussen
cbb7b07496
Added method fluidRsMax(), added rs as a primary variable.
...
Also increased amount of whitespace between methods for readability.
2013-05-27 10:29:04 +02:00
Atgeirr Flø Rasmussen
5f4167d800
New interface methods rsMax() in BlackoilPropsAdInterface.
...
Notes:
- Interface was already present, just disabled.
- Class BlackoilPropsAd cannot properly implement rsMax() with derivatives,
and implements only a throw statement.
2013-05-27 10:26:41 +02:00
Atgeirr Flø Rasmussen
78fa581417
Fix some bugs: referring to the wrong phase in two places.
2013-05-27 00:24:38 +02:00
Atgeirr Flø Rasmussen
09c4362e3c
Added solveJacobianSystem() method, finished step().
...
Code is now functionally complete apart from lacking miscibility,
not writing to all promised output variables and not writing the
promised output to disk. Initial testing has been unsuccessful,
so there are bugs in the code.
2013-05-26 11:49:44 +02:00
Atgeirr Flø Rasmussen
1d4af250ac
Add well contributions to mass balance residuals.
2013-05-26 09:52:58 +02:00
Atgeirr Flø Rasmussen
8a740eeab4
Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit
2013-05-25 10:50:00 +02:00
Atgeirr Flø Rasmussen
b88dfd6af2
Added assembly of well equations.
...
This has not been tested.
Well contributions to mass balance equations are not done yet.
2013-05-25 10:47:22 +02:00
Atgeirr Flø Rasmussen
2ebd58fad2
Added bhp as a primary variable.
...
Changed interface of constantState() and variableState() to also
take a WellState as input. Some comments added with minor layout
changes.
2013-05-24 23:20:15 +02:00
Atgeirr Flø Rasmussen
dfbf8dd80e
Commented the assemble() function.
2013-05-24 22:30:54 +02:00
Atgeirr Flø Rasmussen
9894fdc2d4
Renamed residual_.reservoir -> residual_.mass_balance.
...
Also initialize in initializer list, eliminating the need for
the allocateResidual() method.
2013-05-24 22:16:06 +02:00
Bård Skaflestad
7432ca215f
Include <cassert> for assert() macro.
2013-05-24 22:04:58 +02:00
Bård Skaflestad
2b57104097
Prefer BOOST_CHECK_EQUAL to BOOST_CHECK
...
The former is more assertive than the latter and provides better
diagnostics. Incidentally, switching to *_EQUAL() also fixes an
assignment that was (probably) intended to be an equality test:
BOOST_CHECK(count = num)
in both test cases.
2013-05-24 21:59:09 +02:00
Bård Skaflestad
eee8c27346
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
2013-05-24 21:49:27 +02:00
Atgeirr Flø Rasmussen
a3be33a312
Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit
2013-05-24 21:46:11 +02:00
Atgeirr Flø Rasmussen
dc83ecb18e
Merge remote-tracking branch 'bska/fully-implicit' into fully-implicit
2013-05-24 21:11:41 +02:00
Bård Skaflestad
26e965e858
Add an operator<< for outputting vector results.
...
Use it out print reservoir and well pressures at end of solution.
2013-05-24 19:15:14 +02:00
Bård Skaflestad
2dffbb3a70
Add gather/scatter support for wells
2013-05-24 17:22:35 +02:00
Atgeirr Flø Rasmussen
937df8869b
Added unit test for Span class.
2013-05-24 16:07:51 +02:00
Atgeirr Flø Rasmussen
cd42d4af34
Added missing dereference operator.
2013-05-24 16:07:27 +02:00
Bård Skaflestad
747badaea8
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
2013-05-24 15:56:23 +02:00
Atgeirr Flø Rasmussen
fa02639dbf
Use Span.
2013-05-24 15:38:31 +02:00
Atgeirr Flø Rasmussen
535a1fd272
Added Span.
2013-05-24 15:38:19 +02:00
Bård Skaflestad
c5ad446a0a
Include well support in FIBOSolver interface.
...
Update callers accordingly.
2013-05-24 15:27:19 +02:00
Bård Skaflestad
18b80f49e5
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
2013-05-24 14:50:46 +02:00
Atgeirr Flø Rasmussen
c569fb2a14
Created fully implicit simulator sim_fibo_ad.
2013-05-24 12:32:28 +02:00
Bård Skaflestad
520a6a0a11
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
2013-05-24 12:24:42 +02:00
Atgeirr Flø Rasmussen
a94f1921dd
Added simulator class for fully implicit blackoil.
2013-05-24 11:40:58 +02:00
Bård Skaflestad
3a31a1a61f
Implement residualNorm() for reservoir part.
...
This is a prerequisite to having a working Newton loop.
This is a forward-port of commit 604f866
2013-05-24 11:38:17 +02:00
Bård Skaflestad
cf1885fb04
Merge remote-tracking branch 'atgeirr/fully-implicit' into fully-implicit
...
Conflicts:
opm/autodiff/ImplicitBOStep.hpp
2013-05-24 11:34:10 +02:00
