Atgeirr Flø Rasmussen
b9fc9896d3
Rename function argument and variable.
...
rock_comp -> rock_comp_props
2012-10-12 09:21:52 +02:00
Atgeirr Flø Rasmussen
f5861f0cc8
Added well management to SimulatorPolymer.
...
A polymer-specific overload of computeFractionalFlow()
has been added in support of this.
Also added a minor feature: pressure normalization for
situations with arbitrary absolute pressure.
2012-10-10 23:19:35 +02:00
Atgeirr Flø Rasmussen
280590a012
Bugfix: order of function arguments.
...
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.
Also added an ASSERT that may help catch some misuse.
2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
10ec7db1a1
Merge pull request #4 from xavierr/master
...
Cleaned up Newton single cell solvers.
2012-10-08 06:06:48 -07:00
Xavier Raynaud
9cf746b0b0
Removed TAB spaces.
2012-10-08 15:00:19 +02:00
Atgeirr Flø Rasmussen
2fbdf9bd0a
Fix order of arguments in function call.
...
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
2012-10-08 14:26:46 +02:00
Xavier Raynaud
20d7cf80ea
Reintroduced Newton Simple (in s, c variables).
2012-10-08 13:07:22 +02:00
Xavier Raynaud
ef053a1883
Cleaned up single cell Newton solver.
2012-10-08 10:29:45 +02:00
Atgeirr Flø Rasmussen
ec427e914d
Merge pull request #3 from atgeirr/master
...
Use transport source term properly in compressible sim.
2012-10-04 13:48:05 -07:00
Atgeirr Flø Rasmussen
2f14ed70c4
Modified compressible transport src term.
...
Using surface volume for injection rather than reservoir volume.
Chase change in class TransportModelCompressiblePolymer and
function computeInjectedProduced().
Also changed interface to computeInjectedProduced() to take state
rather than individual state variables.
2012-10-04 22:32:55 +02:00
Atgeirr Flø Rasmussen
f4abfd6cbb
Fix mass balance report for multi-epoch case.
...
Compute initial polymer amount instead of setting it to zero.
Error obvious with multiple epochs.
2012-10-04 20:02:34 +02:00
Atgeirr Flø Rasmussen
b49302f730
Merge pull request #2 from atgeirr/master
...
Handle WPOLYMER keyword
2012-10-04 07:09:06 -07:00
Atgeirr Flø Rasmussen
e13e77a7bb
Simulators handle WPOLYMER keyword.
...
They do this by using the class PolymerInflowFromDeck
instead of PolymerInflowBasic if there is a WPOLYMER
keyword somewhere in the deck epochs. If there is no
WPOLYMER, the parameters 'poly_start_days' etc. will
be used to construct an instance of PolymerInflowBasic
instead.
2012-10-04 16:00:33 +02:00
Atgeirr Flø Rasmussen
f2e7c0bece
Made getInflowValues() a const method.
2012-10-04 15:59:15 +02:00
Atgeirr Flø Rasmussen
0428c4abb4
Moved PolymerInflow* classes to separate file.
...
Also, implemented PolymerInflowFromDeck (but not yet used).
2012-10-04 15:15:32 +02:00
Atgeirr Flø Rasmussen
6033e5ca69
Make polymer inflow specification by cell.
...
Before, it was a single number for the whole domain. It could vary
with time, though.
Simulator behaviour should be identical before and after this commit.
This touches the classes TransportModel*Polymer, Simulator*Polymer,
and the computeInjectedProduced() functions. The PolymerInflow class
and its usage has been replaced with PolymerInflowInterface, and
a subclass PolymerInflowBasic has been created which provides the
old behaviour (using parameters poly_start_days, poly_end_days and
poly_amount).
2012-10-04 13:38:22 +02:00
Atgeirr Flø Rasmussen
f5eb116410
Removed unused program.
...
Use sim_poly2p_incomp_reorder instead. It should have all features of
the older program, and supports scheduling in addition.
2012-10-04 13:36:39 +02:00
Atgeirr Flø Rasmussen
e93c881574
Merge pull request #1 from atgeirr/master
...
Fix mass balance reports and output.
2012-10-04 03:17:50 -07:00
Atgeirr Flø Rasmussen
b32c212e56
Fix mass balance report.
...
Now reports surface volumes for water and oil, instead of useless
(for mass balance) reservoir volumes. Also makes the case with
multiple transport steps more accurate.
2012-10-04 11:25:42 +02:00
Atgeirr Flø Rasmussen
c6b76e715d
Fix for case with incompressible rock.
...
Made rock comp argument optional in computePolymerAdsorbed().
Check inside func for active rock comp.
2012-10-03 16:17:54 +02:00
Atgeirr Flø Rasmussen
dbd4c9e7b5
Reinstate 10% ad-hoc c-interval overestimation.
...
Similar to in TransportModelPolymer.
2012-10-03 16:16:08 +02:00
Atgeirr Flø Rasmussen
25e528df0d
Make output work the same as in other sims.
...
I.e. putting each field in its own directory, adding the
output_vtk parameter etc.
2012-10-03 16:02:27 +02:00
Atgeirr Flø Rasmussen
dc3b0dd6f4
Improve function comment (similar to in SimulatorPolymer).
2012-10-03 16:01:54 +02:00
Atgeirr Flø Rasmussen
753a0c6949
Reinstate 10% ad-hoc c-interval overestimation.
2012-10-03 16:00:51 +02:00
Atgeirr Flø Rasmussen
2990b0a3e8
Improve function comment.
2012-10-03 16:00:13 +02:00
Atgeirr Flø Rasmussen
349c81fb1e
Stop writing ascii output twice.
2012-10-03 15:59:18 +02:00
Atgeirr Flø Rasmussen
678611166d
Improve reporting of volume balance.
...
Should now give more accurate results when taking multiple substeps.
2012-10-03 14:25:20 +02:00
Bård Skaflestad
0134c4bada
Merge remote-tracking branch 'upstream/master'
2012-10-02 20:30:13 +02:00
Bård Skaflestad
e169273b50
Merge remote-tracking branch 'upstream/master'
2012-10-02 19:30:31 +02:00
Atgeirr Flø Rasmussen
7fd95d7333
Fix mass balance reporting.
...
Multiple issues:
- now reporting surface volumes, not reservoir volumes,
- fixed reporting for the case of multiple transport steps.
2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
e9b2fc0ac9
Fix volume reporting with multiple transport substeps.
2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
69f8d98f8f
Increase output precision for ascii dumps.
2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
bcc03ef41d
Change interface for (blackoil) computeInjectedProduced().
...
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
2012-10-02 11:12:23 +02:00
Bård Skaflestad
b314f4ed3a
Merge remote-tracking branch 'upstream/master'
2012-09-19 15:32:43 +02:00
Atgeirr Flø Rasmussen
076164d3f3
Add "output_vtk" parameter, split output function in two.
...
Vtk and Matlab output now happens in two different functions.
2012-09-17 07:54:50 +02:00
Atgeirr Flø Rasmussen
d74f0a9c52
Add output of surface volume.
2012-09-14 09:51:28 +02:00
Roland Kaufmann
3d883a5aed
Convert ignore file from Mercurial to Git
2012-09-12 12:55:12 +02:00
Roland Kaufmann
205a2e3351
Remove superfluous tags file
2012-09-12 12:55:03 +02:00
Xavier Raynaud
4db4d715de
Last saturation is stored in a mutable variable.
2012-09-10 11:03:59 +02:00
Halvor M. Nilsen
594eca3633
Added lines which is need to compile with PROFILING. Did not check if code brakes.
2012-09-08 11:11:23 +02:00
Bård Skaflestad
0c092be788
Merge remote-tracking branch 'upstream/master'
2012-09-05 19:48:21 +02:00
Xavier Raynaud
55486d3c03
Fixed source term (measured at reservoir condition).
2012-09-05 13:38:30 +02:00
Xavier Raynaud
7f1a1d7e24
Merge remote-tracking branch 'upstream/master'
2012-09-05 13:35:48 +02:00
Xavier Raynaud
938fc0f0d4
Fixed comment line.
2012-09-05 12:34:17 +02:00
Bård Skaflestad
8b209c088f
Merge remote-tracking branch 'upstream/master'
2012-09-05 11:46:54 +02:00
Xavier Raynaud
7721defbd3
Fixed/Added documentation comments.
2012-09-05 11:45:54 +02:00
Xavier Raynaud
5f27612b05
Merged from upstream.
2012-09-05 11:11:06 +02:00
Xavier Raynaud
7fb671ffbf
Changed computation of polymer production. Added functionalities for compressible case.
2012-09-05 11:09:45 +02:00
Bård Skaflestad
36e017d48d
Honour initialisation order requirement.
...
Introduced in change-set 85cde6f721a4.
2012-09-05 10:27:37 +02:00
Xavier Raynaud
38bcaeb362
Changed solvegravity interface. Fixed bug.
2012-09-05 10:10:02 +02:00