Commit Graph

455 Commits

Author SHA1 Message Date
chflo
c365ca2c06 Tests for GEFAC keyword and WCONPROD GRUP controlmode option 2016-01-25 11:32:09 +01:00
chflo
3f266d02b7 Internalize GEFAC keyword 2016-01-25 11:32:08 +01:00
chflo
cc2b7f5f50 Support GRUP controlmode in wellProductionProperties if well is available for group control 2016-01-25 10:47:22 +01:00
Jørgen Kvalsvik
04900a4bb6 ParserKeywords.hpp -> ParserKeywordsX.hpp
To reduce compiler stress and be more explicit w.r.t. dependencies, all
files now includes only the keywords they need, instead of the
collection of all files.
2016-01-21 09:25:58 +01: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
Joakim Hove
a85bac0034 Changes in const'ness 2015-12-21 15:30:14 +01:00
Joakim Hove
9346824756 ScheduleEnum will accept 'WAT' for 'WATER'. 2015-11-27 11:02:41 +01:00
Atgeirr Flø Rasmussen
0f005b8c68 Use warning suppression headers to avoid warnings from boost. 2015-11-26 10:44:22 +01:00
Kai Bao
33302f6edb moving the multi-segment related to MSW directory. 2015-11-12 12:28:08 +01:00
Kai Bao
97d969839f adding getFromIJK() for CompletionSet 2015-11-12 12:28:08 +01:00
Kai Bao
672d517aa2 using ParserKeywords::COMPSEGS for keywords parsing 2015-11-12 12:28:08 +01:00
Kai Bao
247a82caa1 not internalizing end_IJK. 2015-11-12 12:28:08 +01:00
Kai Bao
626309e8aa adding comments about the branch number. 2015-11-12 12:28:08 +01:00
Kai Bao
e094201097 adding attachedToSegment() to Completion. 2015-11-12 12:28:08 +01:00
Kai Bao
44e61fe620 adding attachSegment() for Completion
removing setSegmentNumber() and setCenterDepth()
2015-11-12 12:28:08 +01:00
Kai Bao
742ba0e14f remvoing the thermal length related processing.
and removing the defaulted 0 value in the keyword definition.
2015-11-12 12:28:08 +01:00
Kai Bao
e90c5b11bb correcting the typo in Schedule
handleWELSEGS to handleCOMPSEGS
2015-11-12 12:28:08 +01:00
Kai Bao
c9a691ce55 throw exectpion when specifying negative value for completion depth 2015-11-12 12:28:08 +01:00
Kai Bao
e14d3f6ba1 adding function handleCOMPSEGS()
there are some other small changes to make the compilation work.
2015-11-12 12:28:08 +01:00
Kai Bao
030de17a20 adding updateCompletionsWithSegment() to Compsegs 2015-11-12 12:28:08 +01:00
Kai Bao
f5b3cc3a8a adding processCOMPSEGS() for Compsegs
Determing the related segments for completions and calculating the depth
with segment depth.
2015-11-12 12:28:08 +01:00
Kai Bao
e634fa7c07 adding member variables and functions for segment processing. 2015-11-12 12:28:08 +01:00
Kai Bao
fe50050e0e adding the structure Compsegs
limitations for now:
1.  The input with a range is not supported yet.
2.  More than one completion for a segment is not supported yet.
3.  Calculating distance based on thickness of grid block is not supported yet.
4.  Calculting completion depth based on COMPDAT is not supported yet.
2015-11-12 12:28:07 +01:00
Kai Bao
9a5cb7e9dd handling both HO and H0 for mutliphase model input
to fix a failed test.
2015-11-11 09:33:30 +01:00
Tor Harald Sandve
192f7f698c Rename from HO to H0 2015-11-10 15:20:22 +01:00
Kai Bao
ecb0186a08 using const std::string& for well_name and fix CMakeLists.txt
The problem for CMakeLists.txt is from the re-basing process.
2015-11-09 14:09:31 +01:00
Kai Bao
2737a5be31 beginning from the second segment in processINC().
Correcting the typo, although the original version will not cause any
problem. It is good to keep the information consistent.
2015-11-09 13:14:33 +01:00
Kai Bao
a3ddad5645 changing length to total_length to for more correct meaning. 2015-11-09 12:14:09 +01:00
Kai Bao
533de71d64 introducing setDepthAndLength() for Segment
and removing setDepth(), setLength() and setDataReady().
2015-11-09 12:14:09 +01:00
Kai Bao
3492794974 revising processINC() based on re-ordering information. 2015-11-09 12:14:09 +01:00
Kai Bao
544247dd9e revising SegmentSet::processABS() based on re-ordering. 2015-11-09 12:14:09 +01:00
Kai Bao
a27417c1da adding orderSegments() to SegmentSet. 2015-11-09 12:14:09 +01:00
Kai Bao
59d493acef introducing static invalid_value for Segment 2015-11-09 12:14:09 +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
22bba05754 deleting one unnecessary SegmentSet::numberToLocation() 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
e8ce831fcc removing unuseful setXXX functions in Segment. 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
c59aff430f correcting the typo in Presure 2015-11-09 12:14:09 +01:00
Kai Bao
b39866ce74 deleting Segments() function from SegmentSet 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
4c617e76ac revising segmentsFromWELSEGSKeyword for better readability. 2015-11-09 12:14:09 +01:00
Kai Bao
2d0b5d8237 changing getRawDouble to getSIDouble in SegmentSet. 2015-11-09 12:12:39 +01:00
Kai Bao
2ed7e5985d adding addSegmentSet() to Well 2015-11-09 12:12:39 +01:00
Kai Bao
3e9320fc31 adding function handleWELSEGS to Schedule. 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
Kai Bao
3e896fbeda removing the dependence on NLBRMX and NSEGMX
which is for Fortran style memory management. Although it can also be
good for preventing people from giving too random branch numbers and
segment numbers.
2015-11-09 12:12:39 +01:00