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

6709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
5741ff8034 Multiply MULT(XYZ) keywords in the EDIT section 2019-10-21 11:53:09 +02:00
Bård Skaflestad
18a840edba Add Unit Tests for Density Table Output 2019-10-21 00:16:30 -05:00
Bård Skaflestad
af97eaf821 TAB Vector (INIT): Store Phase Density Data By Columns 
Specifically, store oil density values for every region before water
density values for every region, and gas density values after water
density values for every region.

This is the format expected in ECLIPSE's INIT file, and used by
ResInsight's fall-back flux calculator mode for flow diagnostics.
 2019-10-20 23:25:57 -05:00
Joakim Hove
737b2127d8 Merge pull request #1100 from totto82/convertTargets 
convert targets.
 2019-10-20 17:50:25 +02:00
Joakim Hove
4fabb7b486 Merge pull request #1122 from joakim-hove/location 
Add small struct DeckKeyword::Location to simplify error reporting
 2019-10-19 23:30:43 +02:00
Joakim Hove
d3f33882b9 Merge pull request #1128 from joakim-hove/exc-warning 
Exc warning
 2019-10-19 22:34:15 +02:00
Joakim Hove
2534bbe0a3 Merge pull request #1123 from blattms/fix-unused-parameter-oython 
Fixed unused parameter warning in PythonInterp.hpp
 2019-10-19 20:13:14 +02:00
Markus Blatt
5584d6bb0a Fixed unused parameter warning in PythonInterp.hpp 2019-10-18 08:36:28 +02:00
Joakim Hove
e7e25beea5 Use const& to avoiw warnings 2019-10-18 08:34:12 +02:00
Joakim Hove
0c50d96ed0 Remove trailing whitespace 2019-10-18 08:32:49 +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
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
Tor Harald Sandve
d1d665c343 Convert targets. Tested on simple problems. 2019-10-17 11:33:17 +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