Commit Graph

81 Commits

Author SHA1 Message Date
Joakim Hove
b0a12b230e Internalize first output step for restart and RFT. 2016-03-28 18:47:30 +02:00
Jørgen Kvalsvik
f404828d63 Cleans up headers to improve build preformance
This is an effort to improve build performance.  Several includes
scattered across the project are either unused or partially used (i.e.
just used to import a type name, not depending on the actual contents of
the header file).

Replaces a lot of these includes with forward declarations.
2016-01-21 09:22:06 +01:00
Kai Bao
8a0c8838f8 moving the SegmentSet processing to class SegmentSet. 2015-11-09 12:14:09 +01:00
Kai Bao
65e75f2243 using SegmentSetConstPtr and SegmentConstPtr 2015-11-09 12:14:09 +01:00
Kai Bao
bc2f7f1808 deleting m_is_multi_segment from Well
which should have been done when fixing the isMultiSegment() function.
2015-11-09 12:14:09 +01:00
Kai Bao
ec2d33fdae deleting all the length_x and length_y related.
They are not used for simulation and we are not supporting plotting for
the moment.
2015-11-09 12:14:09 +01:00
Kai Bao
1dc7aa92ff revising function isMultiSegment() and numberSegment() 2015-11-09 12:14:09 +01:00
Kai Bao
b99540228c deleting the depth checking in addSegmentSetINC 2015-11-09 12:14:09 +01:00
Kai Bao
a8eb2b2970 revising function addSegmentSetABS 2015-11-09 12:14:09 +01:00
Kai Bao
2ed7e5985d adding addSegmentSet() to Well 2015-11-09 12:12:39 +01:00
Kai Bao
157c86ea39 adding the multi-segment related member to Well. 2015-11-09 12:12:39 +01:00
Tor Harald Sandve
abe925ff2f Add method Well::canOpen(currentStep) and use it in Schedule 2015-11-09 09:52:23 +01:00
Joakim Hove
90c55b0257 Drop BHP control when producer <-> injector. 2015-10-29 12:49:30 +01:00
Joakim Hove
ce9727b337 Added method for change injector <-> producer.
Will reset producer BHP limit to zero when changing to an injector, and
visa versa.
2015-10-28 17:13:34 +01:00
Tor Harald Sandve
9665b54ad3 Add flag allowCrossFlow()
This PR adds support for item 10 in welspecs where a flag is used to
determine whether the well should allow cross flow or not.

A test is added to check default behavior.
2015-10-06 15:47:07 +02:00
chflo
2cf06a2a4f OPM-222: Support COMPORD: Added comporder property to Well class 2015-08-31 18:57:38 +02:00
Tor Harald Sandve
ef4a9c43e0 Remove unused function 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
d926dd0eb7 Simplify by removing WellSolventProperties structure 2015-08-05 11:38:33 +02:00
Tor Harald Sandve
dab5172912 Adding support for changing WSOLVENT during simulations 2015-08-05 11:38:33 +02:00
Joakim Hove
44ba386bcc Add events from Schedule::iterateScheduleSection() 2015-07-24 12:40:50 +02:00
Joakim Hove
bc3b9837e0 Renamed DynamicState::add() -> Dynamicstate::update() 2015-07-24 12:40:47 +02:00
Robert K
05af9e32b7 remove warnings, that is:
sizeType --> p_sizeType since it shadows a member method
trailing ;
comparison of signed and unsigned int
2015-02-13 14:19:24 +01:00
Fredrik Gundersen
9d0ef9d318 Update to method names and text 2015-02-12 08:30:48 +01:00
Fredrik Gundersen
a41bc4ce18 Cleanup after merge 2015-02-06 15:02:38 +01:00
Fredrik Gundersen
88274cff6e Merge remote-tracking branch 'upstream/master' into OPM-158
Conflicts:
	opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
	opm/parser/eclipse/EclipseState/Schedule/Well.cpp
2015-02-06 15:00:30 +01:00
Fredrik Gundersen
9a9d7ea053 Updated Well class to support RFT and PLT 2015-02-06 14:53:38 +01:00
Atgeirr Flø Rasmussen
79f32521ed Make Well class order completions when added. 2015-01-26 16:40:32 +01:00
Atgeirr Flø Rasmussen
0a6cf17431 Fix initialization order to avoid warning. 2015-01-26 16:38:17 +01:00
Joakim Hove
1bf6e90e02 Removed query function for default on well ref.depth. 2015-01-26 12:26:24 +01:00
Joakim Hove
d8f7c9660c Added simple algorithm to get ref depth from completions. 2015-01-26 12:26:24 +01:00
Joakim Hove
8d506b01a1 Added grid property to Well class 2015-01-26 12:21:51 +01:00
Joakim Hove
37aebbd3f5 Using Value<double> for Well::m_refDepth 2015-01-26 12:21:50 +01:00
Fredrik Gundersen
4f066af438 Moved logic from schedule to well->setStatus
Only set status for well to open if well has open completions is now verified for all
2015-01-21 14:07:02 +01:00
Fredrik Gundersen
94b33eaf6e Rename method 2015-01-14 11:41:32 +01:00
Fredrik Gundersen
2f9d5f9e65 added method to enable add of completionset 2015-01-13 11:24:31 +01:00
Andreas Lauser
ea38a25af4 remove all trailing white space
this is just the result of

```
find -iname "*.[ch]pp" | xargs sed -i "s/ *$//"
find opm/parser/share/keywords -type f |  xargs sed -i "s/ *$//"
```

so if it causes conflicts with other patches, the others should get
priority. The rationale behind this patch is that some people tell
their editor to remove white space which leads to larger than
necessary patches...
2014-12-08 16:34:28 +01:00
Liu Ming
94974f0454 add WPOLYMER to schedule section. 2014-11-20 16:20:54 +08:00
Atgeirr Flø Rasmussen
15ee739326 Change Well constructors to avoid explicit bool arg.
Suggested by Joakim Hove.
2014-08-07 16:59:40 +02:00
Atgeirr Flø Rasmussen
ad93424b6a Add refDepthDefaulted field to Well class. 2014-08-07 12:34:49 +02:00
Arne Morten Kvarving
670e8b692b changed: don't use parameter names that conflicts with member function names
quells warnings (with gcc 4.8)
2014-05-15 14:46:16 +02:00
Atgeirr Flø Rasmussen
5a1c345e3f Add preferred phase to Well class.
This entails:
 - Adding a new data member of type Opm::Phase::PhaseEnum.
 - Adding method getPreferredPhase().
 - Adding extra constructor argument.
 - Modifying constructor call in Schedule::addWell().
 - Adding unit test for the new preferredPhase property.
 - Modifying constructor call in all the well unit tests.
2014-04-06 23:11:38 +02:00
Joakim Hove
5785d088ea Added functionality in Completion class to adjust I and J to wellHead value if they have been defaulted (i.e. have value -1). This is unfortunate because we loose quite a lot of const correctness. 2014-03-28 18:56:21 +01:00
Joakim Hove
f84ec0bb3f Made injection and production control variables into property variables. 2014-03-21 00:07:23 +01:00
Atle Haugan
7358ac5d5a Added addProductionControl() method to the WellProductionProperties struct. Same for WellInjectionProperties. 2014-03-20 10:19:20 +01:00
Atle Haugan
87599c9841 Moved has/drop/addProductionControl to WellProductionProperties. The same for WellInjectionProperties. 2014-03-20 10:11:56 +01:00
Atle Haugan
fb5c83086a Moved (duplicated) m_isInPredictionMode to WellProductionProperties and WellInjectionProperties. 2014-03-19 10:51:13 +01:00
Atle Haugan
d9772b83eb Removed unused Well::m_injectionControls, moved m_injectorType to WellInjectionProperties. 2014-03-19 10:42:22 +01:00
Atle Haugan
9c64af0b6b Moved BHPLimits and THPLimits to WellProductionProperties and WellInjectionProperties (duplicated). Several unit tests are still commented out - will fix. 2014-03-19 10:42:21 +01:00
Atle Haugan
3040697ccc Added WellInjectionProperties.InjectionControls. Adjusted som unit tests. Removed some dead code. 2014-03-19 10:40:48 +01:00
Atle Haugan
8aee879dc5 Added WellInjectionProperties, modified Well class to use it 2014-03-19 10:40:07 +01:00