Commit Graph
1152 Commits
Author SHA1 Message Date
Bård Skaflestad 3ad7771306 EclipseState Unit Test: Don't Leak Memory
The construction

    Parser parser(new Parser{})

effectively ends up calling the constructor

    Parser::Parser(bool)

which, besides leaking memory, is typically not what we want.
2019-10-26 18:22:52 -05:00
Bård Skaflestad 2558320aa3 UDQ Unit Test: Don't Create Dangling References
This fixes an issue identified by Address Sanitizer.
2019-10-26 18:18:38 -05:00
Bård Skaflestad 3b9ea5dcd8 Consume Owning Raw Pointers in Smart Pointers
This fixes several memory leaks identified by Address Sanitizer.
2019-10-26 18:17:19 -05:00
Joakim Hove 390a29d425 Merge pull request #1164 from stefoss23/deckkeyword_vector_unit
DeckKeyword w/ vectors: takes numpy vectors.
2019-10-25 12:07:34 +02:00
Joakim Hove 0fb92e9121 Merge pull request #1157 from joakim-hove/udq-token-types
Udq token types
2019-10-25 11:58:08 +02: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
Kai Bao b9bc222e81 addressing reviewing comments from PR #1068 2019-10-24 23:01:34 +02:00
Kai Bao 3691c6e724 an aquifer connection need to between active and inactive cells
unless we specify we want to have aquifer within the inner cell of the
reservoir.
2019-10-24 22:01:28 +02:00
Joakim Hove 7e2d45cf66 Export all UDQTokens in use from UDQDefine 2019-10-24 16:51:15 +02:00
Joakim Hove a9a7166e3d Merge pull request #1153 from joakim-hove/move-fluxnum
Moved FLUXNUM to GRID section
2019-10-24 09:42:28 +02:00
Joakim Hove 0421173686 Merge pull request #1152 from joakim-hove/deckkeyword-unit
Deckkeyword unit
2019-10-24 08:43:18 +02:00
Joakim Hove d7a52167f3 Moved FLUXNUM to GRID section 2019-10-24 08:39:53 +02:00
Joakim Hove 6525a7b19f Merge pull request #1143 from joakim-hove/box-data-index
Add data_index to Box::index_list
2019-10-24 07:17:57 +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
Steinar Foss 1a8e9979d8 BOX keyword: using defaultApplied.
moved failed box-test from python to cpp.

setKeywordBox: using defaultApplied rather than hasvalue.

EclipseStateTEsts. TextBox: use 1* instead of *.

corrected box_bug.
2019-10-23 15:47:25 +02:00
Joakim Hove cadadbde4d Merge pull request #1145 from joakim-hove/properties-testdata
Properties testdata
2019-10-22 17:18:48 +02:00
Joakim Hove fb63f61385 Merge pull request #1141 from joakim-hove/formatted-inf
Formatted inf
2019-10-22 08:25:16 +02:00
Joakim Hove 1af3ab2008 Merge pull request #1142 from joakim-hove/multz-edit
Multiply MULT(XYZ) keywords in the EDIT section
2019-10-22 08:24:32 +02:00
Joakim Hove f81a84da42 Update testdata for a stricter 3D property parser
- Keywords should have correct number of elements
 - Should be in the correct section
2019-10-22 08:23:00 +02:00
Atgeirr Flø Rasmussen cf26ecac5e Merge pull request #1138 from bska/transpose-density-table
TAB Vector (INIT): Store Phase Density Data By Columns
2019-10-21 23:06:27 +02:00
Joakim Hove 2f8916392c Merge pull request #1144 from GitPaean/converting_aquifer_test_unix
converting AquanconTests.cpp to be unix format.
2019-10-21 18:27:19 +02:00
Kai Bao 18564a465c converting AquanconTests.cpp to be unix format. 2019-10-21 17:00:12 +02:00
Joakim Hove 1ad4a03ac1 Add data_index to Box::index_list 2019-10-21 15:45:39 +02:00
Joakim Hove 5741ff8034 Multiply MULT(XYZ) keywords in the EDIT section 2019-10-21 11:53:09 +02:00
Joakim Hove abb70835fb Read and write formatted representations of NAN and INF 2019-10-21 09:29:13 +02:00
Joakim Hove 33e72c2a77 Slightly more relaxed conversion of formatted double string 2019-10-21 09:24:03 +02:00
Joakim Hove 08d6888992 Remove trailing whitespace 2019-10-21 09:24:03 +02:00
Bård Skaflestad 18a840edba Add Unit Tests for Density Table Output 2019-10-21 00:16:30 -05: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 b47d808416 Merge pull request #1116 from akva2/fix_expl_constructor_gcc5
fixed: build using gcc 5 (ubuntu xenial)
2019-10-17 12:54:10 +02:00
Joakim Hove 8bed569f7e Merge pull request #1021 from joakim-hove/use-parser-dimensions
Use parser dimensions
2019-10-17 11:34:49 +02:00
Arne Morten Kvarving c06d5912ea fixed: build using gcc 5 (ubuntu xenial)
the tuple-from-initializer-list constructor is explicit.
2019-10-17 09:49:15 +02:00
Bård Skaflestad d1db2ec396 Reimplement test_Restart in Terms of TimeStampUTC
Only affects the 'first_sim()' helper function.
2019-10-16 20:03:08 -05:00
Bård Skaflestad 7eec899130 Reimplement test_EclipseIO in Terms of TimeStampUTC
Mostly just to provide a simple overload of the utility function

    ecl_util_make_date

from libecl.  The rest of the test code remains intact.
2019-10-16 20:03:08 -05:00
Bård Skaflestad 7e160cb99a Reimplement ScheduleTests in Terms of TimeStampUTC
Note that we have to reduce the year-range in the specific test

    createDeckWithDRSDTthenDRVDT

in order not to wrap around for system_clock.  This is a deficency of
the new time-service protocol.
2019-10-16 20:03:08 -05:00
Bård Skaflestad 428d4c41f0 Reimplement TimeMap in Terms of TimeStampUTC 2019-10-16 20:03:08 -05:00
Bård Skaflestad 4e3693896e Reimplement 'test_EclipseIO' in Terms of Opm-Common Classes
In particular, use EGrid, ERst and EclFile as appropriate.
2019-10-16 20:03:08 -05:00
Joakim Hove 693181187c Adapt to new DeckKeyword constructor 2019-10-16 21:40:31 +02:00
Joakim Hove 697545cf54 Use dimensions from ParserKeyword 2019-10-16 21:03:02 +02:00
Arne Morten Kvarving 2253448eed remove unused variables 2019-10-16 16:07:29 +02:00
Torbjørn Skille e36e87ccde Update of ESmry, now supporting non-unified result files. 2019-10-15 09:23:40 +02:00
Joakim Hove 7b55f10dc0 Merge pull request #1051 from joakim-hove/remove-props-iget
Remove index access to GridProperty<T>
2019-10-15 07:53:38 +02:00
Joakim Hove 1ff41de3eb Avoid use of include/ directory in test data 2019-10-14 15:46:02 +02:00
Jostein Alvestad 5d54d1a2fe change to avoid error in test_AggregateIntehead 2019-10-14 15:46:02 +02:00
Jostein Alvestad 84300d19f3 changes to avoid warnings in compilation 2019-10-14 15:46:02 +02:00
Jostein Alvestad 7973585db0 Initial work to add Actionx data to Eclipse compatible restart file
further changes to Actionx - restart

further changes for Actionx data to Restart file

additional changes to output Actionx data to Restart file

add test data for UDQ-ACTIONX

changes to add unit tests for InteHead - Actionx

Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file

changes to add ZLACT to restart output

Further changes - add ZACN - prelim

further changes to add ZACN to restart file

Additional changes to output IACN and SACN to restart

further changes to add IACN and SACN to the restart file

further changes to make unit tests for Actionx data / keywords

further changes to actionx restart and unit tests therefore

Added code for unit tests - not finished

some changes to correct for changes in upstream/master

changes correct errors in IACN and SACN

Initial work to add Actionx data to Eclipse compatible restart file

further changes to Actionx - restart

further changes for Actionx data to Restart file

additional changes to output Actionx data to Restart file

add test data for UDQ-ACTIONX

changes to add unit tests for InteHead - Actionx

Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file

changes to add ZLACT to restart output

Further changes - add ZACN - prelim

further changes to add ZACN to restart file

Additional changes to output IACN and SACN to restart

further changes to add IACN and SACN to the restart file

further changes to make unit tests for Actionx data / keywords

further changes to actionx restart and unit tests therefore

Added code for unit tests - not finished

some changes to correct for changes in upstream/master

changes correct errors in IACN and SACN

changes to avoid change in output data for restart file

further changes to avoid change in RESTART data

minor change to avoid data change in Restart file
2019-10-14 15:45:24 +02:00
Bård Skaflestad 662e44683c INTEHEAD Test: Initialize Maximum Number of Wells in Field
Fixes a warning about missing initializers.
2019-10-14 06:14:09 -05:00
Bård Skaflestad 411da1d8a5 Make 'test_Restart' Mostly Independent of libecl
In particular, swith to using class EclIO::ERst to read the files
produced by RestartIO::save().
2019-10-14 06:13:38 -05:00
Bård Skaflestad 3802b4574a Make 'test_Summary' Independent of LibeECL
This commit switches the 'test_Summary' unit test to use class ESmry
for inspecting the values output to disk by 'out::Summary'.  As a
consequence, we are not able to verify units of measure for the
parameters, at least not for the time being.  Moreover, class ESmry
exclusively uses the "i,j,k" sub-key for block-related parameters so
switch those to reference the IJK identifiers.

Finally, as class ESmry currently does not support reading separate
(multiple) summary files, switch the input decks to generate unified
output.
2019-10-14 06:13:38 -05:00