Commit Graph

96 Commits

Author SHA1 Message Date
Kristian Flikka
15682a71df Merge pull request #114 from joakim-hove/valgrind
Valgrind
2014-02-06 16:39:30 +01:00
Joakim Hove
e17f03b8a0 Merge remote-tracking branch 'akva2/run_tests_through_valgrind' into valgrind 2014-02-06 14:30:01 +01:00
Kristian Flikka
9db42f6eb3 Added support for WELOPEN in the Schedule class, NOT support specific completions, only the well 2014-02-04 16:12:49 +01:00
Joakim Hove
bb444b5139 Added flag injectionControls to keep track of available injection controls. 2014-01-30 16:44:21 +01:00
Joakim Hove
49ee4ed1ed Added addProductionControl() and dropproductioncontrol() to Schedule. 2014-01-30 16:44:21 +01:00
Joakim Hove
137eb5b6e1 Added bitmask status flag to keep track of which controls have been set. 2014-01-30 16:44:21 +01:00
Joakim Hove
dbb0272d12 Changed ControlEnums to become 2^n 2014-01-30 16:44:21 +01:00
Joakim Hove
e42234b17a Added Well::Producercontrolmode 2014-01-30 16:44:21 +01:00
Joakim Hove
5dd6865838 Added RESV target to Well. 2014-01-30 16:44:20 +01:00
Joakim Hove
7f58de5b3e Have added liquidRate setting from Schedule.cpp 2014-01-30 16:44:20 +01:00
Joakim Hove
a83d994494 Added well->liquidRate() from WCONPROD. 2014-01-30 16:44:20 +01:00
Joakim Hove
46bd341808 Setting injectorType from Schedule class. 2014-01-29 16:42:55 +01:00
Joakim Hove
0f707b7498 Keeping track of well OPEN|SHUT|STOP status from WCONxxxx keywords. 2014-01-29 15:55:02 +01:00
Joakim Hove
db26d6cf93 Added status flag as well property. 2014-01-29 15:34:33 +01:00
Joakim Hove
86e8cc3585 Added WellCommon namespace with StatusEnum. 2014-01-29 15:10:52 +01:00
Joakim Hove
49604cf631 Added injectorControlMode to Well class. 2014-01-29 13:33:28 +01:00
Joakim Hove
c60ce712ea Added ControlMode enum to the WellInjector namespace. 2014-01-29 13:21:04 +01:00
Joakim Hove
65e87189e4 Changed namespace InjectorType -> WellInjector. 2014-01-29 13:11:35 +01:00
Kristian Flikka
37084e991d Shifting WELSPECS and COMPDAT i,j,k indices down one, to go from 0 2014-01-29 11:48:02 +01:00
Kristian Flikka
3c4f12f3c7 Added dimension to connection factor / well index in json config. Updated fetching to use SI value 2014-01-28 21:29:35 +01:00
Kristian Flikka
efcfad657e Merge pull request #102 from joakim-hove/well-injection-phase
Well injection phase
2014-01-28 11:37:49 -08:00
Joakim Hove
b0545fab0a Merge pull request #100 from flikka/add-to-completion
Added skinFactor and diameter to Completion
2014-01-28 07:04:40 -08:00
Joakim Hove
7ce91cf504 Added well->Injectortype 2014-01-28 14:31:51 +01:00
Joakim Hove
eae4cbb889 Added InjectorType enum. 2014-01-28 08:35:12 +01:00
Joakim Hove
a464429388 Added namespace Phase around the PhaseEnum enum. 2014-01-28 08:18:03 +01:00
Kristian Flikka
fdee1d8b67 Added skinFactor and diameter to Completion 2014-01-27 19:32:00 +01:00
Joakim Hove
af00558ec7 Added THPLimit as well property. 2014-01-27 18:38:41 +01:00
Joakim Hove
3d2ddd70fc Setting Well->BHP limit from Schedule. 2014-01-27 18:31:22 +01:00
Joakim Hove
99ef84b438 Added BHPLimit as well property. 2014-01-27 18:30:05 +01:00
Arne Morten Kvarving
4a9c18ac9f run tests through valgrind 2014-01-27 15:16:34 +01:00
Kristian Flikka
3cbc7ea1a0 Made getCompletions const 2014-01-27 14:40:59 +01:00
Joakim Hove
1ba278022a Have added ReservoirRates to well injector. 2014-01-24 13:24:22 +01:00
Joakim Hove
1cc38786dc Renamed well->InjectionRate to SurfaceInjectionRate. 2014-01-24 12:36:45 +01:00
Kristian Flikka
6229fd1250 Added functionality to get vector containing active / all wells 2014-01-22 14:40:10 +01:00
Kristian Flikka
bd74a32c89 Added dimension to WELSPECS REF_DEPT, updated usage to query for SI 2014-01-21 10:10:05 +01:00
Kristian Flikka
3537de2209 Removed unused includes 2014-01-20 15:02:21 +01:00
Kristian Flikka
d09975e142 Introducing WELSPECS data in constructor to Wells. Throws if WELSPECS with different data for an existing well occurs 2014-01-20 14:52:30 +01:00
Joakim Hove
99542f6685 Added dimensions to GCONINJE / GCONPROD / WCONINJE / WCONINJH. 2013-12-16 17:23:46 +01:00
Joakim Hove
65c9882b53 Added dimensions to WCONHIST & WCONPROD. 2013-12-16 00:02:47 +01:00
Joakim Hove
7ea0bb8e53 Changed getDouble() -> getRawDouble throughout. 2013-12-10 14:16:54 +01:00
Joakim Hove
7619067e7a Merge pull request #61 from flikka/shared-ptr
Removed use of boost::shared_ptr, replaced with std::shared_ptr
2013-12-02 04:19:34 -08:00
Kristian Flikka
1d0135da5e Removed use of boost::shared_ptr, replaced with std::shared_ptr 2013-12-02 13:07:01 +01:00
Kristian Flikka
d3c89752e6 Changed initialization order in Schedule. Throws exception if time map is not created when adding group 2013-12-02 11:47:14 +01:00
Joakim Hove
e75bb7e968 Changed createTimeStep -> creationTimeStep for readability. 2013-11-27 14:21:23 +01:00
Joakim Hove
db274060e4 Will create and delete Group <-> Well relationships based on the WELSPECS keyword. 2013-11-26 12:48:20 +01:00
Joakim Hove
e8d9159a74 Added createTimeStep to Group constructor to keep track of group creation time 2013-11-25 16:31:44 +01:00
Joakim Hove
ea4f5df5ea Added createStep flag to Well constructor to be able to track well creation time. 2013-11-25 16:25:57 +01:00
Joakim Hove
26edb7735b Added groupName as a DyanmicState<std::string> property of the Well class 2013-11-25 16:06:10 +01:00
Joakim Hove
ffef620df3 Implemted Group with external WellSet class. 2013-11-22 22:35:15 +01:00
Joakim Hove
581ccb21dc Added new WellSet class - just a thin wrapper around std::map 2013-11-22 22:34:44 +01:00