Commit Graph

11967 Commits

Author SHA1 Message Date
Markus Blatt
492ba7c9dd
Merge pull request #3195 from bska/support-max-wlist-zero
Ensure At Least One Well List per Well
2022-10-27 22:45:18 +02:00
Bård Skaflestad
d6a3405549 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-10-27 16:15:24 +02:00
Bård Skaflestad
f6865c08dc
Merge pull request #3196 from GitPaean/not_throw_no_connection_aquifer
not throwing for numerical aquifers do not have connections
2022-10-27 16:07:30 +02:00
Kai Bao
85c87fa29a not throwing for numerical aquifers do not have connections 2022-10-27 13:23:07 +02:00
Atgeirr Flø Rasmussen
1bd898824c
Merge pull request #3192 from OPMUSER/GASVISCT
Update GASVISCT
2022-10-27 11:38:09 +02:00
Bård Skaflestad
484746f28f
Merge pull request #3193 from totto82/mod_bc
change order of direction and type in BC and support default ijk
2022-10-27 09:11:23 +02:00
Tor Harald Sandve
e90ee06e74 change order of directiona and type and support default ijk 2022-10-27 08:30:26 +02:00
OPMUSER
6a9c0884ec Update GASVISCT
Fix GASVISCT JSON definition, based on OILVISCT and WATVISCT
2022-10-26 19:29:30 +08:00
Bård Skaflestad
2bbbef5190
Merge pull request #3191 from akva2/janitoring
Some janitoring
2022-10-26 11:19:29 +02:00
Arne Morten Kvarving
9e92f9750c remove unused captures 2022-10-26 10:52:36 +02:00
Arne Morten Kvarving
6353509ecf remove unused variable 2022-10-26 10:52:31 +02:00
Markus Blatt
120ef99510
Merge pull request #3188 from vkip/fix-time-vector-py
Fix time stamp output from time_vector.py so it is Ecl compatible
2022-10-24 11:45:20 +02:00
Vegard Kippe
2cd0d26dd8 Removing comment. 2022-10-21 10:02:59 +02:00
Vegard Kippe
f30baa45af Fixing time stamp output in time_vector.py so it is compatible with Eclipse 2022-10-21 10:01:32 +02:00
goncalvesmachadoc
d4ac067a94 fixKeyword 2022-10-20 17:23:51 +02:00
goncalvesmachadoc
eac870aae4 add description 2022-10-20 17:23:50 +02:00
goncalvesmachadoc
b2c3c24fe8 add salt density as input 2022-10-20 17:23:50 +02:00
Paul Egberts
6f671236a4 fix test for RWGSALT table 2022-10-20 15:56:49 +02:00
Paul Egberts
d1de06b1e6 RWGSALT table implementation based on PvtxTable 2022-10-20 11:09:46 +02:00
Atgeirr Flø Rasmussen
cc49bd15fa
Merge pull request #3186 from atgeirr/fix-damaris-cmake
Use MPI_FOUND not MPI_Found.
2022-10-19 14:29:02 +02:00
Atgeirr Flø Rasmussen
1647bba68c Use MPI_FOUND not MPI_Found. 2022-10-19 13:57:25 +02:00
Tor Harald Sandve
e9c93975cf extend BCType with dirichlet 2022-10-19 09:17:54 +02:00
Arne Morten Kvarving
ade3248265
Merge pull request #3183 from atgeirr/bump-version
Bump version for master branch.
2022-10-19 09:14:17 +02:00
Atgeirr Flø Rasmussen
dcd3d1ca5e Bump version for master branch. 2022-10-18 17:30:42 +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