Commit Graph

368 Commits

Author SHA1 Message Date
Bård Skaflestad
00b1ce27f0 Follow file conventions in mult_csr_matrix(). 2012-05-09 19:07:59 +02:00
Bård Skaflestad
323914eaba Don't expose a (presently) internal function. 2012-05-09 18:58:17 +02:00
Bård Skaflestad
d23c93e661 Merge from upstream. 2012-05-09 18:56:09 +02:00
Bård Skaflestad
8909664bd7 Report first well whose connections are outside grid. 2012-05-09 18:44:08 +02:00
Bård Skaflestad
6a7c6cfeb0 Convert Residual-based solver to conventions of <newwells.h>.
Almost a mechanical translation.
2012-05-09 16:26:41 +02:00
Bård Skaflestad
eda46d4fbe Add a query method to answer whether or not the deck defines any wells. 2012-05-09 16:09:13 +02:00
Kjetil Olsen Lye
5d0148a080 Added correct handling of VREP and REIN keyword. No longer generates a warning, just a friendly hint. 2012-05-09 16:03:21 +02:00
Kjetil Olsen Lye
84eb849ed2 merge. 2012-05-09 15:56:30 +02:00
Kjetil Olsen Lye
ff9fb38596 Used voidage_replacment correctly in applyExplicitReinjectionControls 2012-05-09 15:55:59 +02:00
Kjetil Olsen Lye
bf3273b115 Included voidage_replacment in injection specification. 2012-05-09 15:54:25 +02:00
Kjetil Olsen Lye
f8d92c0535 Added initial support for VREP. 2012-05-09 15:43:43 +02:00
Xavier Raynaud
1892f80af2 merge 2012-05-09 15:15:13 +02:00
Xavier Raynaud
f7e2d88fd9 Added Newton compressible fluid solver. 2012-05-09 15:06:13 +02:00
Kjetil Olsen Lye
8ad72d5d1c Added explicit number of ControlMode. 2012-05-09 14:26:30 +02:00
Kjetil Olsen Lye
d46d191a81 Introduced a hack to make it possible to test reinjection without supporting surface rate controls. 2012-05-09 13:58:25 +02:00
Kjetil Olsen Lye
12e4125081 Multiplied with reinjection_fraction_target, as is proper. 2012-05-09 13:15:53 +02:00
Kjetil Olsen Lye
3d07b954e2 Made relevant methods in WellCollection and WellsManager to call the reinjection control functions 2012-05-09 13:03:37 +02:00
Kjetil Olsen Lye
622d8ac767 Added helpful comment. 2012-05-09 12:58:29 +02:00
Kjetil Olsen Lye
621c87d8c7 Added simple reinjection to group control (explicit) 2012-05-09 12:57:36 +02:00
Kjetil Olsen Lye
3eeee29edb Added summation method to find total produced rates in a given group. 2012-05-09 12:35:26 +02:00
Kjetil Olsen Lye
c2ce4d9bce Corrected some basic logic tests. 2012-05-09 11:29:13 +02:00
Kjetil Olsen Lye
b5d474beca Added failure checking for solve method. 2012-05-09 11:28:56 +02:00
Bård Skaflestad
ece387d1ae Remove a variable rendered unused by change-set 5a9bf9f4a8b9. 2012-05-09 11:27:23 +02:00
Bård Skaflestad
0bd3e033b9 Flatten loops and prefer memcpy() to manual copying. 2012-05-09 11:21:47 +02:00
Bård Skaflestad
da51ca4ef0 Correct inaccuracy in WellControls::distr description.
The distribution is specified per control, not per well.
2012-05-09 11:11:47 +02:00
Atgeirr Flø Rasmussen
5253ce7fbe Merged. 2012-05-08 16:00:54 +02:00
Kjetil Olsen Lye
88b8ddebd2 merge. 2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
8c6ea2895b Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Bård Skaflestad
9e5b5be59b Delete trailing whitespace. 2012-05-08 12:04:59 +02:00
Bård Skaflestad
6b96d48677 Fix a likely indexing error leading to non-unit strides. 2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
c9d96d81b8 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Kjetil Olsen Lye
a28311cb7c Inserted reservoir max rate into the group structure 2012-05-07 14:28:33 +02:00
Atgeirr Flø Rasmussen
962a3b6445 Added shut well support to ifs_tpfa.
This was done using the convention that for a well w in W,
    W.ctrls[w]->current < 0
means that it should be treated as shut. This allows us to keep the matrix
structure related to wells constant, without needing to remake it when wells
shut or open.
2012-05-04 08:15:06 +02:00
Kjetil Olsen Lye
8702852524 Made reservoir rates have a small error tolerated 2012-05-03 16:04:48 +02:00
Kjetil Olsen Lye
6ee088550f Properly negate target for group control in WellNode 2012-05-03 15:44:51 +02:00
Kjetil Olsen Lye
66b4122be9 merge 2012-05-03 15:35:59 +02:00
Kjetil Olsen Lye
da92997b7b Made a maximum number of iterations in wells_test 2012-05-03 15:35:44 +02:00
Atgeirr Flø Rasmussen
1c8e21ae08 Rename parameter init_sat -> init_saturation (docs already used this name). 2012-05-03 13:48:59 +02:00
Atgeirr Flø Rasmussen
0aae87cf16 Rewrote wellsToSrc() to be a little more accepting and correct. 2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
8b33bd261d Remove unused variable. 2012-05-03 13:32:30 +02:00
Atgeirr Flø Rasmussen
104372bbdc Fixed signs of production rate constraints (should be negative). 2012-05-03 13:29:02 +02:00
Atgeirr Flø Rasmussen
361593fa45 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
373a4f2689 Fix recently created bug in append_well_controls(). 2012-05-03 12:48:56 +02:00
Kjetil Olsen Lye
18ace3c137 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
72afe774b0 Fixed applyGroupControls to handle zero guide rates 2012-05-02 16:54:49 +02:00
Kjetil Olsen Lye
8eb9b55759 Fixed small reading bug in well structure 2012-05-02 16:30:48 +02:00
Kjetil Olsen Lye
da85405dfa 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
fe51b96a7e Final fixes for new well structure (to make it compile) 2012-05-02 13:02:59 +02:00
Atgeirr Flø Rasmussen
9416042f5a Major restructuring to improve support for groups, multiple controls etc. Work in progress. 2012-05-02 09:39:05 +02:00
Atgeirr Flø Rasmussen
d7512bdeb6 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