Commit Graph

1652 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
e78c7c6072 Rename parameter init_sat -> init_saturation (docs already used this name). 2012-05-03 13:48:59 +02:00
Atgeirr Flø Rasmussen
2cf04140a1 Rewrote wellsToSrc() to be a little more accepting and correct. 2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
9338cc93d0 Remove unused variable. 2012-05-03 13:32:30 +02:00
Atgeirr Flø Rasmussen
861c3fd1ea Fixed signs of production rate constraints (should be negative). 2012-05-03 13:29:02 +02:00
Kjetil Olsen Lye
aa5e2038f8 merge 2012-05-03 12:50:33 +02:00
Atgeirr Flø Rasmussen
ccbb553a2b Fix bug in use of perforation data, and check that well contstruction calls succeed. 2012-05-03 12:49:37 +02:00
Atgeirr Flø Rasmussen
c9604fae47 Fix recently created bug in append_well_controls(). 2012-05-03 12:48:56 +02:00
Kjetil Olsen Lye
de957caab5 Added calculation of fractional flows and per phase flows in wells_example 2012-05-03 12:29:18 +02:00
Kjetil Olsen Lye
f4a8ef4c63 Made REIN a warning rather than a throw, just to get something up and running 2012-05-02 16:59:42 +02:00
Kjetil Olsen Lye
f13ac90ed6 Fixed applyGroupControls to handle zero guide rates 2012-05-02 16:54:49 +02:00
Kjetil Olsen Lye
54a8f7335c Fixed small reading bug in well structure 2012-05-02 16:30:48 +02:00
Kjetil Olsen Lye
017bf98208 Removed calculateGuideRates and made all guide rate dependent code calculate the guide rate dynamically 2012-05-02 15:41:05 +02:00
Kjetil Olsen Lye
e6df79e341 Final fixes for new well structure (to make it compile) 2012-05-02 13:02:59 +02:00
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