Andreas Lauser
e530ce03d8
PVT properties: allow them to be temperature dependent
...
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
2014-12-01 20:06:31 +01:00
Markus Blatt
c82ed437ce
Added support for computePoreVolume for grids apart from UnstructuredGrid.
2014-02-25 15:12:16 +01:00
Markus Blatt
8da99e11c5
Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.
...
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.
We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
2014-02-17 13:23:01 +01:00
Joakim Hove
a19881f5f4
Implemented well_controls based on well_controls_iset_xxx() functions.
2014-01-06 14:19:09 +01:00
Joakim Hove
0b37bdd1ec
Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls.
2014-01-05 16:25:31 +01:00
Joakim Hove
e75552750a
Extracted everything related to well controls to separate header well_controls.h - to simplify introducing new parser.
2014-01-03 16:04:12 +01:00
Andreas Lauser
23f215bec4
convert users of MESSAGE to OPM_MESSAGE
2013-09-05 13:04:38 +02:00
Andreas Lauser
c25ec5999e
convert users of the ASSERT and the ASSERT2 macros to standard assert()
2013-09-05 13:04:37 +02:00
Andreas Lauser
19e5d5cea2
convert THROW to OPM_THROW
2013-09-05 13:04:37 +02:00
Andreas Lauser
d11db08084
include iostream in the files which use std::cerr or std::cout
...
for some of these files this is needed to make to keep it compiling
after the next patch because the new ErrorMacros.hpp file will no
longer implicitly includes <iostream>. for the remaining files it is
just good style.
While at it, the includes for most of these files have been ordered in
order of decreasing abstraction level.
2013-09-05 13:04:37 +02:00
Andreas Lauser
884c5ab027
make config.h the first header to be included in any compile unit
...
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
2405758e2d
Renamed newwells.h -> wells.h.
...
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
34f523339d
Adapt include statements to moved headers.
2013-03-14 10:29:42 +01:00
Bård Skaflestad
11425efe81
Index into vectors using integers.
...
This commit corrects an error that has been present since the
introduction of function wellsToSrc() in commit a50bb8f
2013-02-18 11:49:52 +01:00
Atgeirr Flø Rasmussen
f5359936e0
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
8fdebccef6
Improve diagnostic output if crossflow is detected.
2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
3fa259496b
Fix stride bug in WellReport::push(). Use convert::to().
2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
055f2d5f19
Whitespace cleanup and adding a check for #phases <= 3.
2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
142f186b81
Merge remote-tracking branch 'hnil/master'
2012-09-03 13:40:33 +02:00
Xavier Raynaud
4d800cad3d
Added functionality to compute porosity for compressible fluid.
2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen
a6dcc52cba
Started work on supporting 3 phases for wellreport.
2012-08-27 12:22:32 +02:00
Bård Skaflestad
2988b48bd3
computeFractionalFlow(): Reuse the output array in all intermediate calculations.
...
This eliminates a number of free-store operations and data movements.
2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen
89b4f8ceb0
Added WellReport::push() overload taking BlackoilPropertiesInterface.
2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
67e3d38bec
Now computePorevolume() takes a porosity array instead of a property object.
...
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Kjetil Olsen Lye
517121470e
merge.
2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
339a652e5d
Changed some minor bugs in the refactored code in wells_example
2012-05-08 12:23:58 +02:00
Bård Skaflestad
d55fd7b6b5
Delete trailing whitespace.
2012-05-08 12:04:59 +02:00
Bård Skaflestad
fcdca081b0
Fix a likely indexing error leading to non-unit strides.
2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
be956f2a70
Refactored some computations into seperate methods in wells_example.cpp
2012-05-08 11:04:15 +02:00
Atgeirr Flø Rasmussen
2cf04140a1
Rewrote wellsToSrc() to be a little more accepting and correct.
2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
5264cd317f
Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure.
2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
51639bf3bc
Follow change to well rate target sign convention.
2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
20d1dec648
Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units.
2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
b1bdd3cb3b
Added class WellReport.
2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
4f403bbc42
Changed order of functions to match order in header file.
2012-04-25 08:59:31 +02:00
Atgeirr Flø Rasmussen
f0aed255b0
Now computeTransportSource() ignores crossflow.
2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
ce98195001
Include well flow in computeTransportSource().
...
Also minor fixes in spu_2p to handle no-wells case properly.
2012-04-24 15:15:36 +02:00
Atgeirr Flø Rasmussen
eefcc69b3c
Minor change to computeWDP() interface.
2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
81733f5a43
Fixed computeWDP again.
2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
2528d35b19
Fixed computeWDP. Small prettification of code.
2012-04-24 13:33:12 +02:00
Kjetil Olsen Lye
c2942a7d51
Fixed a compilation bug, also adjusted computeWDP slightly to allow for either a saturation vector by grid cells or by well cells
2012-04-17 09:19:06 +02:00
Kjetil Olsen Lye
c9a866fce0
Added computations for total flow for each well
2012-04-13 14:22:44 +02:00
Kjetil Olsen Lye
47dc72812b
prettification
2012-04-13 13:21:33 +02:00
Kjetil Olsen Lye
5b21e74999
merge
2012-04-13 13:20:36 +02:00
Kjetil Olsen Lye
a3395d9903
Added reading of WGRUPCON, also added guide_rates to the well groups. Fixed a small bug in calculateWDP
2012-04-13 10:32:36 +02:00
Bård Skaflestad
e66a2572c6
Opm::computeWDP(): Don't shadow (well) loop counter in phase loop.
2012-04-12 22:43:33 +02:00
Bård Skaflestad
8ab03f2288
Opm::computeWDP(): Match definition and prototype.
...
Specifically, accept the densities as a reference to const, not just a
const object.
2012-04-12 22:41:03 +02:00
Kjetil Olsen Lye
8bc9e862d4
Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well.
2012-04-12 18:47:06 +02:00
Kjetil Olsen Lye
bc275a4755
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Atgeirr Flø Rasmussen
11f03a60f0
Make comments relating to omega (frac.flow-weighted density) precise.
2012-03-20 14:21:22 +01:00
Andreas Lauser
Markus Blatt
Joakim Hove
Atgeirr Flø Rasmussen
Bård Skaflestad
Xavier Raynaud
Halvor Møll Nilsen
Kjetil Olsen Lye