Commit Graph

341 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
04abba4d5e Adapt to changed opm-core header name. 2013-03-15 17:55:24 +01:00
Atgeirr Flø Rasmussen
864cce5f5e Adapt to moved opm-core headers. 2013-03-14 13:59:31 +01:00
Atgeirr Flø Rasmussen
e6de9b5352 Merge pull request #13 from atgeirr/make-io-subdir
Adapt to changed include paths for some opm-core headers.
2013-03-13 05:46:17 -07:00
Atgeirr Flø Rasmussen
23cef788fc Adapt to changed include paths for some opm-core headers. 2013-03-12 11:08:33 +01:00
Atgeirr Flø Rasmussen
6c00d98a9e Merge pull request #12 from rolk/012_cmakeupd
Update CMake scripts to commit f6d44238 from opm-core
2013-03-12 03:01:24 -07:00
Atgeirr Flø Rasmussen
97857b6b2b Merge pull request #11 from rolk/011_cmakeupd
Update CMake scripts to commit e75d69ef from opm-core
2013-03-06 02:22:32 -08:00
Roland Kaufmann
7e3a81f1a6 Remove make execution wrapper 2013-03-06 11:01:17 +01:00
Roland Kaufmann
f5e19e9b87 Remove remnants of the Autotools build system 2013-02-22 23:34:21 +01:00
Roland Kaufmann
4e34a967cb Ignore output from CMake build 2013-02-22 23:34:21 +01:00
Roland Kaufmann
7925901380 Import cmake/ from commit 5f82198c in opm-core 2013-02-22 23:31:13 +01:00
Atgeirr Flø Rasmussen
661357d403 Merge pull request #6 from atgeirr/master
Improved output facilities
2013-01-17 05:50:36 -08:00
Atgeirr Flø Rasmussen
b4d5e03c61 Add eclipse output to simulator.
Note: so far only for incompressible fluid simulator.
2012-11-26 11:01:23 +01:00
Atgeirr Flø Rasmussen
b6b59918e1 Suppress output of multi-cell-block sizes and #iterations. 2012-11-26 11:00:20 +01:00
Atgeirr Flø Rasmussen
2f521169c5 Add ert-detecting macro for building with ert support.
This is primarily intended for enabling eclipse-format output from simulators.
Also add missing header to Makefile.am, to fix 'make distcheck'.
2012-11-26 10:58:18 +01:00
Atgeirr Flø Rasmussen
bcfcfdc930 Use minimum 5 digits for step numbers in output file names.
Was 3 digits, created trouble for certain scripts reading
the files when more than 1000 steps were taken.
2012-11-05 15:37:14 +01:00
Atgeirr Flø Rasmussen
be617bbe7b Merge pull request #5 from atgeirr/master
Add well management to polymer simulators.
2012-10-15 05:28:25 -07:00
Atgeirr Flø Rasmussen
2b292108ad Added well management to SimulatorCompressiblePolymer.
Another polymer-specific overload of computeFractionalFlow()
has been added in support of this (this overload deals with
compressible properties.

Also added pressure normalization for situations with arbitrary
absolute pressure.
2012-10-15 14:23:13 +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
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
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
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
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
Xavier Raynaud
55486d3c03 Fixed source term (measured at reservoir condition). 2012-09-05 13:38:30 +02:00
Xavier Raynaud
938fc0f0d4 Fixed comment line. 2012-09-05 12:34:17 +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