OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,300 Commits 18 Branches 75 Tags 73 MiB
1ffbfded8e
Commit Graph

10300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
3a733bda6f Add EclipseConfig::rst_cmp() 2021-04-08 09:01:19 +02:00
Joakim Hove
10c8b96fe0
Merge pull request #2414 from bska/write-active-network-only 
Output Network Arrays Only if Network is Active
 2021-04-07 22:37:51 +02:00
Joakim Hove
7c9fff256c Add const to AquiferConfig::operator==() 2021-04-07 17:52:25 +02:00
Bård Skaflestad
8a72a34ba5 Output Network Arrays Only if Network is Active 
This fixes a real field case in which the network is only activated
(keywords BRANPROP and NODEPROP) fairly late in the simulation run.
 2021-04-07 16:46:00 +02:00
Atgeirr Flø Rasmussen
659580d749
Merge pull request #2412 from joakim-hove/ep-optional 
Use std::optional and value objects instead of std::shared_ptr
 2021-04-07 16:20:31 +02:00
Joakim Hove
be451c0ccd
Merge pull request #2413 from bska/fix-missing-initializer 
Initialise All Well Table Dimensions
 2021-04-07 15:22:05 +02:00
Markus Blatt
62b202e85c Stop pretending that we support CMake 2.8 
We actually already require at least CMake 2.8.12 due to the embedded
pybind11 (some tests of it are even at 3.0). Anyway as Ubuntu LTS has
3.10.2 I doubt that anything less is tested by us.
 2021-04-07 13:56:03 +02:00
Bård Skaflestad
4d4a6b700d Initialise All Well Table Dimensions 
Including the maximum number of well lists per well and maximum
dynamic well lists added in commit 278cd0a24 (PR #2368).
 2021-04-07 13:50:28 +02:00
Joakim Hove
ce5f0757df
Merge pull request #2411 from joakim-hove/jfunc-optional 
Use std::optional instead of std::shared_ptr to manage JFunc
 2021-04-07 13:40:44 +02:00
Joakim Hove
ec0ca7bd6d
Merge pull request #2410 from blattms/fixes-debian-1 
Fixes from the debian packages
 2021-04-07 10:29:19 +02:00
Joakim Hove
d33e6ba8ef Remove TableManager copy constructor and operator= 2021-04-07 09:31:25 +02:00
Joakim Hove
c55f761905 Use std::optional and value objects instead of std::shared_ptr 2021-04-07 09:13:53 +02:00
Joakim Hove
0d4a514c90 Use std::optional instead of std::shared_ptr to manage JFunc 2021-04-07 08:37:12 +02:00
Markus Blatt
3fd76f9c26 Fixes include paths in pkg-config files (at least in Debian). 
Previously we ended up with "-I -I/cjson" for
"/usr/include;/usr/include/cjson" in opm-common_INCLUDE_DIRS.

Gbp-Pq: Name 0008-Fixes-include-paths-in-pkg-config-files-at-least-in-.patch
 2021-04-06 22:57:00 +02:00
Markus Blatt
6895ee4959 Install CMake files below share/opm with USE_SOURCE_PERMISSIONS. 
Otherwise the scripts will not be executable.
Fixes lintian warning
script-not-executable usr/share/opm/cmake/Scripts/cppcheck-test.sh

Gbp-Pq: Name 0007-Install-CMake-files-below-share-opm-with-USE_SOURCE_.patch
 2021-04-06 22:56:59 +02:00
Markus Blatt
3e22403cfe Make SOVERSION change with every release. 
Previously the SOVERSION was the year which indicated a stable ABI
within each year. It is highly unlikely that or ABI is that
stable. Hence we stop pretending that it is and change the version
with every release.

Gbp-Pq: Name 0006-Make-SOVERSION-change-with-every-release.patch
 2021-04-06 22:56:59 +02:00
Markus Blatt
b24ca0519c Added manpages for all executables. 
Debian policy says that each executable should have a man page.
This should remove the lintian warning about missing man pages.
Man pages have been created by the following command:

declare -A short_desc
short_desc['compareECL']='Comparator for Eclipse files'
short_desc['convertECL']='Converter for Eclipse files (binary <-> formatted format)'
short_desc['opmhash']='Hasher for summary keywords in Eclipse files'
short_desc['opmpack']='Validator and printer of deck in Eclipse files without comments'
short_desc['summary']='Printer for summary keys in Eclipse summary files'

for key in "${!short_desc[@]}"; do
       help2man -h "-h" --version-string="2020.04" --no-discard-stderr -n "${short_desc[$key]}" $key >\
       $key.1
done

Gbp-Pq: Name 0005-Added-manpages-for-all-executables.patch
 2021-04-06 22:56:59 +02:00
Markus Blatt
8e70bfb93b Fix pkg-config files with imported targets. 
They had imported target names (e.g. from OpenMP) in them which did not work.
Also linking std++fs was a bit strange. Hopefully fixed now.

Gbp-Pq: Name 0003-Fix-pkg-config-files-with-imported-targets.patch
 2021-04-06 22:56:59 +02:00
Arne Morten Kvarving
ef47292a85
Merge pull request #2409 from akva2/enable_embedded_python_ubuntu 
enable embedded python in ubuntu packages
 2021-04-06 15:36:46 +02:00
Arne Morten Kvarving
df525c930a enable embedded python in ubuntu packages 2021-04-06 15:34:11 +02:00
Joakim Hove
cfccc4c814
Merge pull request #2407 from joakim-hove/ecl-config-fix 
Ecl config fix
 2021-04-06 10:00:59 +02:00
Joakim Hove
975b6fd35e Include IO config in EclipseConfig::operator== 2021-04-06 08:14:52 +02:00
Joakim Hove
dcfcd8fa41 Remove deprecated function 2021-04-06 08:14:52 +02:00
Joakim Hove
67e972a1fa
Merge pull request #2404 from joakim-hove/test-sched-deck 
Add schedule deck member to Schedule::operator==()
 2021-04-04 17:56:27 +02:00
Joakim Hove
0999637e58 Add schedule deck member to Schedule::operator==() 2021-04-04 16:08:26 +02:00
Joakim Hove
512110c258
Merge pull request #2406 from joakim-hove/optional-topup-phase 
Use std::optional<Phase> instead of std::pair<Phase, bool>
 2021-04-04 16:07:01 +02:00
Joakim Hove
43f62189ef
Merge pull request #2405 from joakim-hove/sched-state-reorder 
Reorder members in ScheduleState
 2021-04-03 15:33:24 +02:00
Joakim Hove
9281ef04d2
Merge pull request #2403 from joakim-hove/mv-rst-info 
Move restart information to ScheduleStatic
 2021-04-03 15:32:38 +02:00
Joakim Hove
9dc7e6fa11
Merge pull request #2402 from joakim-hove/welldims-data-equal 
Add Welldims comparison ignoring location member
 2021-04-03 11:48:50 +02:00
Joakim Hove
9a58358d9f Use std::optional<Phase> instead of std::pair<Phase, bool> 2021-04-03 11:33:33 +02:00
Joakim Hove
4b6e0e1a3f Reorder members in ScheduleState 2021-04-03 11:13:57 +02:00
Joakim Hove
6e10badb1b Move restart information to ScheduleStatic 2021-04-03 08:40:06 +02:00
Joakim Hove
f2a8f6d6e6 Add Welldims comparison ignoring location member 2021-04-03 08:08:29 +02:00
Joakim Hove
58d900bd4b
Merge pull request #2400 from bska/remove-aquct-cellid 
Remove Cell ID Member from CT Aquifer Representation
 2021-04-02 09:58:26 +02:00
Bård Skaflestad
c94eb84efe Remove Cell ID Member from CT Aquifer Representation 
The data member 'cell_id' isn't actually used anywhere outside of
object serialization.  Just remove it.
 2021-04-01 14:16:50 +02:00
Joakim Hove
4014eb385c
Merge pull request #2390 from joakim-hove/import-container 
Import container
 2021-03-31 11:55:39 +02:00
Joakim Hove
f754ddebce
Merge pull request #2399 from joakim-hove/gconinje-rename 
Rename GCONINJE item and use compiled constants
 2021-03-31 09:51:44 +02:00
Joakim Hove
a051a3f736
Merge pull request #2398 from joakim-hove/plysher-json 
Fix JSON scheme for PLYSHEAR table
 2021-03-31 09:51:29 +02:00
Joakim Hove
20231af0db Rename GCONINJE item and use compiled constants 2021-03-31 09:23:10 +02:00
Joakim Hove
4b0996585d Fix JSON scheme for PLYSHEAR table 2021-03-31 08:16:17 +02:00
Joakim Hove
5edaf996d7
Merge pull request #2393 from joakim-hove/rst-bits 
Add named constant IGroup::ExceedAction = 7
 2021-03-30 22:11:21 +02:00
Joakim Hove
e6e041ca5e Remove unused argument 2021-03-30 21:24:03 +02:00
Joakim Hove
c3e0575042 Slight refactor of Schedule::addGroup() 2021-03-30 21:24:03 +02:00
Joakim Hove
30659aaf5a Remove group active control and rename gconprod_cmode -> prod_cmode 2021-03-30 21:24:03 +02:00
Joakim Hove
93b07c0519 Add named constant IGroup::ExceedAction = 7 2021-03-30 21:15:22 +02:00
Joakim Hove
b88a302f49
Merge pull request #2396 from joakim-hove/rm-defaults 
Remove dummy default values for GCONPROD
 2021-03-30 20:23:16 +02:00
Joakim Hove
3c33261ace Remove dummy default values for GCONPROD 2021-03-30 18:35:45 +02:00
Joakim Hove
febfa9a47a Integrate ImportContainer into the parser inner loop 2021-03-30 11:50:34 +02:00
Joakim Hove
6e888b9c87 Add class ImportContainer to load keywords from IMPORT file 2021-03-30 11:50:34 +02:00
Joakim Hove
02b02189de Allow EclFile constructor to get formatted as input argument 2021-03-30 11:37:32 +02:00