OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
623 Commits 24 Branches 102 Tags 84 MiB
5fb14c94cb
Commit Graph

623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kjetil Olsen Lye
5fb14c94cb merge. 2012-05-16 17:00:09 +02:00
Xavier Raynaud
f252f59e5c Added necessary #include. 2012-05-16 16:08:48 +02:00
Atgeirr Flø Rasmussen
1d1755bafe Work in progress on compressible pressure solver. 2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
fd25a20b9d Started adding necessary parameters to pressure solver. Work in progress. 2012-05-16 14:38:55 +02:00
Atgeirr Flø Rasmussen
ac1e43b643 Added WellState class. 2012-05-16 14:37:55 +02:00
Atgeirr Flø Rasmussen
07b04825fd Fix bug related to arithmetic if operator ( ? : ). 2012-05-16 14:15:50 +02:00
Atgeirr Flø Rasmussen
a6c71288aa Merged. 2012-05-16 12:55:05 +02:00
Atgeirr Flø Rasmussen
d15a952cdd Added initStateBasic() overload taking BlackoilPropertiesInterface props. 2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
af8a32c560 Silence a warning. 2012-05-16 12:52:58 +02:00
Atgeirr Flø Rasmussen
cb03044d62 Renamed initTwophaseStateBasic() -> initStateBasic(). 2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
f6efbf386c 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
e29364e3cc Don't #include EclipseGridInspector for the side effect of <tr1/array> 2012-05-16 11:13:38 +02:00
Atgeirr Flø Rasmussen
203ebe6273 Remove unneeded debug output. 2012-05-16 09:24:34 +02:00
Bård Skaflestad
b2770d1414 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
562c133dff toInjectorType(): Pass parameter as "reference-to-const" rather than copied object. 2012-05-15 17:22:05 +02:00
Bård Skaflestad
156bf0a560 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
83274c4027 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
71207f04c9 Merged. 2012-05-15 13:21:02 +02:00
Atgeirr Flø Rasmussen
7df0023038 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
7700716d32 Added utility functions for compressible fluid case. 2012-05-15 12:49:15 +02:00
Atgeirr Flø Rasmussen
0d88b83546 Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
Bård Skaflestad
8ed2e18e15 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
43bb6eac78 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
e26f90d9cb merge. 2012-05-15 10:47:39 +02:00
Atgeirr Flø Rasmussen
ead94905db Merged. 2012-05-14 21:49:24 +02:00
Atgeirr Flø Rasmussen
c0d43a69bd 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
90f8a780da added possibility to add wells to wellcollection without using deck 2012-05-14 16:10:37 +02:00
Atgeirr Flø Rasmussen
a6034be47d Merged. 2012-05-14 11:29:06 +02:00
Atgeirr Flø Rasmussen
d4e530eb3c Added surfaceDensity() method to BlackoilPropertiesInterface. 2012-05-14 11:28:05 +02:00
Atgeirr Flø Rasmussen
6f0f9ff188 Added surfaceDensity() method to IncompPropertiesInterface. 2012-05-14 11:21:13 +02:00
Atgeirr Flø Rasmussen
27eecd954e 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
cd4026f6c4 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
86ab541f66 Fix silly mistake: Multiplying from the right scales columns, not rows. 2012-05-11 16:26:41 +02:00
Bård Skaflestad
02d3601072 Merge from upstream. 2012-05-11 16:08:06 +02:00
Bård Skaflestad
64b47cd304 Comment on the various stages in producing dA/dp result. 2012-05-11 16:07:01 +02:00
Atgeirr Flø Rasmussen
8b27b4a05d Minor doc update. 2012-05-11 15:10:02 +02:00
Bård Skaflestad
9e41d1860d Hide output that's presumably diagnostic behind (undefined) macro. 2012-05-11 15:07:10 +02:00
Bård Skaflestad
29cb30ed58 matrix(): Honour chain rule of differentiation. 
The original implementation of change-set 90d8dd8c8040 contained a
crucial misprint leading to incorrect results for all compressible
fluids.
 2012-05-11 14:26:48 +02:00
Atgeirr Flø Rasmussen
0a2c9ff000 Update doc. 2012-05-11 13:02:48 +02:00
Atgeirr Flø Rasmussen
0677f58026 Simplified data structure for extracted columns. 2012-05-11 09:37:12 +02:00
Bård Skaflestad
a865f01478 comprock_increment(): Don't proceed to mult_csr() unless OK. 2012-05-10 22:29:41 +02:00
Atgeirr Flø Rasmussen
a4b32311b2 Fix indexing bug in well handling code for incremental (Newton) pressure assembly. 2012-05-10 15:31:51 +02:00
Atgeirr Flø Rasmussen
1aa5d6b293 Silence a warning. 2012-05-10 15:30:33 +02:00
Kjetil Olsen Lye
10b738c7e3 Merge. 2012-05-10 12:50:22 +02:00
Xavier Raynaud
8842943794 Make compressible pressure solver compatible with well management. 2012-05-10 12:38:29 +02:00
Kjetil Olsen Lye
f24d286f18 Added error handling to pressure solver. 2012-05-10 09:55:34 +02:00
Bård Skaflestad
0cd6a0a0c6 Realign pointer offsets to provide additional visual cues. 2012-05-09 22:39:28 +02:00
Bård Skaflestad
a920b472e2 Fix copy-paste misprint in comment. 2012-05-09 20:17:10 +02:00
Bård Skaflestad
3ab9390921 Delete trailing whitespace introduced in change-set b39f2340f248 . 2012-05-09 20:15:10 +02:00
Bård Skaflestad
1672ae8c29 COMPDAT: Extract location from WELSPECS if defaulted. 
This behaviour is dictated by the ECLIPSE specification.
 2012-05-09 20:14:29 +02:00