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

2039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
06fdc66370 Major restructuring to improve support for groups, multiple controls etc. Work in progress. 2012-05-02 09:39:05 +02:00
Atgeirr Flø Rasmussen
53d5fd4e71 Add all present controls to wells, not just the active one. 
Some restructuring to support more proper well handling, esp. group control
and surface rate controls in general.
 2012-05-02 09:38:18 +02:00
Atgeirr Flø Rasmussen
67589f2f11 Whitespace and comment changes only. 2012-05-02 09:27:34 +02:00
Atgeirr Flø Rasmussen
e6cac3d27d Changed enums, variable names and defaults. 2012-05-02 09:26:36 +02:00
Atgeirr Flø Rasmussen
077aabd240 Follow changes to header file. 2012-05-02 09:25:52 +02:00
Atgeirr Flø Rasmussen
1da3eb924c Refined and reordered control enum, added guide rates. 2012-05-02 09:25:19 +02:00
Atgeirr Flø Rasmussen
5264cd317f Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure. 2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
849eed6eee Variable name changes. Default values in well-related fields are negative numbers. 
This is to more easily indicate that a field is defaulted, for example to make a
limit not active.
 2012-05-02 09:22:57 +02:00
Atgeirr Flø Rasmussen
b7d1634bc4 Verify that RESERVOIR_RATE controlled wells have specified total rate. 2012-04-26 15:03:55 +02:00
Atgeirr Flø Rasmussen
d9eec24f7a Updated pressure solver after changes to well data structure. 2012-04-26 14:49:25 +02:00
Atgeirr Flø Rasmussen
89e1e117df Merge. 2012-04-26 13:58:08 +02:00
Atgeirr Flø Rasmussen
4f1074c2c4 Using internal enum InjectorType instead of (removed) enum SurfaceComponent from newwells.h. 2012-04-26 13:57:19 +02:00
Atgeirr Flø Rasmussen
e3246c8ead Significant modification of well data structures and related functions. 
The following changes are made:
 - The SurfaceComponent enum has been removed.
 - Added new member Wells::number_of_phases.
 - The Wells::zfrac member has been replaced with comp_frac. The old
   zfrac always had 3 components per well (accessed according to the
   canonical ordering given by SurfaceComponent), the new one has
   number_of_phases components per well.
 - Changed add_well() accordingly to accept comp_frac.
 - Added new member WellControls::distr, giving distributions for
   rate controls.
 - All functions dealing with well controls now take Wells* and a
   well index instead of directly taking WellControls*.
 - Now append_well_controls() also takes a rate distribution argument.
 - Added new public function set_current_control().
 2012-04-26 13:55:35 +02:00
Kjetil Olsen Lye
24bffdd8b2 merge. 2012-04-26 08:53:42 +02:00
Kjetil Olsen Lye
4945022712 Slightly changed bounds checking to account for negative limits. 2012-04-26 08:52:56 +02:00
Bård Skaflestad
da29d12f2b Refactor actual allocation out to new helper, allocate_cart_grid(). 
Re-implement allocate_cart_grid_?d() in terms of allocate_cart_grid().
 2012-04-25 18:58:58 +02:00
Kjetil Olsen Lye
8782a6202c Added some more documentation 2012-04-25 16:45:32 +02:00
Kjetil Olsen Lye
8099e32b91 Change from std::string to const std::string& in findGroup-methods 2012-04-25 16:42:55 +02:00
Kjetil Olsen Lye
d65521ae85 Added some documentation 2012-04-25 16:40:31 +02:00
Kjetil Olsen Lye
c27f47dead Completly revamped the way group control is checked 2012-04-25 16:14:40 +02:00
Atgeirr Flø Rasmussen
51639bf3bc Follow change to well rate target sign convention. 2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
5357158984 Added ifs_tpfa_assemble_comprock() to handle compressible rock cases. 
This allows us to remove the hack from IncompTpfa.cpp.
 2012-04-25 15:00:28 +02:00
Kjetil Olsen Lye
914fc1199f Added setWellsPointer, changed the interface of leaf_nodes_ slightly 2012-04-25 14:19:47 +02:00
Atgeirr Flø Rasmussen
27af4b339d Removed unused saturation argument from conditionsMet() methods. 2012-04-25 14:03:57 +02:00
Atgeirr Flø Rasmussen
eb35f02d85 Moved internal method of WellsManager to private section. 2012-04-25 12:50:43 +02:00
Atgeirr Flø Rasmussen
20d1dec648 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
b1bdd3cb3b Added class WellReport. 2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
ff9e191df6 Added documentation of sign convention for RATE targets. 2012-04-25 10:45:10 +02:00
Atgeirr Flø Rasmussen
4f403bbc42 Changed order of functions to match order in header file. 2012-04-25 08:59:31 +02:00
Bård Skaflestad
d59d648e93 Allocate_cart_grid_2d(): Repeat cset a1537a0d194a from 3D case. 2012-04-24 16:39:32 +02:00
Bård Skaflestad
11a439da60 Allocate_cart_grid_3d(): Check allocation status of ->node_coordinates. 
This was missing even in early implementations.
 2012-04-24 16:37:26 +02:00
Atgeirr Flø Rasmussen
881d4e1225 Merged. 2012-04-24 15:45:33 +02:00
Atgeirr Flø Rasmussen
5d9db75019 Account for sign convention for production well rates. 2012-04-24 15:44:25 +02:00
Atgeirr Flø Rasmussen
f0aed255b0 Now computeTransportSource() ignores crossflow. 2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
ce98195001 Include well flow in computeTransportSource(). 
Also minor fixes in spu_2p to handle no-wells case properly.
 2012-04-24 15:15:36 +02:00
Bård Skaflestad
56d4f2aa1b Enforce explicit no-flow on outer faces not affected by boundary conditions. 2012-04-24 15:08:05 +02:00
Atgeirr Flø Rasmussen
e934e7fdc6 Adding well support (work in progress). 2012-04-24 13:49:02 +02:00
Atgeirr Flø Rasmussen
eefcc69b3c Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
81733f5a43 Fixed computeWDP again. 2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
2528d35b19 Fixed computeWDP. Small prettification of code. 2012-04-24 13:33:12 +02:00
Ove Saevareid
d26a9ee4c8 Bugfix: want non-negative cell index 2012-04-24 12:51:24 +02:00
Atgeirr Flø Rasmussen
8a84cd29b7 Merged. 2012-04-24 10:18:13 +02:00
Atgeirr Flø Rasmussen
41536d517b Small improvements to tutorial2. 2012-04-24 10:17:57 +02:00
Bård Skaflestad
3a81e04ee4 Delete trailing whitespace. 2012-04-23 20:48:31 +02:00
Bård Skaflestad
435b652678 Add debug-only test to catch the issue fixed in cset 993fd9d80c93. 2012-04-23 19:07:11 +02:00
Atgeirr Flø Rasmussen
c37bd27237 Improve a little on tutorial 1. 2012-04-23 16:43:31 +02:00
Ove Saevareid
cd5cf1d348 Bugfix: face_cells, not cell_faces 2012-04-23 14:00:31 +02:00
Kjetil Olsen Lye
3aefb649b5 Merge and dded default oil handling 2012-04-23 13:50:33 +02:00
Kjetil Olsen Lye
6670f5de17 Added default oil handling 2012-04-23 13:49:53 +02:00
Atgeirr Flø Rasmussen
f386ffa804 Added fixes and assertions suggested by static analysis. 2012-04-23 13:28:18 +02:00