OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,986 Commits 9 Branches 35 Tags 15 MiB
1fef49c2e1
Commit Graph

2246 Commits

Author SHA1 Message Date
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
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
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
Atgeirr Flø Rasmussen
d75e55a968 Merged. 2012-03-20 10:33:44 +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
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
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
Bård Skaflestad
488f85d425 Align multi-line parameter lists and structure members. 
No functional changes.
 2012-03-16 11:06:01 +01:00
Bård Skaflestad
87aa556423 Initialise all tpfa_solution members to NULL in anticipation of well support. 2012-03-16 09:32:48 +01:00
Atgeirr Flø Rasmussen
589b24f945 Merge. 2012-03-16 08:33:35 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6 Added experimental Gauss-Seidel segregation solver. Not yet functioning. 2012-03-16 08:33:00 +01:00
Xavier Raynaud
c9e34bbf16 merge 2012-03-15 16:17:54 +01:00
Xavier Raynaud
7fa98bc5ae Added solver for band matrix and a test example. 2012-03-15 16:17:16 +01:00
Xavier Raynaud
153fee692a decrease tolerance for x1-x0 in falsi. 2012-03-15 16:16:31 +01:00
Xavier Raynaud
49a53f1935 Compute the derivative directly (not using epsilon parameter). 2012-03-15 16:15:32 +01:00
Bård Skaflestad
116b8f9d95 Initialise all tpfa_solution members to zero (i.e., NULL). 
This is in anticipation of introducing additional structure members to
represent solution variables associated with wells whilst having the
compiler generate the appropriate null pointers to aid debugging.

Unfortunately, GCC warns about the standard "structure = { 0 }" idiom
under -Wmissing-field-initializers which is enabled by default under
"-Wextra".
 2012-03-15 15:13:03 +01:00
Bård Skaflestad
d69eb28dfc Encapsulate ifs_tpfa pressure solution in ad-hoc structure. 
This is to limit the number of explicit interface changes when we
produce solution variables for wells too.

Update callers accordingly.
 2012-03-15 14:26:40 +01:00
Atgeirr Flø Rasmussen
c10c089d5e Update for change in tpfa solver. 2012-03-15 11:16:03 +01:00
Bård Skaflestad
6d8531548b ifs_tpfa: Build sparse matrix structure capable of handling wells. 
Actual contributions not included at this time.  Update caller
(IncompTPFA) accordingly, but don't modify observable behaviour.
 2012-03-15 02:53:59 +01:00
Atgeirr Flø Rasmussen
4a22a98459 Fix doc typo. 2012-03-14 13:46:21 +01:00
Atgeirr Flø Rasmussen
06d72587cc Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
a50bb8ffe9 Added wellsToSrc() function. Use forward declarations in header. 2012-03-14 09:51:08 +01:00
Bård Skaflestad
e502cc54d0 Merge from upstream. 2012-03-14 00:00:15 +01:00
Bård Skaflestad
686100a407 Account for explicit flux BCs during flux calculation. 2012-03-13 23:35:26 +01:00
Bård Skaflestad
f2df9fe123 Account for compressed BC representation during flux calculation. 2012-03-13 23:28:43 +01:00
Bård Skaflestad
436a7d666d Assemble flux boundary conditions into system of linear equations. 
A few restrictions apply:

  * The bc->value is interpreted as an inflow *into* the connecting
    cell.  Outflow conditions must be specified using a negative
    sign.

  * We do not currently support general total flux conditions
    (necessitates the introduction of additional degrees of freedom),
    so bc->cond_pos[i+1]-bc->cond_pos[i] must be one (1) for all
    BC_FLUX_TOTVOL conditions.
 2012-03-13 21:00:51 +01:00
Atgeirr Flø Rasmussen
bae286e000 Added computeSaturatedVol() and computeInjectedProduced() functions. 2012-03-13 15:56:52 +01:00
Bård Skaflestad
4f7a84d630 Rename confusing variable to promote better understanding. 2012-03-13 14:48:09 +01:00
Bård Skaflestad
f00bd49292 Refactor transmissibility reference during Dirichlet BC assembly. 2012-03-13 14:43:56 +01:00
Bård Skaflestad
e727bf34e9 Take gravity into effect when assembling Dirichlet boundary conditions. 2012-03-13 14:42:38 +01:00
Atgeirr Flø Rasmussen
87cad4ccff Added asserts and docs about methods that cannot be called if done(). 2012-03-12 16:19:41 +01:00
Bård Skaflestad
16a32142ff Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities(). 2012-03-12 16:18:02 +01:00
Bård Skaflestad
3a275748c0 Re-implement computeTotalMobility() in terms of computePhaseMobilities(). 2012-03-12 16:09:26 +01:00
Atgeirr Flø Rasmussen
2132b0ed79 Added class SimulatorTimer. 2012-03-12 16:05:59 +01:00
Bård Skaflestad
385ff36455 Add utility for calculating all phase mobilities. 2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
f5ad161409 Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Bård Skaflestad
364b177237 Remove a useless explicit type conversion. 2012-03-12 09:59:30 +01:00
Bård Skaflestad
660dea787c Move source term assembly out main loop. 2012-03-12 09:50:35 +01:00
Atgeirr Flø Rasmussen
30acd08b61 Fixed indexing bug in findSideFaces(). 2012-03-09 15:50:48 +01:00
Atgeirr Flø Rasmussen
59998f8aef Added default constructor. 2012-03-09 14:25:52 +01:00
Atgeirr Flø Rasmussen
ce03532c15 Implemented capillary pressure derivatives. 2012-03-09 11:45:18 +01:00
Atgeirr Flø Rasmussen
abc03de73c Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Bård Skaflestad
d3955b0a34 Support variable number of physical grid dimensions (typically 2 or 3). 2012-03-09 08:56:28 +01:00
Bård Skaflestad
ab438b94af Use more traditional implementation of cartCoord(). 2012-03-09 00:50:44 +01:00
Bård Skaflestad
61c1e69c58 findSideFaces(): Support grids that don't define an explicit global_cell. 
Assume that global_cell==0 denotes the identity mapping (typically a
Cartesian grid).
 2012-03-08 20:53:32 +01:00
Bård Skaflestad
94317cc02f findSideFaces(): Generate initial 'ijk' that was (probably) intended. 
The trick of eliding explicit initialisers can only be use to zero an
array (or structure), not to copy an arbitrary initialiser to all
elements of the array.
 2012-03-08 20:51:17 +01:00
Bård Skaflestad
ac18454902 Merge from upstream. 2012-03-08 18:47:37 +01:00
Bård Skaflestad
47ae9a454d Add comments to summarise the two main blocks of fill_cell_topology(). 2012-03-08 18:18:28 +01:00
Atgeirr Flø Rasmussen
471d95c662 Max water sat set to always be 1.0. 2012-03-08 15:46:27 +01:00
Atgeirr Flø Rasmussen
0fe809c7e7 Issue warning instead of throwing if input requests compressible effects. 2012-03-08 15:25:36 +01:00
Atgeirr Flø Rasmussen
9ed8979ad8 Handle flow_conditions_construct(0) correctly. 2012-03-08 15:24:50 +01:00
Atgeirr Flø Rasmussen
ce1b6e9a77 Fixed GridManager bug: illegal array access if no ACTNUM. 2012-03-08 15:08:02 +01:00
Atgeirr Flø Rasmussen
2a9296bdc2 Merge. 2012-03-08 15:05:48 +01:00
Atgeirr Flø Rasmussen
00ed7b1650 Preprocessing accepts a null pointer for actnum. 2012-03-08 15:04:51 +01:00
Bård Skaflestad
262ae9146d Whitespace adjustment. No functional changes. 2012-03-08 14:14:20 +01:00
Bård Skaflestad
41f00e955c Remove obsolete comment. 2012-03-08 14:13:42 +01:00
Atgeirr Flø Rasmussen
bb9ffb8804 Added methods pressureSide() and fluxSide(). 2012-03-08 13:48:26 +01:00
Atgeirr Flø Rasmussen
4fb4580948 Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'. 2012-03-08 12:28:22 +01:00
Bård Skaflestad
cadb370011 Remove disabled code. 2012-03-07 19:42:41 +01:00
Bård Skaflestad
ea2bf25d8f Don't #include flow_bc.h twice. 2012-03-07 19:40:35 +01:00
Bård Skaflestad
6bff141c93 Merge from upstream. 2012-03-07 19:18:57 +01:00
Bård Skaflestad
64f1112997 Enable further compression of boundary conditions. 
Specifically, refine the representation to allow a boundary condition
to apply to a set of interfaces rather than just a single face.  This
support is realised by the introduction of new interface
flow_conditions_append_multi().

Update all consumers of struct FlowBoundaryConditions to accommodate
the one-to-many boundary condition interface mapping in the process.
 2012-03-07 19:08:14 +01:00
Bård Skaflestad
0d7b7f173f Ensure a valid face->boundary condition mapping before assembly. 2012-03-07 17:54:12 +01:00
Atgeirr Flø Rasmussen
3137a477e5 IncompTpfa::solve() now accepts boundary conditions. 2012-03-07 09:32:56 +01:00
Atgeirr Flø Rasmussen
d0afc1f8e4 Made bc argument const. 2012-03-07 09:32:02 +01:00
Atgeirr Flø Rasmussen
23a890d841 Added FlowBCManager class. 2012-03-07 09:18:44 +01:00
Atgeirr Flø Rasmussen
158f2c2513 Minor typo fix. 2012-03-07 09:15:34 +01:00
Atgeirr Flø Rasmussen
23decbddd0 Update for new treatment of driving forces in tpfa/ifs* functions. 2012-03-07 08:18:04 +01:00
Bård Skaflestad
3721e57ecb Merge from upstream. 2012-03-07 01:18:55 +01:00
Bård Skaflestad
4c27f8dcd7 Add tentative support for pressure boundary conditions in IncompTPFA. 
Not enabled in C++ glue layer (presently assumes no boundary conditions).
 2012-03-07 01:18:03 +01:00
Atgeirr Flø Rasmussen
046e9b1f2f Merge. 2012-03-06 22:55:59 +01:00
Atgeirr Flø Rasmussen
c9d3cb86ea Added (commented out) experimental code. 
Experiment consists of trying to solve first in cells where all upstream
cells have been updated. Did not seem to change much.
 2012-03-06 22:55:47 +01:00
Atgeirr Flø Rasmussen
763ba0d438 Bug fixed, column solver now seems to work. Made max # iters and tolerance user-controllable. 2012-03-06 22:31:56 +01:00
Bård Skaflestad
f54a6c0979 Merge from upstream. 2012-03-06 21:41:33 +01:00
Bård Skaflestad
7323243015 Catch up to recent changes in boundary condition representation. 
Specifically, accommodate the sparse BC representation introduced in
change-set 30f12a392a03.
 2012-03-06 21:40:16 +01:00
Bård Skaflestad
e669a162cd Catch up to recent changes in underlying C-implementation. 
Specifically: Update boundary condition handling to incorporate the
sparse representation introduced in change-set 30f12a392a03.
Furthermore, catch up to ifs_tpfa_assemble() now accepting a general
"force" parameter (currently containing sources only) as introduced in
change-set 6c2b5de8faaa.
 2012-03-06 21:30:02 +01:00
Bård Skaflestad
69bc8e16d6 Switch to a sparse/compressed boundary condition representation. 
Specifically, replace the existing flowbc_t (that was densely
represented on each interface, including internal interface and
external no-flow interfaces) with a new structure given by

    struct FlowBoundaryConditions

The semantics of this structure mirror those of "struct Wells" from
<opm/core/newwells.h>, but is currently mostly intended for simple,
incompressible flow purposes.

Update pressure solvers supporting boundary conditions to accommodate
the new boundary condition representation in the process.
 2012-03-06 20:07:35 +01:00
Xavier Raynaud
ab93403b18 Minor bug. 2012-03-06 15:58:30 +01:00
Atgeirr Flø Rasmussen
941bd814f0 Fix minor typo. 2012-03-06 15:10:21 +01:00
Bård Skaflestad
7149d10cb2 Start encapsulating ifs_tpfa driving forces into a managing structure. 2012-03-06 14:00:34 +01:00
Atgeirr Flø Rasmussen
4f9095a543 Added WellsManager class (untested). 2012-03-06 13:59:51 +01:00
Xavier Raynaud
da5f2e0023 Fixed PLYMAX. 2012-03-05 15:09:45 +01:00
Xavier Raynaud
9cf4442383 Keyword POLYMER acknowledged. 2012-03-05 11:59:49 +01:00
Bård Skaflestad
f4b459dde4 Merge from upstream. 2012-03-02 19:09:06 +01:00
Bård Skaflestad
a82b1062ab Clarify a few other allocation-related comments. 2012-03-02 19:05:03 +01:00
Bård Skaflestad
ef83b4f829 Explicitly relinquish resources from processed_grid conveyed onto the UnstructuredGrid. 
This enables calling free_processed_grid() at the end of preprocess(),
whence all resources allocated in process_grdecl() and present in the
processed_grid can be properly disposed of, even in case of extending
the processed_grid structure.
 2012-03-02 19:00:59 +01:00
Bård Skaflestad
dc2974e8f0 Remove several instances of end-of-line whitespace. 2012-03-02 17:48:32 +01:00
Bård Skaflestad
fb7ca8a91d Don't attempt to allocate_geometry() if we fail to construct cell topology. 2012-03-02 17:43:48 +01:00
Bård Skaflestad
da19df122f Don't generate out-of-bounds ACTNUM references when inspecting ZCORN monotonicity. 
The C parsing rules (effectively) impose a "maximal munch" strategy.
When iterating over the cell-nodes (i.e., ZCORN), the coordinate map
integer division *must* apply to the iterators and not to a product of
the form N*it.  Enforce this interpretation by explicit parentheses.
 2012-03-02 17:42:26 +01:00
Bård Skaflestad
833182329f Add documentation to substantiate that preprocess() does not leak. 2012-03-02 15:07:55 +01:00
Bård Skaflestad
1a4367587f Initialise ->global_cell prior to allocating memory for geometry. 
This prevents freeing a random pointer in case of geometry allocation
failure.
 2012-03-02 14:04:44 +01:00
Atgeirr Flø Rasmussen
dc80e2a38f Added Newton iterations to column solver. 2012-03-02 13:45:33 +01:00
Atgeirr Flø Rasmussen
560cb08313 Added initial version of column-based gravity segregation solver. 2012-03-02 13:20:46 +01:00
Atgeirr Flø Rasmussen
cac47830ed Made column extractor work also if grid.global_cell is null. 2012-03-02 13:18:49 +01:00
Atgeirr Flø Rasmussen
14a8990d15 Added missing #include. 2012-03-01 21:24:09 +01:00
Atgeirr Flø Rasmussen
320ec554db Removed unused variable. 2012-03-01 21:19:46 +01:00
Kjetil Olsen Lye
551accd08d Fixed documentation for extractColumn 2012-03-01 16:24:44 +01:00
Kjetil Olsen Lye
90c5929d00 Removed to newly created, unused files 2012-03-01 16:21:58 +01:00
Kjetil Olsen Lye
617e786270 merge 2012-03-01 16:15:23 +01:00
Kjetil Olsen Lye
6a0df4a752 Correct column extract 2012-03-01 16:15:02 +01:00
Bård Skaflestad
a0862a6ee0 Untabify. 2012-03-01 15:22:26 +01:00
Atgeirr Flø Rasmussen
565430c2e9 Prettified. 2012-03-01 15:12:50 +01:00
Atgeirr Flø Rasmussen
f02e1e9ff7 Added interface and test for lapack tridiagonal solver. 2012-03-01 14:36:10 +01:00
Kjetil Olsen Lye
83f8155271 added unit test for column extraction 2012-03-01 14:24:02 +01:00
Kjetil Olsen Lye
e8543adddc Added column extraction for a vertically aligned grid 2012-03-01 09:46:18 +01:00
Kjetil Olsen Lye
cea5324e4e merge 2012-02-29 09:42:40 +01:00
Bård Skaflestad
b425045224 Remove unused parameter "grav" from computeStaticGravity(). 
Update callers accordingly, and remove a previously disabled call.
 2012-02-28 11:08:57 +01:00
Bård Skaflestad
1e5569df7d Use more traditional half-face loop to calculate transmissibilities. 2012-02-28 11:07:08 +01:00
Kjetil Olsen Lye
9bb8406efa merge 2012-02-27 17:47:55 +01:00
Kjetil Olsen Lye
b002871fe1 Fixed some warnings 2012-02-27 17:46:06 +01:00
Bård Skaflestad
52608367e0 Expose internal half-transmissibility through read-only reference. 
Useful to initialise the Opm::ImplicitTransport<> solver with gravity
effects.
 2012-02-27 17:29:09 +01:00
Bård Skaflestad
6c49c47f2f Turn unit test program declaration into a (C) prototype. 2012-02-27 16:18:04 +01:00
Bård Skaflestad
d491b83526 Bring unit test up to date wrt removal of 'grid_t' typedef. 2012-02-27 16:17:17 +01:00
Bård Skaflestad
7cd60d7f9c Suppress "unused parameter" warning in TLMIXPAR::convertToSI(). 2012-02-27 11:29:44 +01:00
Bjørn Spjelkavik
1263c2f50f Merge. 2012-02-27 11:16:41 +01:00
Bjørn Spjelkavik
ae5c38e739 Untabified. 2012-02-27 11:15:33 +01:00
Bjørn Spjelkavik
4c1ae099aa Added reading of polymer related keywords. 2012-02-27 11:13:08 +01:00
Bård Skaflestad
2bc15fb31b Generate 2D normals of length equal to face area. 2012-02-27 10:09:06 +01:00
Bård Skaflestad
53f05d3eab Don't assume that num_phases==2 when calculating total mobility. 2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 Moved simulator utility functions to opm/core/utility/miscUtilities.hpp. 
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
 2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
85f321fc44 Added experimental code guarded by EXPERIMENT_GAUSS_SEIDEL #define. 2012-02-26 00:30:36 +01:00
Atgeirr Flø Rasmussen
0abaa508aa Adding data for experiments, left alone if unused. 2012-02-26 00:29:39 +01:00
Atgeirr Flø Rasmussen
e939202760 Added more inactive experimental code. 2012-02-25 22:39:01 +01:00
Atgeirr Flø Rasmussen
ccda9308ce Proper vtk output of multicomponent fields (i.e. saturation, velocity). 2012-02-25 22:36:07 +01:00
Xavier Raynaud
e36c5bd46f Decrease tolerance requirement for x1-x0 in modifiedregularFalsi 2012-02-24 17:17:05 +01:00
Bård Skaflestad
203a384324 Merge from upstream. 2012-02-22 23:53:34 +01:00
Bård Skaflestad
9f74500a9f Generate 3D normals of length equal to face area. 2012-02-22 01:58:45 +01:00
Bård Skaflestad
4c5f982811 Add support for variable top-node depths in 3D tensor grid. 2012-02-22 01:56:24 +01:00
Atgeirr Flø Rasmussen
b863ac37fd Removed copied text accidentally left in. 2012-02-21 22:02:16 +01:00
Atgeirr Flø Rasmussen
fe91b1ba70 Fixed class comments, LinearSolverUmfpack::solve() properly returns a report. 2012-02-21 21:54:46 +01:00
Atgeirr Flø Rasmussen
8d74253c64 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
d9ed7cadad Made the solve() methods const. 2012-02-21 21:36:09 +01:00
Atgeirr Flø Rasmussen
5d502f1c46 Using LinearSolverUmfpack for the linear solver. 2012-02-21 21:32:11 +01:00
Atgeirr Flø Rasmussen
af260d3d75 Added LinearSolverInterface and two subclasses, using Umfpack and Istl. 2012-02-21 21:27:15 +01:00
Atgeirr Flø Rasmussen
4839b56e98 Remove #include "config.h". 
- Since many other files don't.
  - We may want to establish a policy on this, that works with CMake.
An alternative (not chosen) could have been to wrap the #include in
#ifdef HAVE_CONFIG_H etc.
 2012-02-21 13:53:54 +01:00
Atgeirr Flø Rasmussen
6165fa2ba6 Bugfix: must always initialize gpress_omegaweighted_, even if no gravity. 2012-02-20 17:05:28 +01:00
Atgeirr Flø Rasmussen
4ba285ec21 Ensuring gravity feature is used consistently. 2012-02-20 13:39:40 +01:00
Atgeirr Flø Rasmussen
b2e390aef2 Throws if it fails to initialise grid. 2012-02-20 13:35:47 +01:00
Atgeirr Flø Rasmussen
2fa1f1b5f2 Added class IncompTpfa. 2012-02-20 13:23:01 +01:00
Atgeirr Flø Rasmussen
13e4e0fb15 Added GridManager class. 2012-02-20 11:34:27 +01:00
Atgeirr Flø Rasmussen
f1502b722b Renamed function that was already renamed in header. 2012-02-19 21:31:58 +01:00
Atgeirr Flø Rasmussen
0395d7725e Moved writeVtkData() functions to utility/, added a test program. 2012-02-19 21:24:59 +01:00
Bård Skaflestad
a3a45519a2 Fill_geometry_3d(): Support tensor product of variable cell sizes. 
Also: Re-implement create_hexa_grid_3d() in terms of
create_tensor_grid_3d().
 2012-02-18 00:36:37 +01:00
Atgeirr Flø Rasmussen
93d4bd80f7 Added tol and maxit arguments. Using Incomp*::satRange() for initial s-bracket. 2012-02-17 14:17:16 +01:00
Atgeirr Flø Rasmussen
153a656539 Added satRange() method to Incomp* classes and Saturation* classes. 
So far not yet added to BlackoilPropertiesInterface.
 2012-02-17 14:15:25 +01:00
Atgeirr Flø Rasmussen
ccdacb791c Added lots of (inactive) experimental code. 
The code attempts to improve #iterations in the Gauss-Seidel-like
multicell solver by improving ordering. In general, experiment failed
to improve #iterations, except for one: totally random order was the
best (for the 100x100 case tried)!
 2012-02-17 09:39:45 +01:00
Atgeirr Flø Rasmussen
8a2a3c3ff8 Added compute_sequence_graph(), which also returns the upwind graph. 2012-02-17 09:29:56 +01:00
Bård Skaflestad
e6649ad25d Remove two instances of EOL whitespace. 2012-02-16 02:19:10 +01:00
Bård Skaflestad
eb86ac92ad Use a sane definition of areas and volumes in 2D tensor grid. 2012-02-16 02:12:49 +01:00
Bård Skaflestad
911ce3b145 Fill_geometry_2d(): Support tensor product of variable cell sizes. 
Also: Re-implement create_cart_grid_2d() in terms of
create_tensor_grid_2d().
 2012-02-16 01:58:57 +01:00
Bård Skaflestad
a609175f79 Change grid creation semantics: Return NULL in case of allocation failure. 
Let caller handle out of memory conditions.  We are in no business to
enforce a particular failure handling policy.
 2012-02-16 01:12:46 +01:00
Bård Skaflestad
ddfcd4a1e3 Extract Cartesian dimensions from grid when filling topology/geometry. 
The dimensions are already set in the grid structure during allocation.
 2012-02-16 01:04:35 +01:00
Atgeirr Flø Rasmussen
af1dc247d5 Merge. 2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
541813ace5 Made reordersequence a C++ source file, in order to use std::sort(). 
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
 2012-02-15 22:42:07 +01:00
Atgeirr Flø Rasmussen
c8e0d59611 Added solveMultiCell() interface and implementation. 
- Added solveMultiCell() virtual method.
  - TransportModelInterface::reorderAndTransport() now calls solveMultiCell()
    instead of aborting if encountering multi-cell components.
  - Implemented solveMultiCell() in TransportModelTwophase by solving
    each cell individually with solveSingleCell() and repeating until
    saturation change is small (hardcoded 1e-9 for now).
 2012-02-15 22:38:45 +01:00
Bård Skaflestad
f3f261b9a2 Reference per-cell fluid matrix when calculating phase densities. 
This change repeats change-set f3bd5169811e of sibling class
BlackoilPropertiesBasic .
 2012-02-15 15:37:02 +01:00
Bård Skaflestad
ba7b0f05b9 Reference per-cell fluid matrix when calculating phase densities. 2012-02-14 20:23:13 +01:00
Bård Skaflestad
3a004d21ac Include <gridinterface.h> for free_grid(), compute_geometry() and preprocess(). 2012-02-10 14:12:19 +01:00
Bård Skaflestad
8a2d216a83 Refactor inflow tests and flux assignments. 2012-02-10 11:40:21 +01:00
Bård Skaflestad
deb868c233 Fix spelling (interiour -> interior). 2012-02-10 11:26:48 +01:00
Bård Skaflestad
24ceea4ad0 Remove #include<> statement that refers to file removed in cset b4feb4a932de. 2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
a48b261a3c TransportModel* classes are now expected to have a custom solve() method. More: 
- Using new solve() method in spu_2p.
 - solve() implemented in terms of protected superclass method reorderAndTransport().
 - Removed unused code being replaced by solve().
 2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
11e5f76813 Removed legacy blackoil fluid code. Further information: 
- These classes were imported (copied) from the dune-porsol repository,
   and copies remain there for the time being.
 - Some of the black oil fluid classes that are in opm-core, such as the
   SinglePvt* classes, are direct descendants of the Miscibility* classes
   that have been removed.
 - At some point, we may modify dune-porsol to use the new fluid interfaces
   from opm-core, but for now we keep using the existing code as-is.
 2012-02-10 09:28:05 +01:00
Atgeirr Flø Rasmussen
da1159061a Removed unused files. 2012-02-09 23:39:18 +01:00
Atgeirr Flø Rasmussen
05ac35ed14 Cleaned up and removed unused code. 2012-02-09 23:35:43 +01:00
Atgeirr Flø Rasmussen
c076a8a6b9 Made grid argument of compute_sequence() const. 2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
7767e1cc81 Refactored internals, now using modifiedRegulaFalsi() template for performance. 2012-02-09 23:17:08 +01:00
Atgeirr Flø Rasmussen
909007942e Re-added necessary include files. 2012-02-09 23:14:50 +01:00
Atgeirr Flø Rasmussen
c51d9f1a6c Added new top-level reorder free function, reorderTransportTwoPhase(). 2012-02-09 16:08:53 +01:00
Atgeirr Flø Rasmussen
54c89db47b Added classes TransportModelInterface and TransportModelTwophase. 2012-02-09 16:07:53 +01:00
Atgeirr Flø Rasmussen
ba13070a74 Added new function create_hexa_grid_3d(). 2012-02-08 15:00:56 +01:00
Atgeirr Flø Rasmussen
30ec82a02c Fix order of arguments for error messages. 2012-02-08 13:52:19 +01:00
Atgeirr Flø Rasmussen
be308f8bd5 Improved bracketing error message from nonlinear solvers. 2012-02-08 13:50:08 +01:00
Atgeirr Flø Rasmussen
c0ded27f8d Put brackets for nonlinear solvers into NonlinearSolverCtrl struct. 2012-02-08 13:37:52 +01:00
Bjørn Spjelkavik
08fb3df82c bugfix 2012-02-07 10:22:47 +01:00
Bård Skaflestad
2de58be3fd Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +01:00
Atgeirr Flø Rasmussen
da16edf8bc Removed unnecessary (potentially misleading) assignment. 2012-02-06 10:45:21 +01:00
Bård Skaflestad
32f5ae1030 Implement basic memory management for new well interface. 
Hook up to build, but actual location is likely to change...
 2012-02-03 21:35:19 +01:00
Jostein R. Natvig
9def4966cc Remove old function "create_cart_grid", please use "create_cart_grid_3d". 2012-02-03 10:56:28 +01:00
Atgeirr Flø Rasmussen
41f9f06df4 Fallout from removal of grid_t typedef. 2012-02-01 20:29:05 +01:00
Atgeirr Flø Rasmussen
3c3db99076 Include necessary header for free_grid(). 2012-02-01 15:57:02 +01:00
Jostein R. Natvig
7439640098 Unify grid destructors: new common function is called free_grid(...). 2012-02-01 15:45:13 +01:00
Jostein R. Natvig
98919ced76 Merge. 2012-02-01 14:57:20 +01:00
Jostein R. Natvig
fb99d7bdaf 1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid. 
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
 2012-02-01 14:56:38 +01:00
Bård Skaflestad
b5ebdd41b6 Use explicit string constructor for keywords SWFN, SOF2, and TUNING. 
Keywords are supposed to be strings anyway, and it's better to enforce
this restriction explicitly rather than to rely on implicit conversion
from character literals.
 2012-02-01 14:55:49 +01:00
Jostein R. Natvig
e577b74a48 Add new version of well datastructure. 2012-02-01 12:16:05 +01:00
Atgeirr Flø Rasmussen
9a51f77538 Merged. 2012-01-31 22:36:03 +01:00
Atgeirr Flø Rasmussen
7eb2d297bf Fix error message. 2012-01-31 22:30:24 +01:00
Bård Skaflestad
89fcb2d082 Merge from upstream. 2012-01-31 10:21:08 +01:00
Bård Skaflestad
b93709a8ba Implement read support for "RS" keyword (initial gas/oil solution ratio). 2012-01-31 10:20:37 +01:00
Atgeirr Flø Rasmussen
d3ded4160b Added IncompPropertiesFromDeck class and its building blocks. 2012-01-31 09:41:53 +01:00
Atgeirr Flø Rasmussen
7c9f6019aa Minor comment typo fix. 2012-01-27 12:46:57 +01:00
Atgeirr Flø Rasmussen
a00e8bba3e Fixed bug in some capPress() implementations (calling wrong function). Doc fix. 2012-01-27 11:42:05 +01:00
Atgeirr Flø Rasmussen
ae98a1c9c3 Removed extra occurrence of grid.h header file. 2012-01-27 09:43:28 +01:00
Bård Skaflestad
4ab4dc7543 Convert Tabs to spaces where appropriate. 2012-01-26 10:41:58 +01:00
Jostein R. Natvig
a92b7a1b0c Copy modifications to reorder-related codes from MRST repository 
branches/mrst-reorg/mex/reorder-C, revision 8955.

The changes are: (1) addition of documentation of input arguments in
tarjan.c and (2) an MIT licence header (codes originated in a PhD
project).
 2012-01-25 10:49:49 +01:00
Jostein R. Natvig
80beabc3e9 Remove unnecessary include statement. 2012-01-25 10:44:37 +01:00
Atgeirr Flø Rasmussen
12f8b6b4a1 Reorder solver now uses new fluid props. 2012-01-24 21:51:24 +01:00
Atgeirr Flø Rasmussen
63942cbd1d Now reorder code requires new property object, not using it yet (work in progress). 2012-01-24 16:17:05 +01:00
Atgeirr Flø Rasmussen
45d603939d C++ified twophase model code. 2012-01-24 16:01:15 +01:00
Atgeirr Flø Rasmussen
3424e0211b C++ified reordering transport solver facade. 2012-01-24 13:47:00 +01:00
Atgeirr Flø Rasmussen
72db3627d0 Added test code (#ifdef'ed out) for linear relperm. 2012-01-24 10:05:18 +01:00
Atgeirr Flø Rasmussen
61be43bfb6 Made sure permeability param is read as a double. 2012-01-23 13:43:45 +01:00
Atgeirr Flø Rasmussen
e6ebc9961b Made header includable from C++. 2012-01-20 15:36:03 +01:00
Atgeirr Flø Rasmussen
7cb74b09cf Use user-supplied tolerance also for endpoints. 2012-01-20 14:38:29 +01:00
Atgeirr Flø Rasmussen
ba61341cab Squash warnings. 2012-01-20 14:37:58 +01:00
Atgeirr Flø Rasmussen
136a494ccb Include fluid.h. 2012-01-20 14:37:38 +01:00
Atgeirr Flø Rasmussen
29cdeedde3 Build fluid.c and make it into a quadratic Corey fluid. 2012-01-20 14:07:23 +01:00
Atgeirr Flø Rasmussen
68c6936cbd Updated files from MRST repository. 2012-01-20 13:09:13 +01:00
Atgeirr Flø Rasmussen
4f7c1fd77c A few changes to out-of-range warning and clamping: 
- instead of hardcoding a constant (1e-5), use named
   variable (sat_tol_).
 - in finishStep(), allow s to be within sat_tol_ of
   [s_min, s_max] range, and clamp to range.
 - in initIteration(), only warn once if any cells' s
   values were clamped.
 2012-01-19 23:49:45 +01:00
Atgeirr Flø Rasmussen
7107ef2161 Refined output of NRReport. 2012-01-19 16:58:20 +01:00
Atgeirr Flø Rasmussen
47a0c65c64 Changed default behaviour to match old behaviour. 2012-01-19 16:48:11 +01:00
Atgeirr Flø Rasmussen
df31c95197 Moved output of report struct into dedicated operator<<(). 2012-01-19 14:24:39 +01:00
Atgeirr Flø Rasmussen
a8d5302cc7 Merge. 2012-01-19 13:58:47 +01:00
Bjørn Spjelkavik
e697fb72e3 Changed namespace Dune -> namespace Opm. 2012-01-19 13:50:57 +01:00
Atgeirr Flø Rasmussen
b7ae30491c Newton iteration initial guess policy is now controlled by a 
constructor parameter instead of a macro.
 2012-01-19 13:23:55 +01:00
Bård Skaflestad
ff1edbe363 Merge from upstream. 2012-01-19 10:51:22 +01:00
Bjørn Spjelkavik
7560f3b9a4 Add missing field in welspec printout. 2012-01-19 09:20:06 +01:00
Bård Skaflestad
7f02860e11 Support switching off syntax check in constructor. 
This is useful if a set of parameters can all be defaulted in which
case launching the executable *should* be a simple as

    ./a.out

but the constructor requirement leads to using

    ./a.out a=b

or something similar.
 2012-01-19 09:13:05 +01:00
Atgeirr Flø Rasmussen
805d5a6ba5 Added classes IncompPropertiesInterface and IncompPropertiesBasic. 2012-01-18 18:50:56 +01:00
Atgeirr Flø Rasmussen
9508680baf Added sanity checking for number of phases in property classes. 2012-01-18 18:36:20 +01:00
Atgeirr Flø Rasmussen
c60fd2b82f Added numPhases() method to SaturationProps* classes. 2012-01-18 18:31:12 +01:00
Bård Skaflestad
7f157109d0 Merge from upstream. 2012-01-17 16:10:23 +01:00
Bård Skaflestad
1a1c87f17c Interface change: Don't return a value. 
We currently cannot provide a meaningful return value, so don't
pretend that there is one [%].  Also, make compilable as strict C90.

[%]: Sanctioned by original author.
 2012-01-17 16:07:40 +01:00
Bård Skaflestad
e768af68ca Various cleanups. 
Specifically: Remove debugging output and unused variables.
 2012-01-17 16:05:44 +01:00
Bård Skaflestad
d0be980727 Make compilable as strict C90. 2012-01-17 16:04:53 +01:00
Jostein R. Natvig
71f6bac21e Add bare-bones implementation of reordering algorithm. 
Lightly tested.
 2012-01-17 14:39:09 +01:00
Atgeirr Flø Rasmussen
dea88cbc28 Documented parameters, and made unit behaviour according to doc (perm in mD etc.) 2012-01-17 14:16:28 +01:00
Atgeirr Flø Rasmussen
860d9623dc Added class BlackoilPropertiesBasic. 2012-01-17 12:19:50 +01:00
Atgeirr Flø Rasmussen
7619cb6061 Added class PvtPropertiesBasic. 2012-01-17 11:17:40 +01:00
Atgeirr Flø Rasmussen
185ec1a816 Added SaturationPropsBasic class. 2012-01-17 10:25:49 +01:00
Atgeirr Flø Rasmussen
9b49b0d089 Added RockBasic class. 2012-01-17 09:31:25 +01:00
Atgeirr Flø Rasmussen
9b6aabd284 Minor typo fix. 2012-01-17 09:31:05 +01:00
Atgeirr Flø Rasmussen
5dc31a5806 Added operators += and *= for SmallVec. 2012-01-17 09:30:43 +01:00
Jostein R. Natvig
3ba7623d41 Remove debug output. 2012-01-16 13:36:09 +01:00
Jostein R. Natvig
3b32089890 Whitespace cleanup. 2012-01-16 13:32:32 +01:00
Jostein R. Natvig
5e049918b7 Do not check monotonicity of ZCORN in inactive cells. 2012-01-16 13:31:39 +01:00
Bård Skaflestad
96b9ab737e Fix corner case in neighbour definition. 2012-01-13 13:36:36 +01:00
Bård Skaflestad
ed7b7e5dab Catch up to removal of grid.h from cart_grid.h . 
Forgotten in change-set c503348e6d54 .
 2012-01-13 12:23:37 +01:00
Bård Skaflestad
e2095a250c Forward-declare "struct UnstructuredGrid" to eliminate grid.h dependency. 2012-01-13 12:21:44 +01:00
Atgeirr Flø Rasmussen
b0bdd2e422 Added missing method implementations. 2012-01-05 21:55:19 +01:00
Atgeirr Flø Rasmussen
0c15624617 Implemented matrix() method. 2012-01-05 21:39:33 +01:00
Atgeirr Flø Rasmussen
f278f87f14 Now initializes rock properties. 2012-01-05 16:43:57 +01:00
Atgeirr Flø Rasmussen
8e627bf820 Implemented init() function. 2012-01-05 16:43:36 +01:00
Atgeirr Flø Rasmussen
aabc457c4c Implemented rock interface in terms of RockFromDeck. 2012-01-05 15:39:13 +01:00
Atgeirr Flø Rasmussen
8bec1ad1cf Implemented trivial parts of RockFromDeck, init() remains. 2012-01-05 15:38:50 +01:00
Bård Skaflestad
22f909d9c2 Implement numPhases() to fix link errors. 2012-01-05 13:12:27 +01:00
Atgeirr Flø Rasmussen
762a414bd4 Now implemented with new pvt and satprop classes. 2012-01-05 11:41:52 +01:00
Atgeirr Flø Rasmussen
f6408d9083 Minor typo fix. 2012-01-05 11:40:58 +01:00
Atgeirr Flø Rasmussen
3d30d615cd Changed behaviour of surfaceDensities(), now only returns densities of active components. 2012-01-05 11:40:29 +01:00
Atgeirr Flø Rasmussen
536d58fe4e Added class SaturationPropsFromDeck. 2012-01-05 11:17:52 +01:00
Atgeirr Flø Rasmussen
91e7b75a2d Added inline keyword for correct linkage. 2012-01-05 11:17:29 +01:00
Atgeirr Flø Rasmussen
88379706a3 Moved active phase determination into own function. 2012-01-05 09:34:05 +01:00
Atgeirr Flø Rasmussen
1c4a621ea5 Moved phase configuration state into PhaseUsage struct. 2012-01-05 09:28:57 +01:00
Atgeirr Flø Rasmussen
7ad68f93e0 Disabling copying of BlackoilPvtProperties class. 2012-01-04 23:32:21 +01:00
Atgeirr Flø Rasmussen
7548172cdf Added BlackoilPvtProperties class. 2012-01-04 23:28:54 +01:00
Atgeirr Flø Rasmussen
6b797c66c0 Documentation improvements. 2012-01-04 23:28:13 +01:00
Atgeirr Flø Rasmussen
a8f7e79b7b Merged. 2012-01-04 22:17:06 +01:00
Atgeirr Flø Rasmussen
0ba5699d0a Made all the SinglePvt* classes conform to new, more bare-bones interface. 2012-01-04 22:15:26 +01:00
Ingeborg Ligaarden
355f9ebee7 Correct cart_grid fields face_nodepos for 2D/3D and facepos for 2D. 2012-01-04 18:19:25 +01:00
Atgeirr Flø Rasmussen
f8ad8b8bf0 Copied and renamed basic building blocks for black oil pvt. 2012-01-04 15:44:53 +01:00
Atgeirr Flø Rasmussen
dd4c0c2b1b Adding class BlackoilPropertiesFromDeck and test program. 2012-01-04 14:44:55 +01:00
Atgeirr Flø Rasmussen
44eb3cf277 Adding virtual destructor. 2012-01-04 14:43:48 +01:00
Atgeirr Flø Rasmussen
ae16a657d3 Initial version of suggested interface for fluid and rock properties. 2012-01-04 12:37:12 +01:00
Atgeirr Flø Rasmussen
f5edbe9c4b Improved robustness of WCONINJE and WCONPROD reading. 2012-01-03 16:06:15 +01:00
Atgeirr Flø Rasmussen
9b0005d132 Added SOIL keyword. 2012-01-03 16:05:43 +01:00
Bjørn Spjelkavik
7e3d000ec8 Minor reformatting. 2012-01-03 09:58:08 +01:00
Bjørn Spjelkavik
9a12c4566c Use flat vector for TSTEP, implement convertToSI(). 2012-01-03 09:57:41 +01:00
Bjørn Spjelkavik
79ba5608c5 Implemented keyword TSTEP 2012-01-03 09:38:38 +01:00
Atgeirr Flø Rasmussen
328353a9c2 Stop using std::tr1::array<> since it is padded (alignment) on gcc 4.1 (CentOS 5.7). 2011-12-22 14:43:23 +01:00
Atgeirr Flø Rasmussen
9b2bfe40d3 Blackoil fluid test programs now compile. 2011-12-22 12:59:42 +01:00
Atgeirr Flø Rasmussen
a55b664eb9 Now fluid cpp files compile successfully. 2011-12-21 13:29:15 +01:00
Atgeirr Flø Rasmussen
cbe5d3015b Work in progress on adapting to opm-core. 2011-12-21 13:22:26 +01:00
Atgeirr Flø Rasmussen
7c0998e197 Moved blackoil fluid classes to their proper place. 2011-12-21 13:09:12 +01:00
Bård Skaflestad
a98386f5aa Don't shadow name() method with a 'name' variable in read(). 2011-12-20 17:37:21 +01:00
Bård Skaflestad
1f1b58c56c Don't shadow field iterator 'i' with an index into that particular field. 2011-12-20 17:36:08 +01:00
Bård Skaflestad
617b160534 Compute perforation fluxes (no gravity adjustments). 
Requires additional parameter 'pmobc' (phase mobilities per cell) in
public function cfs_tpfa_res_flux().
 2011-12-20 02:13:50 +01:00
Atgeirr Flø Rasmussen
bd4236eda9 Now compiles parameter testcase, removed extraneous imported makefiles. 2011-12-19 16:02:51 +01:00
Atgeirr Flø Rasmussen
8f7bbddced Merged. 2011-12-19 15:31:24 +01:00
Atgeirr Flø Rasmussen
81a72be23b Now detects boost and compiles some tests. 2011-12-19 15:26:26 +01:00
Bård Skaflestad
940ec1a996 Merge from upstream. 2011-12-19 14:59:28 +01:00
Bård Skaflestad
959c694e2d Impose outflow sign convention when assembling w->c contributions. 2011-12-19 14:09:27 +01:00
Bård Skaflestad
7eed98118b Only perform incompressible adjustment if there are no BHP wells. 2011-12-19 14:07:57 +01:00
Bård Skaflestad
18d33a3859 Don't immediately clear the freshly allocated geometry storage... 2011-12-19 13:27:54 +01:00
Atgeirr Flø Rasmussen
81b58a0acf Now library contents build. Headers and tests not done yet. 2011-12-19 12:36:56 +01:00
Atgeirr Flø Rasmussen
7e90e732d9 Imported items from dune-cornerpoint/dune/common. 2011-12-19 11:34:50 +01:00
Atgeirr Flø Rasmussen
38fe05cb27 Moved GridAdapter to opm/core. Fixes include paths. 2011-12-16 10:17:40 +01:00
Bård Skaflestad
5610898bc9 Allocate storage for geometry in preprocess(). 
This allows recomputing the geometric primitives if (e.g.) we change
some of the node coordinates after constructing the grid.
 2011-12-14 10:48:23 +01:00
Bård Skaflestad
c84e9dc53c Initialise 'Nx' and 'nxf' before use in fill_cart_topology_2d(). 2011-12-14 10:23:34 +01:00
Bård Skaflestad
1ccd7971e3 Remove unused variables. 2011-12-14 10:20:31 +01:00
Bård Skaflestad
f770effb3f Don't re-declare destroy_cart_grid(). It's already in cart_grid.h . 2011-12-14 10:18:24 +01:00
Jostein R. Natvig
04f9d46c10 Add tensor grid constructors. 2011-12-14 09:30:25 +01:00
Jostein R. Natvig
d25ce5c002 Restructure code to prepare for reuse in future tensor_grid_* constructors. 2011-12-14 09:17:07 +01:00
Jostein R. Natvig
35a1070a5b Merge from upstream. 2011-12-14 07:02:47 +01:00
Bård Skaflestad
9b50c604e4 Merge from upstream. 2011-12-13 17:07:47 +01:00
Atgeirr Flø Rasmussen
8b2fee4774 Minor bugfix: avoid accessing empty (but non-zero capacity) vector. 2011-12-13 11:18:38 +01:00
Bård Skaflestad
c4f986316c Add field for specifying which surface volume fraction is injected. 2011-12-12 18:43:11 +01:00
Atgeirr Flø Rasmussen
23a61cb167 Changed code to use new include path: <opm/core/...> 2011-12-12 11:28:09 +01:00
Atgeirr Flø Rasmussen
4655108f98 Moved code from opmcore/ to opm/core/ 2011-12-12 11:13:54 +01:00