Atgeirr Flø Rasmussen
8ca7fa7665
Merged.
2012-04-10 15:47:28 +02:00
Atgeirr Flø Rasmussen
ddf0f09b6e
Disabled OpenMP pragmas in low-level fluid evaluations.
...
This is done to reduce risk of misuse, considering two cases:
- These functions are often called with a single data point,
making the thread setup and teardown time prohibitively expensive.
- This may conflict with higher-level use of OpenMP.
2012-04-10 15:46:24 +02:00
Atgeirr Flø Rasmussen
844b2b6cc6
Removed unused code.
2012-04-10 15:42:47 +02:00
Kjetil Olsen Lye
36ffb7416a
Fixed some warnings
2012-04-10 15:01:52 +02:00
Kjetil Olsen Lye
65d3ad547e
merge
2012-04-10 14:48:35 +02:00
Kjetil Olsen Lye
a9dfab1b37
Fixed namespacing issue
2012-04-10 14:47:29 +02:00
Atgeirr Flø Rasmussen
ee4123c3d8
Made state before init() valid (0.0 water sat, 1.0 oil sat).
2012-04-02 15:41:13 +02:00
Atgeirr Flø Rasmussen
d397fd847b
Changed single-cell solver call.
...
- Using [0,1] interval instead of [smin, smax] interval to handle compressible case.
- Using new version of Regula Falsi function which exploits initial guess.
2012-04-02 13:24:57 +02:00
Atgeirr Flø Rasmussen
495a30ef17
Merge.
2012-03-30 16:11:27 +02:00
Atgeirr Flø Rasmussen
baf099cd5a
Minor modification of residual formula (equivalent to the old).
2012-03-30 16:11:07 +02:00
Kjetil Olsen Lye
b959de1ba0
Some comments
2012-03-30 10:51:31 +02:00
Atgeirr Flø Rasmussen
ed5a7802b3
Bugfix: ensure all cells have a valid saturation initially.
2012-03-29 21:10:14 +02:00
Kjetil Olsen Lye
abdae7073e
merge
2012-03-29 18:35:00 +02:00
Kjetil Olsen Lye
5cff14343d
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
5e78fc1c9f
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
41979968ff
Minor bugfix.
2012-03-29 12:50:18 +02:00
Atgeirr Flø Rasmussen
bcb9a8772f
Added correct documentation to initStateTwophaseBasic().
2012-03-29 11:09:13 +02:00
Atgeirr Flø Rasmussen
3870df7fcd
Added functions initStateTwophaseBasic() and initStateTwophaseFromDeck().
2012-03-29 11:06:05 +02:00
Atgeirr Flø Rasmussen
0e861d1845
Suppressed multiple warnings.
2012-03-28 16:39:04 +02:00
Kjetil Olsen Lye
9ec1b4243b
merge
2012-03-28 15:49:48 +02:00
Kjetil Olsen Lye
844698baa2
Prettification of code
2012-03-28 15:49:39 +02:00
Atgeirr Flø Rasmussen
c577e8d952
Merged.
2012-03-28 14:41:56 +02:00
Kjetil Olsen Lye
bc1fcb831b
Fixed some warnings and added GCONPROD reading for the eclipse parser
2012-03-28 12:38:48 +02:00
Atgeirr Flø Rasmussen
244faaf975
Merge.
2012-03-28 11:57:25 +02:00
Atgeirr Flø Rasmussen
c961f8e7d2
Suppressed multiple warnings.
2012-03-28 11:56:20 +02:00
Kjetil Olsen Lye
e075d3d92b
merge
2012-03-27 16:57:12 +02:00
Kjetil Olsen Lye
eedb506ad0
Started reading the gruptree
2012-03-27 16:57:01 +02:00
Bård Skaflestad
2cd5cfb867
solveGravity(): Don't compare signed and unsigned expressions.
2012-03-27 11:19:13 +02:00
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
5b485b8c8a
Added exmaple file
2012-03-27 10:56:32 +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
Atgeirr Flø Rasmussen
7777a8ee07
Bugfix in solveMultiCell().
2012-03-26 14:20:00 +02: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
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
