Kjetil Olsen Lye
6e23dcab17
Added WellCollection as a forest of Well group trees. Did parsing of group control input data into this forest format
2012-03-29 18:34:51 +02:00
Atgeirr Flø Rasmussen
06d5755c29
Multiple changes dealing with initialization. Work in progress.
...
- Moved simulator state class into its own file.
- Using new initState...() methods in spu_2p.cpp
- No longer controlled by 'scenario' parameter.
2012-03-29 13:05:59 +02:00
Atgeirr Flø Rasmussen
e65f1e7bbf
Minor bugfix.
2012-03-29 12:50:18 +02:00
Atgeirr Flø Rasmussen
b1fa736174
Added correct documentation to initStateTwophaseBasic().
2012-03-29 11:09:13 +02:00
Atgeirr Flø Rasmussen
d97917ca6f
Added functions initStateTwophaseBasic() and initStateTwophaseFromDeck().
2012-03-29 11:06:05 +02:00
Atgeirr Flø Rasmussen
6370906f8c
Suppressed multiple warnings.
2012-03-28 16:39:04 +02:00
Kjetil Olsen Lye
6b20238c13
merge
2012-03-28 15:49:48 +02:00
Kjetil Olsen Lye
5a74a3f322
Prettification of code
2012-03-28 15:49:39 +02:00
Bård Skaflestad
4b47096368
tests/Makefile.am: Sort individual tests alphabetically.
2012-03-28 15:10:04 +02:00
Atgeirr Flø Rasmussen
b966369c73
Moved small cartesian grid test to tests/test_cartgrid.cpp.
2012-03-28 15:02:27 +02:00
Atgeirr Flø Rasmussen
8fd1e68fb9
Merged.
2012-03-28 14:41:56 +02:00
Kjetil Olsen Lye
c8210a3a9a
Fixed some warnings and added GCONPROD reading for the eclipse parser
2012-03-28 12:38:48 +02:00
Atgeirr Flø Rasmussen
9d7a3fd4d4
Merge.
2012-03-28 11:57:25 +02:00
Atgeirr Flø Rasmussen
4db93c418c
Suppressed multiple warnings.
2012-03-28 11:56:20 +02:00
Kjetil Olsen Lye
1b7862504c
Added reading of Gconinje
2012-03-28 10:55:43 +02:00
Kjetil Olsen Lye
89f1b6399f
Fixed gruptree reading
2012-03-28 09:35:49 +02:00
Kjetil Olsen Lye
1e9072b019
merge
2012-03-27 16:57:12 +02:00
Kjetil Olsen Lye
ef6e444eb1
Started reading the gruptree
2012-03-27 16:57:01 +02:00
Atgeirr Flø Rasmussen
234836d9ef
Merge.
2012-03-27 13:15:15 +02:00
Bård Skaflestad
8fb200aeea
solveGravity(): Don't compare signed and unsigned expressions.
2012-03-27 11:19:13 +02:00
Kjetil Olsen Lye
4e74d00af3
Removed all traces of the property tree (I hope)
2012-03-27 11:09:04 +02:00
Atgeirr Flø Rasmussen
0e747d1d0f
Silence warning.
2012-03-27 11:00:48 +02:00
Kjetil Olsen Lye
ee14f3004a
Fixed minor error
2012-03-27 10:58:42 +02:00
Kjetil Olsen Lye
db5fc10954
Fixed minor error
2012-03-27 10:57:44 +02:00
Kjetil Olsen Lye
432f7c08a3
Added exmaple file
2012-03-27 10:56:32 +02:00
Kjetil Olsen Lye
bbfad835c9
merge
2012-03-27 09:23:32 +02:00
Kjetil Olsen Lye
4773318b28
added initial input reading for group control (GRUP-keyword)
2012-03-27 09:23:24 +02:00
Atgeirr Flø Rasmussen
bb953a5fba
Added controls to nonlinear pressure iteration. Fixed segregation scenario init.
2012-03-26 16:08:57 +02:00
Atgeirr Flø Rasmussen
f406487f72
Bugfix in solveMultiCell().
2012-03-26 14:20:00 +02:00
Atgeirr Flø Rasmussen
97c3a9d9e3
Gravity column solver output: make it clear where the output comes from.
2012-03-26 14:19:30 +02:00
Atgeirr Flø Rasmussen
f5d33f4602
Do not require ACTNUM presence to construct grid.
2012-03-26 13:35:19 +02:00
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
