Commit Graph

16619 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
6e9091bc4d Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure. 2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
88a24ef839 Verify that RESERVOIR_RATE controlled wells have specified total rate. 2012-04-26 15:03:55 +02:00
Atgeirr Flø Rasmussen
6d4f0fe293 Updated pressure solver after changes to well data structure. 2012-04-26 14:49:25 +02:00
Xavier Raynaud
9010f2da42 Fixed bug in Newton solver for polymer. 2012-04-26 14:16:40 +02:00
Atgeirr Flø Rasmussen
ce0bc7003b Merge. 2012-04-26 13:58:08 +02:00
Atgeirr Flø Rasmussen
3f3c5a8516 Using internal enum InjectorType instead of (removed) enum SurfaceComponent from newwells.h. 2012-04-26 13:57:19 +02:00
Atgeirr Flø Rasmussen
597a2cc7af 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
Xavier Raynaud
6748a6e5e9 some code optimization (instead of mu_w_eff, use its inverse). 2012-04-26 09:25:46 +02:00
Kjetil Olsen Lye
63c16c9d15 Slightly changed bounds checking to account for negative limits. 2012-04-26 08:52:56 +02:00
Kjetil Olsen Lye
743085bd16 Added some more documentation 2012-04-25 16:45:32 +02:00
Kjetil Olsen Lye
38c02c5a63 Change from std::string to const std::string& in findGroup-methods 2012-04-25 16:42:55 +02:00
Kjetil Olsen Lye
06d83e669b Added some documentation 2012-04-25 16:40:31 +02:00
Kjetil Olsen Lye
7c6ac0bf09 Completly revamped the way group control is checked 2012-04-25 16:14:40 +02:00
Kjetil Olsen Lye
7d25e9c6a0 Completly revamped the way group control is checked 2012-04-25 16:14:40 +02:00
Atgeirr Flø Rasmussen
3fe04afa8d Follow change to well rate target sign convention. 2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
b107180272 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
ea0df38468 Added setWellsPointer, changed the interface of leaf_nodes_ slightly 2012-04-25 14:19:47 +02:00
Atgeirr Flø Rasmussen
6b00381393 Removed unused saturation argument from conditionsMet() methods. 2012-04-25 14:03:57 +02:00
Atgeirr Flø Rasmussen
81cf6e3b32 Removed unused saturation argument from conditionsMet() methods. 2012-04-25 14:03:57 +02:00
Atgeirr Flø Rasmussen
f756537288 Moved internal method of WellsManager to private section. 2012-04-25 12:50:43 +02:00
Atgeirr Flø Rasmussen
8acd9d9f63 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
43b1db22a3 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
8a9cf2cc79 Added class WellReport. 2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
176d8b3955 Added documentation of sign convention for RATE targets. 2012-04-25 10:45:10 +02:00
Xavier Raynaud
af79b9555c Fixed bug in computation of effectiveTotalMobility. 2012-04-25 09:23:59 +02:00
Atgeirr Flø Rasmussen
1c5f879530 Changed order of functions to match order in header file. 2012-04-25 08:59:31 +02:00
Xavier Raynaud
3ecb7bf88c Removed compiler warnings. 2012-04-25 08:51:32 +02:00
Xavier Raynaud
04a16c2480 merge 2012-04-25 08:40:21 +02:00
Xavier Raynaud
ab961dda94 more efficient polymer code (replaced std::vector by double*). 2012-04-25 08:39:39 +02:00
Atgeirr Flø Rasmussen
9806f78a77 Update call to computeTransportSource() to match interface change. 2012-04-25 08:32:35 +02:00
Atgeirr Flø Rasmussen
f6f04d1d21 Account for sign convention for production well rates. 2012-04-24 15:44:25 +02:00
Atgeirr Flø Rasmussen
6985ec94fe Now computeTransportSource() ignores crossflow. 2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
e017c53380 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
Atgeirr Flø Rasmussen
4e55e8c912 Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Atgeirr Flø Rasmussen
8c1f9be1c3 Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
b41dd9088c Fixed computeWDP again. 2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
981fd5e1f3 Fixed computeWDP. Small prettification of code. 2012-04-24 13:33:12 +02:00
Xavier Raynaud
6eb68c9652 Fixed bug in SinglePointUpwindTwoPhasePolymer. 2012-04-24 11:20:06 +02:00
Atgeirr Flø Rasmussen
068fc2dc70 Small improvements to tutorial2. 2012-04-24 10:17:57 +02:00
Bård Skaflestad
955f927940 Delete trailing whitespace. 2012-04-23 20:48:31 +02:00
Atgeirr Flø Rasmussen
d4eb75898a Improve a little on tutorial 1. 2012-04-23 16:43:31 +02:00
Xavier Raynaud
81d90b28e2 merge 2012-04-23 14:06:44 +02:00
Kjetil Olsen Lye
c3759353ec Merge and dded default oil handling 2012-04-23 13:50:33 +02:00
Kjetil Olsen Lye
672f0f9b2b Added default oil handling 2012-04-23 13:49:53 +02:00
Atgeirr Flø Rasmussen
3b09776355 Added fixes and assertions suggested by static analysis. 2012-04-23 13:28:18 +02:00
Kjetil Olsen Lye
1d54445546 Added a (small) hack to wellmanager (defaulting injected_phase to water) 2012-04-23 13:24:47 +02:00
Kjetil Olsen Lye
c9d6fd5529 Added a (small) hack to wellmanager (defaulting injected_phase to water) 2012-04-23 13:24:47 +02:00
Xavier Raynaud
e867c53722 polymerUtilities uses now PolymerProperties to compute effective mobilities. 2012-04-23 11:49:05 +02:00
Atgeirr Flø Rasmussen
4ae1339460 Catch exceptions from boost::create_directories() to give useful error message. 2012-04-23 11:09:09 +02:00
Atgeirr Flø Rasmussen
e02429f5dc Using LinearSolverFactory now. 2012-04-23 11:07:43 +02:00