Commit Graph

16619 Commits

Author SHA1 Message Date
Kjetil Olsen Lye
d2e4f5d664 Removed all traces of the property tree (I hope) 2012-03-27 11:09:04 +02:00
Kjetil Olsen Lye
867653d4b1 Fixed minor error 2012-03-27 10:58:42 +02:00
Kjetil Olsen Lye
2bdebbe7db Fixed minor error 2012-03-27 10:57:44 +02:00
Kjetil Olsen Lye
88d6a626e3 Added exmaple file 2012-03-27 10:56:32 +02:00
Kjetil Olsen Lye
5b485b8c8a Added exmaple file 2012-03-27 10:56:32 +02:00
Atgeirr Flø Rasmussen
cffd06ab91 Fixed segregation scenario init. Reinstated old AdHocProps behaviour.
AdHocProps: the relperm curves are now the same as in the standard small
testcase also used in the MRST prototype.
2012-03-27 09:36:37 +02:00
Kjetil Olsen Lye
f7d88a1836 merge 2012-03-27 09:23:32 +02:00
Kjetil Olsen Lye
040be401e0 added initial input reading for group control (GRUP-keyword) 2012-03-27 09:23:24 +02:00
Xavier Raynaud
6d9f0ea3ec Added support for adsorbtion index (desorbtion allowed or not). 2012-03-26 16:37:39 +02:00
Atgeirr Flø Rasmussen
294c8b03be Bugfix in calculation of adsorbed polymer for balance reports. 2012-03-26 15:33:38 +02:00
Atgeirr Flø Rasmussen
7777a8ee07 Bugfix in solveMultiCell(). 2012-03-26 14:20:00 +02:00
Xavier Raynaud
c070f0ad4d Added influx for scenario 3. 2012-03-26 13:45:35 +02:00
Xavier Raynaud
023cbb228e Fixed bug for computeMc. 2012-03-26 13:45:14 +02:00
Xavier Raynaud
4e3f486d13 Simplified computation of coefficient mc. 2012-03-26 11:31:12 +02:00
Xavier Raynaud
01aab0270b Fixed bug in lapack call for band matrices. 2012-03-26 11:29:19 +02:00
Xavier Raynaud
d25a242a23 updated Makefile.am 2012-03-26 10:04:10 +02:00
Xavier Raynaud
1836247dab Added actual resistance factor. Not tested. 2012-03-23 17:40:03 +01:00
Xavier Raynaud
4c77354d56 Changed the definition of dead pore space. 2012-03-23 16:08:41 +01:00
Kjetil Olsen Lye
bceee40b4f Added opm-parallelization to column solver for gravity. Did a (minor) interface change on extractColumn 2012-03-23 12:32:25 +01:00
Bård Skaflestad
1a873633c1 Implement solution recovery from wells (BHP and perf. fluxes)
Contingent upon passing non-NULL well_press and well_flux pointers in
the solution structure.  The forces must be the same as the ones used
in assembling the system of linear equations.
2012-03-21 11:54:34 +01:00
Bård Skaflestad
7988921f21 ifs_tpfa: Prepare for well solution recovery (BHP and perf. fluxes).
Expose new elements '.well_press' and '.well_flux' in the solution
structure and update callers accordingly.
2012-03-21 11:08:56 +01:00
Bård Skaflestad
18cdd5f1e3 Assemble_bhp_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:59:21 +01:00
Bård Skaflestad
af80492ff3 Assemble_rate_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:48:58 +01:00
Bård Skaflestad
de44295f32 Implement RESV constraint assembly. 2012-03-20 23:17:52 +01:00
Bård Skaflestad
1492d9b665 Delete trailing whitespace. 2012-03-20 22:46:38 +01:00
Bård Skaflestad
e41b786c16 Assemble_bhp_well(): Remove unused variable. 2012-03-20 22:45:28 +01:00
Atgeirr Flø Rasmussen
65ee7ccc2f Bugfixes in RockCompressibility::isActive() and constructor. 2012-03-20 21:36:31 +01:00
Bård Skaflestad
2085a381f3 Merge from upstream. 2012-03-20 19:34:30 +01:00
Bård Skaflestad
e04b48f05e Assemble BHP-type wells into system of linear equations.
All wells are represented, but BHP wells get trivial equations
(n*p=n*target).  While here, stub out RESV assembly process.

BHP and perforation flux recovery is unimplemented at this time.
2012-03-20 19:32:35 +01:00
Bård Skaflestad
e76e224de8 Revert to original (fractional flow) model of perforation fluxes. 2012-03-20 18:46:54 +01:00
Xavier Raynaud
62a1c1ad98 Corrected various bugs in gravitation solver. 2012-03-20 17:43:25 +01:00
Xavier Raynaud
bd8288077f Changed permeability values to run segregation test case. 2012-03-20 17:42:35 +01:00
Bård Skaflestad
27271b57b5 Pass number of fluid phases along with well data.
Needed to properly index into Wdata->phasemob.  Update callers
accordingly.
2012-03-20 15:43:25 +01:00
Atgeirr Flø Rasmussen
6688ea1031 Make comments relating to omega (frac.flow-weighted density) precise. 2012-03-20 14:21:22 +01:00
Bård Skaflestad
60a9bee4ac Declare well support in ifs_tpfa module. Currently not implemented.
Update callers accordingly.
2012-03-20 13:39:34 +01:00
Atgeirr Flø Rasmussen
39e55a34cf Merged. 2012-03-20 12:12:21 +01:00
Atgeirr Flø Rasmussen
b430b7bcb5 Now running with rock compressibility (testing in progress). Multiple changes.
- TransportModelTwophase no longer takes pore volume in constructor, but in
   the solve() and solveGravity() calls.
 - Residual function uses compressibility term (not yet for gravity residual).
 - spu_2p now takes a new parameter "init_p_bar", and ReservoirState class
   accepts initial pressure as a constructor argument.
 - Moved parts of initialization around, since pore volume now depends on
   state (pressure).
2012-03-20 12:11:08 +01:00
Atgeirr Flø Rasmussen
07c4938e00 Compensate for matrix adjustment in rock comp case. 2012-03-20 12:05:59 +01:00
Xavier Raynaud
272bc376bb Added flags for computation methods (as in spu_2p). 2012-03-20 11:59:14 +01:00
Xavier Raynaud
49b9f340ac Added functions to compute mobilities and coefficient mc (with derivatives). 2012-03-20 11:58:09 +01:00
Bård Skaflestad
433485c4f9 Solve(rock_comp): Refactor rock-compressibility diagonal term calculation. 2012-03-20 11:21:02 +01:00
Atgeirr Flø Rasmussen
227d3e7d3c Added computePorevolume() overload taking rock compressibility into account. 2012-03-20 10:31:32 +01:00
Atgeirr Flø Rasmussen
a4a92b9bd9 Fixed const correctness issue in RockCompressibility class. 2012-03-20 10:29:43 +01:00
Atgeirr Flø Rasmussen
8f6af3ba19 Added RockCompressibility::isActive() method. 2012-03-20 10:15:33 +01:00
Atgeirr Flø Rasmussen
f40d0ad8de Documented computePhaseMobilities(). 2012-03-20 10:13:27 +01:00
Xavier Raynaud
542ed94b84 removed bugs. can compile. Not tested. 2012-03-19 16:33:32 +01:00
Xavier Raynaud
e7e9c03a67 Added gravitation. Only segragation splitting and gravitation column solver. 2012-03-19 16:32:41 +01:00
Atgeirr Flø Rasmussen
bc0173a56b Merge. 2012-03-19 14:35:37 +01:00
Atgeirr Flø Rasmussen
983b55049f Fixed and documented constructor taking ParameterGroup. 2012-03-19 14:35:13 +01:00
Atgeirr Flø Rasmussen
e239c1d209 Added constructor taking parameters to RockCompressibility. 2012-03-19 14:30:44 +01:00