OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,894 Commits 18 Branches 75 Tags 73 MiB
d894ef99d3
Commit Graph

11894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
d894ef99d3 Bump version for release. 2022-10-19 10:04:12 +02:00
Atgeirr Flø Rasmussen
cc81743dad
Merge pull request #3181 from akva2/damaris_fixes 
Damaris depends on MPI
 2022-10-18 15:22:30 +02:00
Bård Skaflestad
a4995686f3
Merge pull request #3180 from akva2/from_intersection 
added: FaceDir::FromIntersectionIndex
 2022-10-18 13:30:29 +02:00
Arne Morten Kvarving
bd3aa76268 fixed: damaris depends on MPI 2022-10-18 13:08:34 +02:00
Arne Morten Kvarving
6c740656bb changed: do not output damaris info if damaris is not requested 2022-10-18 13:08:33 +02:00
Arne Morten Kvarving
69839e8766 added: FaceDir::FromIntersectionIndex 
this translates from a dune intersection id to a FaceDir::DirEnum
 2022-10-17 14:44:13 +02:00
Markus Blatt
f414cdd30e
Merge pull request #3178 from bska/velocity-unit 
Add Unit for Pipeflow Velocity
 2022-10-17 12:11:16 +02:00
Markus Blatt
3f8f4d0362
Merge pull request #3177 from blattms/fix-mult-find-dune-fem 
Fixes bug that hit only for multiple find calls.
 2022-10-17 11:44:23 +02:00
Bård Skaflestad
cba282bd34 Add Unit for Pipeflow Velocity 
Needed for summary and RFT file output of fluid flow velocity in
well segments.
 2022-10-14 15:24:21 +02:00
Markus Blatt
2a2a9748a3 Prevent Zoltan vars from growing with multiple find_package. 2022-10-12 22:57:43 +02:00
Markus Blatt
20e3202067 Make sure HAVE_${MODULE} is always defined in all scopes. 
1. Was a normal variable if no test program was compiled before.
  that meant HAVE_DUNE_FEM was not defined even if dune-fem was found.
2. The if-statement checking whether there is something to compile was
   wrong as this is macro and hence prog is not a variable. Resorted
   to comparison to empty string.
 2022-10-12 22:56:00 +02:00
Atgeirr Flø Rasmussen
6c8120abe6
Merge pull request #3176 from akva2/damaris_cmake_script 
add cmake script for damaris handling
 2022-10-12 14:39:36 +02:00
Markus Blatt
499663f048
Merge pull request #3175 from blattms/fix-mssing-targets-for-multiple-cmake-runs 
[cmake] Search for modules/packages each time a search is triggered.
 2022-10-12 13:45:16 +02:00
Arne Morten Kvarving
64964c3afe add cmake script for damaris handling 2022-10-12 11:16:43 +02:00
Tor Harald Sandve
6c735230ba
Merge pull request #3170 from osae/hysterKillough 
Support for capillary pressure hysteresis.
 2022-10-12 07:52:10 +02:00
Markus Blatt
3f8195a839
Merge pull request #3171 from bska/support-lowercase-compdat-direction 
Support Lower Case COMPDAT Direction Strings
 2022-10-11 21:23:05 +02:00
Markus Blatt
2b87eecd68 Search for modules/packages each time a search is triggered. 
This is essential if find package modules define imported
targets (usual for modern Cmake). Without this rerunning Cmake another
time in a non-clean build directory will abort with errors if imported
targets are used. E.g. with
```

CMake Error at /home/mblatt/src/dune/opm-2.9/opm-common/cmake/Modules/OpmSatellites.cmake:320 (add_executable):
  Target "test_mpiutil" links to target "ParMETIS::ParMETIS" but the target
  was not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?
Call Stack (most recent call first):
  CMakeLists.txt:308 (opm_add_test)

CMake Error at /home/mblatt/src/dune/opm-2.9/opm-common/cmake/Modules/OpmSatellites.cmake:320 (add_executable):
  Target "test_mpiutil" links to target "QuadMath::QuadMath" but the target
  was not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?
Call Stack (most recent call first):
  CMakeLists.txt:308 (opm_add_test)
```

This will result in multiple searches, but this should be rather fast
due their previous results being cached.
 2022-10-11 20:50:46 +02:00
Markus Blatt
991ea3cf0d Allow find_package calls for METIS/Quadmath if targets already exists 2022-10-11 20:46:38 +02:00
Ove Sævareid
c1d916f66e Neutral initialisation of flags. 2022-10-10 14:17:14 +02:00
Bård Skaflestad
67dbe5c9e7 Support Lower Case COMPDAT Direction Strings 
Some models will use lower-case strings to input the direction of
penetration, e.g., 'x' or 'z'.  This commit extends our direction
parser to support such strings.
 2022-10-09 18:30:46 +02:00
Markus Blatt
9f02b613e8
Merge pull request #3114 from bska/rst-read-vfpexp 
Restore Explicit THP Control Options from Restart File
 2022-10-07 09:19:01 +02:00
Ove Sævareid
121a062abe Support for capillary pressure hysteresis. 2022-10-05 14:13:36 +02:00
Bård Skaflestad
00eda12fa0 Restore Explicit THP Control Options from Restart File 
In particular, this commit restores all WVFPEXP-related items from
the restart file's IWEL array.
 2022-10-05 09:55:03 +02:00
Markus Blatt
0e341ef6e1
Merge pull request #3163 from bska/segment-node-xy 
Add XY Coordinates to Segment's Node
 2022-10-05 09:52:39 +02:00
Arne Morten Kvarving
8601805d62
Merge pull request #3165 from akva2/add_headers 
added: add headers to library definition
 2022-10-05 09:52:24 +02:00
Markus Blatt
d410f38e11
Merge pull request #3169 from akva2/fix_python_install_path 
fixed: properly export opm-common_PYTHON_COMMON_DIR
 2022-10-05 09:44:52 +02:00
Arne Morten Kvarving
57bc9a8f02 added: add headers to library definition 
for better IDE integration
 2022-10-05 09:18:31 +02:00
Arne Morten Kvarving
ca0246c548 fixed: properly export opm-common_PYTHON_COMMON_DIR 
this needs to be different for the in-tree and installed
config files
 2022-10-05 08:49:22 +02:00
Bård Skaflestad
4326b8c78e Add XY Coordinates to Segment's Node 
These are not used in the simulation, but needed/useful for the SEG
option of the WRFTPLT keyword.
 2022-10-04 17:42:38 +02:00
Bård Skaflestad
77676000f7
Merge pull request #3166 from akva2/rename_serialize_object 
changed: rename serializeObject to serializationTestObject
 2022-10-04 17:04:00 +02:00
Arne Morten Kvarving
fb0f3c451e changed: rename serializeObject to serializationTestObject 
makes it more clear what these members are used for.
 2022-10-04 14:10:30 +02:00
Bård Skaflestad
1010c81b3d
Merge pull request #3162 from tskille/fix_rsm_compare_ecl 
additional output from compareECL related to rsm files
 2022-10-04 12:03:47 +02:00
Torbjørn Skille
cc6769c1a2 adding new file type RSM to compareECL 
When using -t SMRY  the RSM file is not checked
When using -t RSM   the SMRY files is not checked

when running without -t option both RSM and SMRY files are checked together with restart, grid, init and rft file.
 2022-10-04 08:51:36 +02:00
Torbjørn Skille
16af572080 additional output from compareECL related to rsm files 2022-10-03 19:16:41 +02:00
Bård Skaflestad
cea1dea368
Merge pull request #3091 from akva2/fix_uninitialized_access 
fixed: avoid use of uninitialized SummaryNode::number_
 2022-09-30 19:33:36 +02:00
Bård Skaflestad
51ecf87682 fixed: avoid use of uninitialized SummaryNode::number_ 
SummaryNode::number_ does not have a value for all
summary keywords.
 2022-09-30 16:52:34 +02:00
Markus Blatt
a61747eb74
Merge pull request #3154 from tskille/fix_esmry_startd 
Fix bug in ExtESmry
 2022-09-28 19:57:15 +02:00
Bård Skaflestad
ec7145e817
Merge pull request #3160 from atgeirr/add-item-numbers-netbalan 
Add item numbers for NETBALAN.
 2022-09-28 18:52:59 +02:00
Atgeirr Flø Rasmussen
e10faa139c Add item numbers for NETBALAN. 2022-09-28 17:39:36 +02:00
Bård Skaflestad
99affa9043
Merge pull request #3110 from bska/rst-read-wgrupcon 
Load WGRUPCON Information From Restart File
 2022-09-28 15:18:36 +02:00
Bård Skaflestad
f54c3d7480 Load WGRUPCON Information From Restart File 2022-09-28 14:00:11 +02:00
Bård Skaflestad
6af6676d5f Remove Tests Which Only Passed by Accident 
There is no reason to expect that, for instance, the dynamic
control mode in a restart file is equal to that of the input file.
 2022-09-28 14:00:11 +02:00
Bård Skaflestad
eecb713e00 Pull Helper Functions Out of Opm Namespace 
Mostly to more clearly distinguish these from proper library
functions.
 2022-09-28 14:00:11 +02:00
Bård Skaflestad
6b05ee2210
Merge pull request #3094 from bska/add-smry-cat-compl 
Add New Summary Node Category of Completion
 2022-09-28 13:58:21 +02:00
Bård Skaflestad
03a94a7288 Add New Summary Node Category of Completion 
This enables detecting the last remaining case that has a valid NUMS
entry despite nominally being a well-level keyword.
 2022-09-27 18:16:47 +02:00
Bård Skaflestad
c5158a1c24
Merge pull request #3155 from bska/support-rft-seg-option 
Internalise WRFTPLT Segment Option
 2022-09-27 18:07:45 +02:00
Bård Skaflestad
1a3166d913 Simplify Erasure From PLT States 
Suggested by: [at]blattms
 2022-09-27 17:05:53 +02:00
Bård Skaflestad
328ee9b591 Internalise WRFTPLT Segment Option 
In preparation of adding RFT file output support for segment data.
 2022-09-27 17:05:23 +02:00
Torbjørn Skille
39c1a68f37 Fix bug in ExtESmry 
Start date in ESMRY file (format) have 7 elements, last element is milliseconds.
 2022-09-27 15:38:24 +02:00
Bård Skaflestad
26a566ef94
Merge pull request #3156 from kjetilly/kjetilly_reserved_keyword_fix 
Remove use of reserved identifier in OPM_THROW.
 2022-09-27 12:51:42 +02:00