Commit Graph

34 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
27c0430932 Change include paths for moved headers. 2017-02-10 16:07:25 +01:00
Atgeirr Flø Rasmussen
508da6689f Change include path for writeVtkData.hpp, or remove include. 2016-12-06 09:48:03 +01:00
Andreas Lauser
d76bf11902 adapt to the removal of the unit system of opm-core
the one which is in opm-parser is now a drop-in replacement.
2016-10-10 17:00:09 +02:00
Jørgen Kvalsvik
71560b5fb2 BlackoilOutputWriter rewritten to use opm-output
Changes to BlackoilOutputWriter as mandated by the split and rewrite of
opm-output. Notable changes:

* BlackoilOutputWriter is no longer a child class of OutputWriter.
* Minor interface changes; writeTimeStep requires a Wells pointer
* restore requires a Wells* pointer
* VTK/Matlab support rewrites; no longer inherits OutputWriter
* WellStateFullyImplicitBlackoil::report added, to write its data to a
  opm-output understood format

Relies on utility/Compat.hpp for quick conversion to the opm-output
defined formats.
2016-06-07 10:15:07 +02:00
Atgeirr Flø Rasmussen
3aa5158842 Merge pull request #619 from kjellkongsvik/Move_OutputWriter_to_opm-output
Refactored to use OutputWriter from opm-output
2016-03-31 09:44:09 +02:00
Joakim Hove
18c07d5d66 Replaced SimulatorState -> SimulationDataContainer 2016-03-29 10:48:36 +02:00
Kjell W. Kongsvik
ea9e572a65 Refactored to use OutputWriter from opm-output
As OutputWriter has been deleted from opm-core
Only changes in includes
2016-03-17 14:45:30 +01:00
Andreas Lauser
651bd91482 use the error macros from opm-common 2015-10-12 15:24:59 +02:00
Atgeirr Flø Rasmussen
79b861db10 Silence multiple warnings. 2015-05-29 16:31:32 +02:00
Andreas Lauser
d36d7e81cb allow temperature dependent PVT properties
this has the nice side effect that non-uniform temperature fields also
become supported as long as they are "impressed" externally...
2014-11-20 19:25:18 +01:00
Liu Ming
c0a61c9655 due to the new timer, simulator class should not do time iteration once again. 2014-10-28 13:31:35 +08:00
Liu Ming
6b3b90500f Merge remote-tracking branch 'opm/master' into bo_polymer
Conflicts:
	opm/polymer/PolymerProperties.hpp
2014-10-20 13:51:37 +08:00
Andreas Lauser
8e5b442b17 fix all remaining CLang warnings
this time, I've rebuild the whole module and it seems to work...
2014-03-18 13:15:59 +01:00
Andreas Lauser
3cce559d52 adapt to the SimulatorTimer renames of opm-core 2014-03-18 12:44:33 +01:00
Andreas Lauser
4859e77c79 explicitly include <iostream> in files which use std::cout or std::cerr 2013-09-05 12:39:11 +02:00
Andreas Lauser
7e8d941a6f Replace THROW by OPM_THROW 2013-09-03 15:43:58 +02:00
Atgeirr Flø Rasmussen
7d5d314fc0 Update to match opm-core changes. 2013-03-18 13:10:32 +01:00
Atgeirr Flø Rasmussen
c16cb6987b Renames classes in line with opm-core changes. 2013-03-15 18:33:41 +01:00
Atgeirr Flø Rasmussen
864cce5f5e Adapt to moved opm-core headers. 2013-03-14 13:59:31 +01: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
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
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
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
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
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
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
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
Xavier Raynaud
7fb671ffbf Changed computation of polymer production. Added functionalities for compressible case. 2012-09-05 11:09:45 +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
8bf900f1bf Update surface volume in transport solver. 2012-09-03 12:52:25 +02:00
Xavier Raynaud
a335e1b149 Added Simulator for compressible polymer. Not tested. 2012-08-31 10:38:50 +02:00