Commit Graph

1435 Commits

Author SHA1 Message Date
Kjetil Olsen Lye
3f63435100 merge 2012-03-26 11:17:36 +02:00
Xavier Raynaud
5c2cc54ecc Added possibility to parse comments in readparam. 2012-03-26 09:50:47 +02:00
Bård Skaflestad
4544000065 Fix likely omission: don't pass objects when references will do.
This avoids copying a vector of size grid_.numFaces().
2012-03-23 19:47:27 +01:00
Xavier Raynaud
26f27daacd merge. 2012-03-23 15:53:02 +01:00
Xavier Raynaud
e887518487 Added general linear lapack solver. Updated test for band matrices. 2012-03-23 15:44:32 +01:00
Atgeirr Flø Rasmussen
4cd6b84b00 Throw if user asks for field not found in deck, instead of returning empty vector. 2012-03-23 14:09:21 +01:00
Atgeirr Flø Rasmussen
3f74f31c8a Changed behaviour of EclipseGridParser class: now unknown keywords do not trigger an exception. 2012-03-23 14:01:39 +01:00
Atgeirr Flø Rasmussen
2244158f81 Moved readKeyword() and upcase() to EclipseGridParser.cpp. 2012-03-23 13:17:02 +01:00
Kjetil Olsen Lye
dd2d474643 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
355eb053e8 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
ca0f46736e 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
55975a085a Assemble_bhp_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:59:21 +01:00
Bård Skaflestad
0a6837bda9 Assemble_rate_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:48:58 +01:00
Bård Skaflestad
a3a9e12388 Implement RESV constraint assembly. 2012-03-20 23:17:52 +01:00
Bård Skaflestad
d6a6d24716 Delete trailing whitespace. 2012-03-20 22:46:38 +01:00
Bård Skaflestad
1cd44389d9 Assemble_bhp_well(): Remove unused variable. 2012-03-20 22:45:28 +01:00
Atgeirr Flø Rasmussen
20697bd8fb Implemented (primitive) fixed point iterations for pressure in the compressible rock case. 2012-03-20 21:37:58 +01:00
Atgeirr Flø Rasmussen
3fe00d0ea5 Bugfixes in RockCompressibility::isActive() and constructor. 2012-03-20 21:36:31 +01:00
Bård Skaflestad
faa334a4d0 Merge from upstream. 2012-03-20 19:34:30 +01:00
Bård Skaflestad
a4925e63da 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
bf86cd9371 Revert to original (fractional flow) model of perforation fluxes. 2012-03-20 18:46:54 +01:00
Bård Skaflestad
fb6d7032bf 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
11f03a60f0 Make comments relating to omega (frac.flow-weighted density) precise. 2012-03-20 14:21:22 +01:00
Bård Skaflestad
c70a41691f Declare well support in ifs_tpfa module. Currently not implemented.
Update callers accordingly.
2012-03-20 13:39:34 +01:00
Atgeirr Flø Rasmussen
5c08628fd6 Merged. 2012-03-20 12:12:21 +01:00
Atgeirr Flø Rasmussen
1d63d6246a 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
a99cccf2fc Compensate for matrix adjustment in rock comp case. 2012-03-20 12:05:59 +01:00
Bård Skaflestad
a8d067af18 Solve(rock_comp): Refactor rock-compressibility diagonal term calculation. 2012-03-20 11:21:02 +01:00
Bård Skaflestad
f91ec88df6 BandMatrixCoeff: Initialise members in declaration order. 2012-03-20 10:53:36 +01:00
Atgeirr Flø Rasmussen
d75e55a968 Merged. 2012-03-20 10:33:44 +01:00
Atgeirr Flø Rasmussen
82079418db Changed tot_porevol -> tot_porevol_init. Initialise rock_comp object. 2012-03-20 10:33:37 +01:00
Atgeirr Flø Rasmussen
3b678ac5eb Added computePorevolume() overload taking rock compressibility into account. 2012-03-20 10:31:32 +01:00
Atgeirr Flø Rasmussen
832107aec8 Fixed const correctness issue in RockCompressibility class. 2012-03-20 10:29:43 +01:00
Xavier Raynaud
eeebd21d62 merge. 2012-03-20 10:15:50 +01:00
Atgeirr Flø Rasmussen
866f539519 Added RockCompressibility::isActive() method. 2012-03-20 10:15:33 +01:00
Xavier Raynaud
d4e5008743 merge 2012-03-20 10:15:15 +01:00
Atgeirr Flø Rasmussen
2d8cebd6c6 Documented computePhaseMobilities(). 2012-03-20 10:13:27 +01:00
Xavier Raynaud
94b0c76050 merge. 2012-03-19 15:05:36 +01:00
Atgeirr Flø Rasmussen
c1015131fc Merge. 2012-03-19 14:35:37 +01:00
Atgeirr Flø Rasmussen
465f54e0e6 Fixed and documented constructor taking ParameterGroup. 2012-03-19 14:35:13 +01:00
Atgeirr Flø Rasmussen
fe8f2e566f Added constructor taking parameters to RockCompressibility. 2012-03-19 14:30:44 +01:00
Atgeirr Flø Rasmussen
e29dd18d77 Added RockCompressibility class. 2012-03-19 13:55:26 +01:00
Bård Skaflestad
3d3aaa98d1 solve(rock_comp): Replace manual index search with csrmatrix_elm_index(). 2012-03-19 13:55:21 +01:00
Atgeirr Flø Rasmussen
bc04c0fa3e Implemented solve() with rock compressibility (untested). Struct init warning suppression. 2012-03-19 11:52:03 +01:00
Xavier Raynaud
1311e42208 updated test with band matrix assignement for lapack solver. 2012-03-19 09:47:44 +01:00
Bård Skaflestad
9f540e9cf7 Merge from upstream. 2012-03-16 20:35:52 +01:00
Bård Skaflestad
b8f3cd90c3 ifs_tpfa_assemble(): Coalesce external forces into single branch. 2012-03-16 14:30:13 +01:00
Atgeirr Flø Rasmussen
a103933e2b Fixed bugs and changed interface for Gauss-Seidel segregation solver. 2012-03-16 13:41:10 +01:00
Bård Skaflestad
c5c9f58a23 Refactor construction of driving forces in preparation of well support. 2012-03-16 11:59:51 +01:00
Bård Skaflestad
f89746b8bd Refactor ifs_tpfa_press_flux() flux calculation in preparation of wells.
Specifically, move calculation of cross-boundary fluxes introduced by
boundary conditions out to new internal function boundary_fluxes().
2012-03-16 11:21:34 +01:00