Kristian Flikka
666ba3e607
Temporary revert and test removal - pending float/double cleanups
2014-04-04 15:39:29 +02:00
Kristian Flikka
029e461cd4
Desperate fix for build dependency on generated source file
2014-04-04 15:33:36 +02:00
Joakim Hove
71edc6336a
Merge pull request #164 from atgeirr/remove-wrong-constructor
...
Deleted unneeded default constructor.
2014-04-04 14:35:14 +02:00
atleh
9d1d161def
Merged CMake conflicts
2014-04-04 13:39:11 +02:00
atleh
07809cae2e
Ready for merge?
2014-04-04 12:04:21 +02:00
atleh
02a915ba2d
Adjustments in createDefaultKeywordList
2014-04-04 12:02:40 +02:00
atleh
25a5578677
Fixed bug regarding dump file usage in createDefaultKeywordList
2014-04-04 12:02:40 +02:00
atleh
c21a667f0e
Some adjustments to createDefaultKeywordList. Not complete.
2014-04-04 12:02:40 +02:00
atleh
bd150b5684
Marked parameter as const
2014-04-04 12:02:40 +02:00
atleh
a6cd64afb7
added support for dump files in createDefaultKeywordList.cpp
2014-04-04 12:02:40 +02:00
atleh
47713c7a00
createDefaultKeywordList - minor refactoring
2014-04-04 12:02:40 +02:00
atleh
0505c0a9ca
createDefaultKeywordList now able to generate dump file.
2014-04-04 12:02:40 +02:00
Atgeirr Flø Rasmussen
2df1761922
Deleted unneeded default constructor.
...
Its implementation was buggy, initialising references to temporary objects.
2014-04-04 10:05:04 +02:00
Joakim Hove
3087f33fd8
Merge pull request #155 from andlaus/schedule_trim_names
...
schedule: do not let us be disturbed by leading or trailing white space in names
2014-04-03 20:22:10 +02:00
atleh
77e47433a7
Ready for merge?
2014-04-03 15:18:55 +02:00
Andreas Lauser
2a9111b9d2
Schedule: trim strings which are received from the deck
...
for SPE-9 only the well/group names contain spurious white space, but
I suppose that other decks also feature them in control modes, status,
etc. so it's probably a good idea to trim these as well...
2014-04-03 14:55:38 +02:00
Andreas Lauser
debe11a8f3
DeckItem: introduce getTrimmedString()
...
which is like getString() but with the leading and trailing white
space removed. It is intended for names which seem to not care about
such white space in Eclipse.
2014-04-03 14:32:25 +02:00
atleh
8b5bcf7947
Adjustments in createDefaultKeywordList
2014-04-03 14:16:08 +02:00
atleh
b96273a0f0
Fixed bug regarding dump file usage in createDefaultKeywordList
2014-04-02 15:17:18 +02:00
atleh
3429b1d93e
Some adjustments to createDefaultKeywordList. Not complete.
2014-04-02 11:47:23 +02:00
atleh
4d495ed94e
Marked parameter as const
2014-04-01 13:38:22 +02:00
Joakim Hove
9c29c00c2b
Added ability to create EclipseGrid from cornerpoint keywords.
2014-04-01 09:06:43 +02:00
Joakim Hove
edde68fa6a
Added float data accessors.
2014-04-01 09:05:33 +02:00
atleh
cd20741415
added support for dump files in createDefaultKeywordList.cpp
2014-04-01 08:52:07 +02:00
atleh
77cb3e844f
createDefaultKeywordList - minor refactoring
2014-03-31 14:26:35 +02:00
atleh
a3b8b57445
createDefaultKeywordList now able to generate dump file.
2014-03-31 14:25:45 +02:00
Joakim Hove
8b0acc2242
Added class EclipseGrid with constructor for cartesian grid from deck.
2014-03-31 14:19:34 +02:00
Joakim Hove
df7244418f
Added ERT dependency in build of opm-parser.
2014-03-31 14:18:05 +02:00
Joakim Hove
6c9d03258e
Added getKeyword() method to Section class.
2014-03-28 19:09:56 +01: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
a141d7722b
Added missing #include <iostream> in two tests.
2014-03-25 12:34:48 +01:00
atleh
ec22c39f5c
Minor adjustments in Section[Tests], Schedule and KeywordContainerTests
2014-03-25 09:26:43 +01:00
atleh
d761081d96
Commented out failing assert in KeywordContainerTests
2014-03-25 07:29:51 +01:00
atleh
73df57b920
Added some iterator support in KeywordContainer and Section. Not finished.
2014-03-24 18:55:35 +01:00
atleh
a4b8c08c0e
Some code cleanup in XyzSection classes
2014-03-24 14:56:20 +01:00
atleh
7225ee8f90
First version of XyzSection classes implemented - based on Section class
2014-03-24 14:48:23 +01:00
atleh
0e9cd5ff33
Some more logic added to the Section class
2014-03-24 10:05:22 +01:00
atleh
0d3f74986a
Added a few tests
2014-03-21 15:40:44 +01:00
atleh
14507208d5
Added first version of Section class
2014-03-21 14:39:24 +01:00
Joakim Hove
5b51d306be
Merge pull request #143 from AtleH/OPM-68
...
Opm 68
2014-03-21 00:46:21 +01:00
Joakim Hove
f84ec0bb3f
Made injection and production control variables into property variables.
2014-03-21 00:07:23 +01:00
Joakim Hove
011eb8a2c6
camelCased property attributes in the production and injection properties structures.
2014-03-20 23:27:18 +01:00
Atle Haugan
62f2a16496
Fixed unit tests after rebase/merge
2014-03-20 10:56:28 +01:00
Atle Haugan
eae65c3da3
Added unit tests
2014-03-20 10:43:21 +01:00
Atle Haugan
cfea44d264
Fixed implementation of getXyzProperties() - now returning correct reference to original object. Unit test still missing.
2014-03-20 10:43:21 +01:00
Atle Haugan
3daaf827c9
Renamed getXyzProperties to getXyzPropertiesCopy. Added new getXyzProperties which currently does not work...
2014-03-20 10:36:57 +01:00
Atle Haugan
af784c6734
Enabled the remaining tests.
2014-03-20 10:31:21 +01:00
Atle Haugan
2058bb5789
Re-activated the old tests.
2014-03-20 10:26:44 +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
