Commit Graph

660 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
5deeed1dac Added initBlackoilSurfvol() function. 2012-05-21 14:03:56 +02:00
Atgeirr Flø Rasmussen
3419e6e92b Bugfix: set nphases properly. 2012-05-21 14:03:33 +02:00
Atgeirr Flø Rasmussen
83856a47ef Initialize size of wellperf_gpot_ properly. 2012-05-21 13:13:13 +02:00
Atgeirr Flø Rasmussen
88f77e8dd6 Finished untested version of CompressibleTpfa. 2012-05-21 12:58:42 +02:00
Atgeirr Flø Rasmussen
f8b3a8d343 Added loop control and reporting to CompressibleTpfa. 2012-05-21 12:48:54 +02:00
Atgeirr Flø Rasmussen
521827c9d1 Added tolerance and maxiter arguments to CompressibleTpfa. 2012-05-21 11:24:12 +02:00
Atgeirr Flø Rasmussen
3342424a50 Fixed a bug in non-linear Gauss-Seidel column segregation solver.
With columns containing an odd number of cells, middle cell would
get solved twice, and the second time with incorrect s0.
We still solve twice, but with correct s0.
2012-05-21 11:11:06 +02:00
Atgeirr Flø Rasmussen
6d07dd9e10 Sending *dynamic* pressures to assembly function... 2012-05-21 10:47:21 +02:00
Atgeirr Flø Rasmussen
2add19a2e1 Sending initial pressures to assembly function. 2012-05-21 10:36:10 +02:00
Atgeirr Flø Rasmussen
af76b390d2 Added initialization of face pressures. 2012-05-21 10:19:12 +02:00
Atgeirr Flø Rasmussen
96c92284a3 Added initFacePressure() function. 2012-05-21 10:10:52 +02:00
Atgeirr Flø Rasmussen
91cbc6bb72 Evaluation of dynamic properties for CompressibleTpfa. 2012-05-21 10:10:35 +02:00
Atgeirr Flø Rasmussen
2bab1acdb6 Work in progress on CompressibleTpfa.
- Changed contstruction, now takes property object.
 - Well potentials done.
2012-05-18 11:10:31 +02:00
Atgeirr Flø Rasmussen
fac1c24fba Added support for pressure-dependent viscosity to SinglePvtConstComp class.
This is the class that handles PVTW and PVCDO inputs.
2012-05-18 11:08:51 +02:00
Kjetil Olsen Lye
bfcc856d4b merge. 2012-05-16 17:00:09 +02:00
Xavier Raynaud
b7139e07b5 Added necessary #include. 2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
e57ef29fae Work in progress on compressible pressure solver. 2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
30218d84ea Started adding necessary parameters to pressure solver. Work in progress. 2012-05-16 14:38:55 +02:00
Atgeirr Flø Rasmussen
7bb007f526 Added WellState class. 2012-05-16 14:37:55 +02:00
Atgeirr Flø Rasmussen
bd5b8e9d29 Added necessary #include. 2012-05-16 14:37:39 +02:00
Atgeirr Flø Rasmussen
cc0097d8b9 Fix bug related to arithmetic if operator ( ? : ). 2012-05-16 14:15:50 +02:00
Atgeirr Flø Rasmussen
61f5343b9d Merged. 2012-05-16 12:55:05 +02:00
Atgeirr Flø Rasmussen
79cdeaa5df Added initStateBasic() overload taking BlackoilPropertiesInterface props. 2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
99330b219e Silence a warning. 2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
4c37676338 Renamed initTwophaseStateBasic() -> initStateBasic(). 2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
9379263646 Renamed initStateTwophaseFromDeck() -> initStateFromDeck().
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
  - initWaterOilContact() was also templatized on props.
  - initHydrostaticPressure() is now overloaded on prop interface types.
2012-05-16 11:37:31 +02:00
Bård Skaflestad
f619d1d909 Don't #include EclipseGridInspector for the side effect of <tr1/array> 2012-05-16 11:13:38 +02:00
Atgeirr Flø Rasmussen
58756f0ba5 Remove unneeded debug output. 2012-05-16 09:24:34 +02:00
Bård Skaflestad
aaeedd8679 WCONINJE: Distinguish injectors based on first character only.
This is the completion of change-set e6015b19c4e8 from WellsGroup.cpp .
2012-05-16 00:50:23 +02:00
Bård Skaflestad
1b6e9d40e2 toInjectorType(): Pass parameter as "reference-to-const" rather than copied object. 2012-05-15 17:22:05 +02:00
Bård Skaflestad
e66aa8b06a toInjectorType(): Distinguish types based on first characters only.
The manual states that injection types in the "WCONINJE" keyword need
only be specified using a single character.
2012-05-15 17:19:35 +02:00
Bård Skaflestad
20cf0eda36 compute_cell_contrib(): Advance derivative pointer for each connection.
Failing to do this operation resulted in incorrect matrices in cases
with anisotropic tensors and/or non-cube cells.  The error has been
present since the inception of this implementation.
2012-05-15 14:34:56 +02:00
Atgeirr Flø Rasmussen
5c40ebfae4 Merged. 2012-05-15 13:21:02 +02:00
Atgeirr Flø Rasmussen
c2e7928758 Added BlackoilState class. 2012-05-15 12:52:33 +02:00
Atgeirr Flø Rasmussen
89b4f8ceb0 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
762a6083a2 Added utility functions for compressible fluid case. 2012-05-15 12:49:15 +02:00
Atgeirr Flø Rasmussen
8fd9826467 Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
Bård Skaflestad
2acc750d93 Add input support for ECLIPSE tensor grids (DXV &c). 2012-05-15 12:08:15 +02:00
Bård Skaflestad
df5dbb3557 assignPermeability(): Don't build an Inspector to count global cells.
Thus, assingPermeability() is applicable to simulation decks that
aren't based on corner-point descriptions (e.g., the (DXV,DYV,DZV)
grid type).
2012-05-15 12:07:04 +02:00
Bård Skaflestad
c5ef2eb975 WellsManager(): Support grids that do not define "global_cell"
Assume that the "global_cell" in that case corresponds to the identity
mapping.
2012-05-15 11:54:59 +02:00
Kjetil Olsen Lye
2b174fe03f merge. 2012-05-15 10:47:39 +02:00
Atgeirr Flø Rasmussen
cc2010c1d4 Merged. 2012-05-14 21:49:24 +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
c3a2cf0ccf added possibility to add wells to wellcollection without using deck 2012-05-14 16:10:37 +02:00
Atgeirr Flø Rasmussen
df2436bd78 Merged. 2012-05-14 11:29:06 +02:00
Atgeirr Flø Rasmussen
b33ce1ca1a Added surfaceDensity() method to BlackoilPropertiesInterface. 2012-05-14 11:28:05 +02:00
Atgeirr Flø Rasmussen
adc5840528 Added surfaceDensity() method to IncompPropertiesInterface. 2012-05-14 11:21:13 +02:00
Atgeirr Flø Rasmussen
742303534a Added preliminary sketch of compressible tpfa solver.
This solver is:
 - using the residual based assembler,
 - aiming to include the nonlinear Newton iterations
   (therefore also the (re-)evaluation of fluid data).
2012-05-14 10:53:50 +02:00
Bård Skaflestad
9ad85e1039 matrix(): Reduce likelihood of reintroducing error fixed in cset 91ad967a15a0.
Specifically, rename loop variables i1->row and i2->col to better
reflect purpose.
2012-05-11 16:31:05 +02:00
Bård Skaflestad
713225dcdd Fix silly mistake: Multiplying from the right scales columns, not rows. 2012-05-11 16:26:41 +02:00