Atgeirr Flø Rasmussen
a1665d9902
Suppressed some warnings.
2012-05-16 15:56:04 +02:00
Atgeirr Flø Rasmussen
e57ef29fae
Work in progress on compressible pressure solver.
2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
9ad4272bc2
Start using WellState class.
2012-05-16 14:38:17 +02:00
Atgeirr Flø Rasmussen
3740242d7a
Removed macro disabling initialization code.
2012-05-16 14:16:12 +02:00
Atgeirr Flø Rasmussen
79cdeaa5df
Added initStateBasic() overload taking BlackoilPropertiesInterface props.
2012-05-16 12:54:48 +02:00
Atgeirr Flø Rasmussen
4c37676338
Renamed initTwophaseStateBasic() -> initStateBasic().
2012-05-16 12:33:42 +02:00
Atgeirr Flø Rasmussen
9379263646
Renamed initStateTwophaseFromDeck() -> initStateFromDeck().
...
- Made initStateFromDeck() into a template taking arbitrary properties.
Implementation detail:
- initWaterOilContact() was also templatized on props.
- initHydrostaticPressure() is now overloaded on prop interface types.
2012-05-16 11:37:31 +02:00
Atgeirr Flø Rasmussen
0cba414782
First compiling version, large sections are disabled.
2012-05-15 12:53:04 +02:00
Atgeirr Flø Rasmussen
26fc6a335a
Adapt to changed computePorevolume() interface.
2012-05-14 21:53:36 +02:00
Atgeirr Flø Rasmussen
cc2010c1d4
Merged.
2012-05-14 21:49:24 +02:00
Atgeirr Flø Rasmussen
67e3d38bec
Now computePorevolume() takes a porosity array instead of a property object.
...
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Atgeirr Flø Rasmussen
3c3ce52850
Added (non-compiling) test program for compressible fluid case.
2012-05-14 10:55:09 +02:00
Atgeirr Flø Rasmussen
1709ca9da4
All programs unconditional, since linear solver deps are now in LinearSolverFactory.
2012-05-14 10:29:14 +02:00
Atgeirr Flø Rasmussen
891696e333
Simplified data structure for extracted columns.
2012-05-11 09:37:12 +02:00
Xavier Raynaud
fd9a3318b0
normalized tabification in spu_2p.
2012-05-10 13:50:22 +02:00
Xavier Raynaud
1e7101a91b
Make compressible pressure solver compatible with well management.
2012-05-10 12:38:29 +02:00
Xavier Raynaud
9dabbd349f
Added Newton compressible pressure solver in spu_2p.
2012-05-09 15:19:37 +02:00
Kjetil Olsen Lye
f2b847bb2c
Added explicit reinjection to spu_2p.
2012-05-09 13:15:02 +02:00
Kjetil Olsen Lye
832a2adb7f
merge.
2012-05-09 10:22:18 +02:00
Kjetil Olsen Lye
8e49914bbd
Added friendly printout
2012-05-09 10:17:58 +02:00
Kjetil Olsen Lye
338f5907a6
Added well controls in spu2p
2012-05-09 10:14:38 +02:00
Kjetil Olsen Lye
738ec64ac8
Added necessary input parameters for well checking in spu_2p
2012-05-09 09:48:49 +02:00
Atgeirr Flø Rasmussen
27d7b433e3
Merged.
2012-05-08 16:00:54 +02:00
Atgeirr Flø Rasmussen
1e61783cd3
Use proper transport source term to compute injected and produced fluid.
2012-05-08 15:52:07 +02:00
Kjetil Olsen Lye
339a652e5d
Changed some minor bugs in the refactored code in wells_example
2012-05-08 12:23:58 +02:00
Kjetil Olsen Lye
be956f2a70
Refactored some computations into seperate methods in wells_example.cpp
2012-05-08 11:04:15 +02:00
Kjetil Olsen Lye
e522a8df83
removed an extra uneeded call to the pressure solver
2012-05-07 15:51:54 +02:00
Kjetil Olsen Lye
4e0b5dca65
Inserted rock_comp into wells_example.
2012-05-07 13:29:52 +02:00
Kjetil Olsen Lye
8b0c101824
Made a maximum number of iterations in wells_test
2012-05-03 15:35:44 +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
e6df79e341
Final fixes for new well structure (to make it compile)
2012-05-02 13:02:59 +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
27af4b339d
Removed unused saturation argument from conditionsMet() methods.
2012-04-25 14:03:57 +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
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
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
6670f5de17
Added default oil handling
2012-04-23 13:49:53 +02:00
Kjetil Olsen Lye
fbf898b756
Added a (small) hack to wellmanager (defaulting injected_phase to water)
2012-04-23 13:24:47 +02:00
Atgeirr Flø Rasmussen
1f9fea92fa
Catch exceptions from boost::create_directories() to give useful error message.
2012-04-23 11:10:55 +02:00
Kjetil Olsen Lye
f4e40578f5
Passed around a WellControlResult argument to the different wellcontrol functions
2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye
11f0a14e61
Made use of the new LinearSolverFactory in wells_example
2012-04-16 12:18:37 +02:00
Kjetil Olsen Lye
99ff586dcc
merge
2012-04-16 09:00:38 +02:00
Atgeirr Flø Rasmussen
b64db1027b
Using LinearSolverFactory in spu_2p.cpp to gain linear solver flexibility.
2012-04-14 10:19:35 +02:00
Kjetil Olsen Lye
b1c5fa5aca
modified the group control interface slightly
2012-04-13 20:41:09 +02:00
Kjetil Olsen Lye
c9a866fce0
Added computations for total flow for each well
2012-04-13 14:22:44 +02:00
Kjetil Olsen Lye
affbb08795
Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control
2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye
8bc9e862d4
Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well.
2012-04-12 18:47:06 +02:00
Kjetil Olsen Lye
bc275a4755
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
1a524b0a14
Changed input arguments for group checking
2012-04-12 16:56:58 +02:00
