OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,692 Commits 18 Branches 75 Tags
2be6235ab71e07f43293abeb7e376756a4de2b5b
Commit Graph

6692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
2be6235ab7 Add small struct DeckKeyword::Location to simplify error reporting 2019-10-17 23:56:34 +02:00
Markus Blatt
007abc79f9 Merge pull request #1125 from blattms/fix-memory-error-eclipsegrid-actnum 
Fix memory error during EclipseGrid creation with Actnum.
 2019-10-17 20:24:51 +02:00
Markus Blatt
a3daeb9c45 Fix memory error during EclipseGrid creation with Actnum. 
We pass an int pointer to the function initCornerPointGrid.
With ACTNUM  this pointer was initialized with data pointer
of an int vector that we threw away before the function call
(otherwise it was null). To fix this we move the int-vector up one
scope.
 2019-10-17 19:09:24 +02:00
Joakim Hove
a0d5776eb9 Merge pull request #1119 from stefoss23/add_keywords_M 
Added keywords beginning w/ M.
 2019-10-17 15:06:19 +02:00
Joakim Hove
abbdcc9c6c Merge pull request #1117 from akva2/move_parserkeywords_build 
changed: put the generated ParserKeywords.cpp first in list
 2019-10-17 15:05:59 +02:00
Joakim Hove
65095af82e Merge pull request #1101 from joakim-hove/R 
Add keywords starting with R
 2019-10-17 14:53:22 +02:00
Steinar Foss
f5c1ede8ee Added keywords beginning w/ M. 
added keywords MINPORV, MLANG, MLANGSLV.
 2019-10-17 13:00:28 +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
Arne Morten Kvarving
93ac533373 changed: put the generated ParserKeywords.cpp first in list 
this improves build throughput on jenkins since building this
large file will overlap more with other build tasks.
 2019-10-17 11:40:48 +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
Joakim Hove
60870b0f5a Add keywords starting with R 2019-10-17 11:24:13 +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
Joakim Hove
e815194e21 Merge pull request #1112 from stefoss23/remove_common_state 
Remove common state
 2019-10-17 06:58:25 +02:00
Bård Skaflestad
3ea66e41dc Merge pull request #1107 from bska/decouple-libecl-final 
Decouple OPM Flow From Libecl
 2019-10-16 21:44:53 -05:00
Bård Skaflestad
288be7f0dc Drop libecl From Python Setup 
Suggested by [at]akva2.
 2019-10-16 20:03:08 -05:00
Arne Morten Kvarving
247b5685cc remove libecl from buildsystem, jenkins and packaging 2019-10-16 20:03:08 -05: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
eea51a12b4 Add Simple Time-Service Protocol 
Mostly for converting between std::time_t and broken-down time
stamps.  Uses UTC and std::chrono::system_clock.  May wrap in as
little as 292 years, depending on the period of system_clock.

Intended to replace various timestamping utility functions from
libecl.  A comprehensive time-service protocol for Flow is much more
work than this, and will likely not be easily realized before we
have C++17 and its much expanded time/calendar library.
 2019-10-16 20:03:08 -05:00
Bård Skaflestad
738f98a4ac Defaulted Table Column: Don't Use 'ssize_t' 
Instead, switch to 'int' for the 'before' and 'after' row indices.
The 'ssize_t' Posix type alias is not appropriate for this usage
since its range is only guaranteed to be [ -1 .. (1<<15)-1 ].
 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
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
Joakim Hove
7b35e68221 Merge pull request #1115 from akva2/janitoring 
remove unused variables
 2019-10-16 20:51:58 +02:00
Joakim Hove
5aa3369be6 Merge pull request #1113 from totto82/addEdit 
Apply MULTZ also in the edit section
 2019-10-16 16:12:43 +02:00
Arne Morten Kvarving
2253448eed remove unused variables 2019-10-16 16:07:29 +02:00
Joakim Hove
c8597419e1 Merge pull request #1109 from stefoss23/add_keywords_L 
Added keywords beginning w/ L.
 2019-10-16 15:11:49 +02:00
Tor Harald Sandve
3a3808b204 Apply MULTZ also in the edit section 2019-10-16 14:22:59 +02:00
Steinar Foss
fe8692f623 schedule.cpp: removed unused function. 2019-10-16 14:20:16 +02:00
Steinar Foss
0e5c14568e removed common_state. 2019-10-16 13:59:00 +02:00
Markus Blatt
ae08281927 Merge pull request #1110 from blattms/allow-building-one-by-one-with-installed 
Allow building a module with dependencies installed but source lying …
 2019-10-16 13:50:13 +02:00
Steinar Foss
7d0004f915 added keywords beginning w/ L. 
added keywords LSLTWNUM, LSNUM, LSOGCR.

added keywords LSOWCR, LSWCR, LSWL.

LSWLPC, LSWU, LTOSIGMA.

added keywords LWKRO, LWKRORG, LWKRORW.

added keywords LWKRW, LWKRWR, LWPCW.

LWSLTNUM, LWSNUM, LWSOGCR.

added keywords LWSOWCR, LWSWCR, LWSWL.

added keywords LWSWLPC, LWSWU, LX.

added keywords LY, LZ, MATCORR.

...
 2019-10-16 12:50:23 +02:00
Markus Blatt
a862c14873 Allow building a module with dependencies installed but source lying around. 
If you set CMAKE_INSTALL_PREFIX, have the dependencies installed there, but
the source of them lying around in the parent directory of the build
directory, then the build will fail starting with opm-models because
we assume that ../opm-material is a build directory and set opm-material_DIR
to it. CMake will complain about not finding opm-material-config.cmake or
Opm-materialConfig.cmake. With this commit we will only set opm-material_DIR
if the directory contains a file CMakeCache.txt (which should be the case in
a configured build directory.

Directory outline of the failing situation is
- ${CMAKE_INSTALL_PREFIX} # where all dependencies are installed
- parent_dir
|____ opm-common #source dir
|____ opm-material #source dir
|____ ...
|____ build #build directory for current module (e.g. opm-modules)

Change is tested with sibling build

- build
|___ opm-common #build dir
|___ opm-material #build dir
|___ ...

and the dune version of it

- parent_dir
|___ opm-common # source dir
    |____ build # build dir opm-common

|___ opm-material # source dir
    |____ build # build dir opm-material
...
 2019-10-16 12:38:51 +02:00
Joakim Hove
b5ab3e2047 Merge pull request #1092 from tskille/ESmry 
Updates of ESmry - now supporting non-unified result files.
 2019-10-15 23:02:02 +02:00
Joakim Hove
0f03777b16 Merge pull request #1106 from joakim-hove/setup-test-fixup 
Fix spelling error
 2019-10-15 09:51:50 +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
1bab7f7aa3 Fix spelling error 2019-10-15 08:11:04 +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
01c5fe9d1d Merge pull request #1105 from joakim-hove/python-util-rm 
Use absolute import for test util
 2019-10-15 06:51:54 +02:00
Joakim Hove
2c6d1e0e37 Use absolute import for test util 2019-10-15 00:39:13 +02:00
Joakim Hove
5269f52291 Merge pull request #1075 from joakim-hove/python-install 
Add Python copy/install hack
 2019-10-14 18:46:48 +02:00
Joakim Hove
8c417a51e6 Merge pull request #1098 from joakim-hove/actionx-rst 
Actionx rst
 2019-10-14 18:00:21 +02:00
Joakim Hove
368910a7c2 Merge pull request #1099 from stefoss23/add_keywords_I 
Added keywords beginning w/ I, J, K and L.
 2019-10-14 18:00:07 +02:00
Joakim Hove
583ac5a756 Merge pull request #1094 from blattms/default-constructable-restartkey 
Make RestartKey default contructable.
 2019-10-14 17:29:31 +02:00
Joakim Hove
ce2d8ce211 Merge pull request #1090 from joakim-hove/S 
Add S keywords up to SURFST
 2019-10-14 16:27:33 +02:00
Joakim Hove
7dc77d1ca3 Install PYTHON Modules when running jenkins 2019-10-14 15:53:31 +02:00