Commit Graph

294 Commits

Author SHA1 Message Date
Jostein Alvestad
c846716044 add variable to hold min value of nonzero uda 2020-06-15 09:55:40 +02:00
Jostein Alvestad
fea794ee17 further corrections of unit tests and code clean up 2020-06-15 09:55:38 +02:00
Joakim Hove
9a4c8f754e Change type of new value argument in WELTARG to UDA 2020-05-04 08:29:34 +02:00
Joakim Hove
0f5fddc470 Merge pull request #1722 from joakim-hove/raw-string-quote
Raw string quote
2020-04-21 13:02:49 +02:00
Joakim Hove
3077f7aff8 Introduce class RawString
The RawString class is introduced as a string which can hold the literals '*',
'/' and '''. The RawString class is used to hold the content of UDQ and ACTIONX
keywords.
2020-04-21 06:51:25 +02:00
Arne Morten Kvarving
78a6854214 fixed: initialize iterators after deserialization 2020-04-20 13:19:55 +02:00
Arne Morten Kvarving
e3bd1e6723 add static method to return a test object for serialization
this allows killing the constructors taking member values
2020-03-23 10:58:15 +01:00
Joakim Hove
6e5cd6c371 Add templated method Deck::count() 2020-03-20 16:59:50 +01:00
Arne Morten Kvarving
ea45dcb01a remove accessors in Deck added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
461e24209d add serialization template to Deck 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
9e37416447 remove accessors in DeckKeyword added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
ae55a7f4d1 add serialization template to DeckKeyword 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
c88e586993 remove accessors in DeckRecord added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
afa466771b add serialization template to DeckRecord 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
c1f5635210 remove accessors in DeckItem added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
40b230473c add serialization template to DeckItem 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
25a90bae6e add serialization template to UDAValue 2020-03-19 09:34:12 +01:00
Joakim Hove
f8c250be34 UDAValue: change from ::reset() to ::operator=() 2020-03-05 13:08:00 +01:00
Joakim Hove
37d31aeac0 Remove UDAValue copy and modify constructor 2020-03-05 13:08:00 +01:00
Joakim Hove
157d3e4279 Add UDAValue constructor which takes dimension 2020-03-05 13:08:00 +01:00
Joakim Hove
3c0c94ff71 Remove stale comment 2020-03-05 13:08:00 +01:00
Torbjørn Skille
07a8c5b015 python bindings, adding support for UDA type 2020-03-02 13:50:57 +01:00
Arne Morten Kvarving
fb75bcd4e2 changed: use std::filesystem instead of boost::filesystem
since we still support g++-7, where filesystem is marked experimental,
we introduce a wrapper header and expose the namespace to use
as Opm::filesystem.

for gcc we unconditionally link with libstdc++fs in the python bindings.
the setup.py stuff links as c code, not c++ code, so it is not
automatically added on any gcc version. this might prove unportable
later.
2020-02-13 12:34:19 +01:00
Arne Morten Kvarving
c4936d55e1 fixed: update UDAValue constructors for new dim member 2020-01-17 10:08:50 +01:00
Joakim Hove
ecd3ffdb49 Add method UDAValue::zero() 2020-01-06 12:05:51 +01:00
Joakim Hove
8f6c2c70f6 UDAalue::get<double>() will return raw value - not SI.
Add new function UDAValue::getSI() which will return SI value of numerical
input, and throw an exception if internal state is not numeric.
2020-01-06 12:05:51 +01:00
Joakim Hove
3c29d4c410 Merge pull request #1385 from akva2/noecl_flush
More serialization preparation
2020-01-03 20:15:31 +01:00
Bård Skaflestad
5fb4d355ec Merge pull request #1383 from joakim-hove/fp-section
Fp section
2020-01-03 11:33:54 +01:00
Arne Morten Kvarving
b0f262374e make Deck constructible from variables
also make it default constructible, add accessors
assignment operator and equality operator
2020-01-03 08:30:42 +01:00
Arne Morten Kvarving
2d750b1b0b make DeckKeyword constructible from variables
also make it default constructible and add accessors
2020-01-03 08:28:07 +01:00
Arne Morten Kvarving
bd3923ad1d add accessor to DeckRecord 2020-01-02 15:33:41 +01:00
Arne Morten Kvarving
3105799f0f make DeckItem constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-02 15:31:27 +01:00
Joakim Hove
141000b750 FieldProps parsing is section aware - handle MULT in EDIT 2020-01-02 15:27:22 +01:00
Joakim Hove
8cba2777cd Add Section enum 2020-01-02 15:27:22 +01:00
Joakim Hove
90d30e3bc9 Rename class Section -> DeckSection 2020-01-02 15:27:22 +01:00
Steinar Foss
87bbc46bbb can parse keywords of type double-record.
...

ParserKeyword: bool double_records set.

added keywords CECONT.

ParserKeywords: double_records set by keyword generator.

Parsertests: added test for parsing double_records.

ParserKeywords.parse: if double_records returns empty.

double_records keywords set to SLASH_TERMINATED.

...

ParserKeyword: for double records size_type = DOUBLE_SLASH_TERMINATED.

double_records: RawKeyword is Raw::DOUBLE_SLASH_TERMINATED.

RawKeyword uses m_isTempFinished.

Parser: can parse files with double-record keywords.

Parser.cpp/RawRecord.cpp: removed comments.

DeckKeyword has param m_isDoubleRecordKeyword.

test ParseDoubleRecords: double records to have linear structure.

DeckKeyword: Can create records of type double_record.

double-records parser test transferred to ParserTests.cpp.

...

...
2019-12-14 18:42:31 +01:00
Arne Morten Kvarving
c68ab70eec remove unused member parser_keyword from DeckKeyword 2019-12-12 16:02:13 +01:00
Joakim Hove
1599cc5698 Differentiate between valid and invalid default values while parsing 2019-12-04 22:36:28 +01:00
Joakim Hove
11ca1194b0 Use enum value::status to keep track of value status in FieldProps 2019-11-20 10:40:51 +01:00
Joakim Hove
6cc3b578f5 Use value::status to keep track of data status in DeckItem
With this commit the DeckItem::push_backDummyDefault() function will push back a
default value T( ). This will give a change in behaviour in downstream code
which has used getData<T> to get DeckItem data unchecked.
2019-11-17 17:23:42 +01:00
Joakim Hove
3156448f99 Add enum value::status to handle the set/unset status of items 2019-11-17 11:18:05 +01:00
Joakim Hove
6dbbc8c037 Remove / rename DeckItem::size() 2019-11-16 18:31:12 +01:00
Steinar Foss
ce3781775f DeckKeyword w/ vectors: takes unit system as arg.
DeckKeyword w/ vector: added unit as arg.

DeckKeyword vector works with units.

DecValuetests: use zcorn instead of poro.

python: deckkweyword works with int data.

...

python deckkeyword. cant init with double array.

moved numpy_array converters to converters.hpp.
2019-10-25 09:31:03 +02:00
Steinar Foss
d05b3323b3 DeckKeyword: constr. with records takes unitsystem args.
Deckkeyword constr w/ records also takes unit_systems.

DeckKeyword w/ records uses input args to get dims.

DeckValue unit system works w/ records.

Deckkeyword w/ records: rearranged default/active unit args.

..

python deckkeywords: workable.

python deckkeyword: testing rewrite.

python deckkeyword w/units: most test work.

...

python support for deckkeyword w/ dimensions.
2019-10-24 07:13:31 +02:00
Joakim Hove
f274257c94 Pass location when constructing DeckKeyword 2019-10-18 08:26:33 +02:00
Joakim Hove
781ced7294 Use struct Location to record file position for keywords 2019-10-17 23:57:01 +02:00
Joakim Hove
2be6235ab7 Add small struct DeckKeyword::Location to simplify error reporting 2019-10-17 23:56:34 +02:00
Joakim Hove
697545cf54 Use dimensions from ParserKeyword 2019-10-16 21:03:02 +02:00
Joakim Hove
233f55c4e2 Update the Deck unitsystem using select method instead of mutable ref. 2019-10-16 21:03:02 +02:00
Joakim Hove
3d94bc6baf Simplify Deck constructors 2019-10-16 21:03:02 +02:00