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
Xavier Raynaud
8e089dd80d
Use porevolume instead of porosity, as argument for the transport solver.
2012-09-05 09:11:05 +02:00
Xavier Raynaud
fa84128ddc
Fixed bug.
2012-09-05 09:07:47 +02:00
Atgeirr Flø Rasmussen
a6d3e2eef4
Merge branch 'master' into nonuniform_fluid_tables
...
Conflicts:
Makefile.am
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
opm/core/fluid/SaturationPropsFromDeck.cpp
opm/core/fluid/SaturationPropsFromDeck.hpp
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
opm/core/fluid/blackoil/SinglePvtDead.cpp
This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).
Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
2012-09-04 11:42:31 +02:00
Xavier Raynaud
845c100dcd
Fixed order of arguments in function call.
2012-09-04 11:39:17 +02:00
Xavier Raynaud
612a1ffc63
Fixed bug.
2012-09-03 16:46:02 +02:00
Xavier Raynaud
27dea09311
Added initializations in constructor.
2012-09-03 16:45:50 +02:00
Xavier Raynaud
76e517516f
Added missing initialization of gravity in constructor.
2012-09-03 14:55:19 +02:00
Xavier Raynaud
8752f14015
Added executable example for compressible with polymer.
2012-09-03 13:52:59 +02:00
Xavier Raynaud
e1a5c1dc94
Removed redundant header file include.
2012-09-03 12:55:10 +02:00
Xavier Raynaud
8bf900f1bf
Update surface volume in transport solver.
2012-09-03 12:52:25 +02:00
Xavier Raynaud
708c56bb94
Simplified computation of adsorbed mass of polymer.
2012-09-03 12:49:04 +02:00
Xavier Raynaud
a335e1b149
Added Simulator for compressible polymer. Not tested.
2012-08-31 10:38:50 +02:00
Xavier Raynaud
8b40a4a68f
Fixed comments.
2012-08-30 15:58:14 +02:00
Xavier Raynaud
99fe7bf46e
Fixed preprocessor flag names in some header files.
2012-08-30 15:31:28 +02:00
Xavier Raynaud
92def1d514
Cleaned up ownership (private vs public) in class definition.
2012-08-30 09:09:23 +02:00
Xavier Raynaud
eb52ee58c1
Added gravity transport solver functionality. Not tested.
2012-08-29 13:49:02 +02:00
Xavier Raynaud
becf485795
Changes to avoid compilator warning.
2012-08-29 13:48:19 +02:00