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

11912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
45f01eb2ab Bump version for release. 2022-11-07 18:03:31 +01:00
Atgeirr Flø Rasmussen
5babdb413c
Merge pull request #3214 from atgeirr/backport-of-pr-3205 
Make sure compilation is not tested.
 2022-11-07 16:41:44 +01:00
Markus Blatt
ebc0f30b94 Make sure compilation is not tested. 
This is broken for DUNE >= 2.8 and dune module that use  OPM.
 2022-11-07 16:41:01 +01:00
Atgeirr Flø Rasmussen
5ae44d0d4c
Merge pull request #3213 from atgeirr/backport-of-pr-3203 
[bufix,cmake] Fixes simple find_package(opm-module) calls
 2022-11-07 16:39:20 +01:00
Markus Blatt
aed0063b61 [bufix,cmake] Fixes simple find_package(opm-module) calls 
When not using the OPM CMake build system magic a
find_package(opm-module) did fail in some settings as the
CMAKE_MODULE_PATH did not include the location of OpmPackge.cmake and
the likes.

This fixes this by issuing a find_package(opm-common) for modules that
are not opm-common.
 2022-11-07 16:37:47 +01:00
Bård Skaflestad
ba067e4132
Merge pull request #3210 from akva2/backport_3195 
Ensure At Least One Well List per Well
 2022-11-03 09:49:38 +01:00
Bård Skaflestad
81c8021cdd Ensure At Least One Well List per Well 
If the input model sets the maximum number of well lists per well
to zero (or negative), then treat this as if the limit is defaulted
and reset the value to the default (one).
 2022-11-03 09:02:11 +01:00
Atgeirr Flø Rasmussen
325da26722
Merge pull request #3209 from atgeirr/backport-of-pr-3198 
Backport of pr 3198
 2022-11-01 23:33:12 +01:00
Markus Blatt
87b501f7b0 Fixed spelling eror in compareECL 2022-11-01 23:32:24 +01:00
Markus Blatt
1ab30d9182 Fix typos: spesific -> specific 2022-11-01 23:32:24 +01:00
Markus Blatt
330ef3c26a Updated manpages 2022-11-01 23:32:24 +01:00
Atgeirr Flø Rasmussen
0c1ae46f01
Merge pull request #3208 from atgeirr/backport-of-pr-3193 
change order of directiona and type and support default ijk
 2022-11-01 23:31:42 +01:00
Tor Harald Sandve
81160c55e9 change order of directiona and type and support default ijk 2022-11-01 23:30:38 +01:00
Atgeirr Flø Rasmussen
a52f8bf782
Merge pull request #3207 from atgeirr/backport-of-pr-3192 
Update GASVISCT
 2022-11-01 23:29:56 +01:00
OPMUSER
43eb1bac37 Update GASVISCT 
Fix GASVISCT JSON definition, based on OILVISCT and WATVISCT
 2022-11-01 23:28:11 +01:00
Atgeirr Flø Rasmussen
2f0e782dfd
Merge pull request #3206 from atgeirr/backport-of-pr-3186 
Use MPI_FOUND not MPI_Found.
 2022-11-01 23:25:27 +01:00
Atgeirr Flø Rasmussen
5f77a71b8f Use MPI_FOUND not MPI_Found. 2022-11-01 23:22:12 +01:00
Atgeirr Flø Rasmussen
e281a1e661
Merge pull request #3182 from atgeirr/release/2022.10 
Bump version for release.
 2022-10-19 10:48:23 +02:00
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