Commit Graph

11682 Commits

Author SHA1 Message Date
Markus Blatt
410f2ecc34
Merge pull request #3008 from blattms/spelling-fix
Spelling fixes (valied -> valid).
2022-04-27 16:11:19 +02:00
Markus Blatt
7d66ff7c12 Spelling fixes (valied -> valid). 2022-04-27 14:08:53 +02:00
Bård Skaflestad
deffadd92e
Merge pull request #3006 from lindjoha/complump_defaults
Added default values for I, J, K1 and K2 in COMPLUMP
2022-04-27 12:40:22 +02:00
Arne Morten Kvarving
4871f618bf fixed: avoid direct floating point comparisons in tests
we want to compare with an epsilon since these have gone
through calculations
2022-04-27 12:24:22 +02:00
Øyvind Lind-Johansen
dff5144d6a Added default values for I, J, K1 and K2 2022-04-27 10:23:29 +02:00
Tor Harald Sandve
2eb49a451c
Merge pull request #3003 from bska/fix-update-uda-weltarg
Update THP Target in Case of THP Control
2022-04-26 08:41:58 +02:00
Bård Skaflestad
bf259a5444 Update THP Target in Case of THP Control
Updating the BHP target appears to have been a copy-paste error.
2022-04-25 12:55:46 +02:00
Tor Harald Sandve
3f34913fb0 implement item 10 WCONINJE 2022-04-21 14:58:44 +02:00
Markus Blatt
3349bac28f
Merge pull request #2997 from blattms/update-manpages
Cleanup, update and improve man pages for 2022.04
2022-04-21 11:27:29 +02:00
Markus Blatt
635aafa6f8
Merge pull request #2998 from akva2/jenkins_abs_refs
added: ability to use jenkins build scripts for release test building
2022-04-21 11:19:50 +02:00
Arne Morten Kvarving
9f332b87a4 added: ability to use jenkins build scripts for release test building
we need to be able to specify absolute refs to use for the repos
rather than a pull request number.
2022-04-21 09:51:43 +02:00
Markus Blatt
5dc5cd10b6 Cleanup, update and improve man pages for 2022.04 2022-04-20 22:09:17 +02:00
Markus Blatt
ecde5ebc8c
Merge pull request #2995 from blattms/use-dune-buildsystem-defaults
Use dune buildsystem defaults for MPI SuperLU, and Quadmath
2022-04-20 19:43:09 +02:00
Markus Blatt
85837a71a5 Require UMFPack
A direct coarse solver of AMG is needed for good convergence and umfpack
was tested to work better than SuperLU previously. Hence we now require it.
2022-04-20 17:31:24 +02:00
Markus Blatt
2f726690e7 Always build with MPI and search for SuperLU and Quadmath.
Concerning MPI, both DUNE and OPM must be compiled with the
same default. For DUNE that is to used MPI if it is found.
With the previous default Cmake in opm-grid would fail for
DUNE 2.8

Even if SuperLU is found umfpack will be used as the coarse
solver for AMG. But if dune-fem is used  that will need SuperL
if it is on the system otherwise linking will fail for DUNE 2.8

Quadmath is used by dune-fem if it is found and linking of flow
will fail in this case for DUNE 2.8 if we did not search for it.
2022-04-20 17:31:23 +02:00
Ove Sævareid
fff89abd6b Sample let-curves for table output to INIT file. 2022-04-20 17:07:13 +02:00
Ove Sævareid
740beea44a Relocate kw defs. 2022-04-20 17:07:13 +02:00
Ove Sævareid
7496599d41 LET-based family-I saturation functions. New keywords SWOFLET and SGOFLET. 2022-04-20 17:07:13 +02:00
Bård Skaflestad
a5d19c4cf0
Merge pull request #2990 from totto82/rename_ext
rename extrapolate to explicit_lookup in vfpexp
2022-04-20 09:54:25 +02:00
Tor Harald Sandve
09f80a3da1 rename extrapolate to explicit_loopup in vfpexp 2022-04-12 09:03:29 +02:00
Markus Blatt
35835efbbe
Merge pull request #2987 from akva2/update_redhat_python_versioned_packages
update redhat packaging
2022-04-10 10:57:22 +02:00
Paul Egberts
7956c2d7da added vaporized_water rate type 2022-04-08 21:07:45 +02:00
Bård Skaflestad
61090f078e
Merge pull request #2988 from totto82/wvfpexp
add support for wvfpexp in the input layer
2022-04-07 11:39:24 +02:00
Tor Harald Sandve
f91b9b7c31 add support for wvfpexp in the input layer 2022-04-07 09:38:03 +02:00
Markus Blatt
6111526c93
Merge pull request #2986 from bska/block-level-solvent-sat-smry
Support Block Level Solvent Saturation Summary Output
2022-04-06 12:12:09 +02:00
Bård Skaflestad
3e1031b1d5 Support Block Level Solvent Saturation Summary Output
This commit recognises the summary vector "BNSAT" as a supported
keyword.  This, in turn, enables retrieving the simulator's solvent
saturation values at the block level as a time series.
2022-04-05 15:45:30 +02:00
Markus Blatt
9d5167ab4e
Merge pull request #2980 from blattms/binary-package-versio-no-build-time
Incude binary package version in project-version.h and skip timestamp
2022-04-05 14:54:36 +02:00
Arne Morten Kvarving
9c260d6c9a update redhat packaging
- add parameter for which toolset to use
- build against openmpi3
- build with python support
- add boolean flags for the different mpi builds (mostly for testing)
- add parameter for appending extra token to package names.
  this can be used for allowing multiple versions to be installed on the
  same system.
2022-04-05 11:43:43 +02:00
Markus Blatt
ebca866e31
Merge pull request #2984 from akva2/fix_rst_deck_test
fixed: use PROJECT_BINARY_DIR, not CMAKE_BINARY_DIR
2022-04-01 16:40:16 +02:00
Arne Morten Kvarving
1f335a1d54 fixed: use PROJECT_BINARY_DIR, not CMAKE_BINARY_DIR
when using as super-build these differ
2022-04-01 11:58:13 +02:00
Markus Blatt
fce5764dd4
Merge pull request #2982 from akva2/remove_debian_package
remove in-tree debian (ubuntu) packaging
2022-03-31 19:50:09 +02:00
Arne Morten Kvarving
525875f16a remove in-tree debian (ubuntu) packaging
ubuntu packages will be built using the debian packaging
in the future
2022-03-31 15:39:30 +02:00
Markus Blatt
99f2c4d6ab
Merge pull request #2974 from bska/disallow-wells-parented-to-field
Disallow Wells Parented Directly to FIELD
2022-03-30 13:09:30 +02:00
Bård Skaflestad
c82286f7d8 Disallow Wells Parented Directly to FIELD
The commercial simulator does not support parenting a well directly
to the FIELD group and Flow in multiple locations implicitly assumes
that no well is parented directly to FIELD either.

With this commit we detect this situation at the parser stage and
stop reading the input file.  In this case, we issue a diagnostic
message of the form

    Error: Problem with keyword WELSPECS
    In SPE1CASE1.DATA line 384
    Wells cannot be parented directly to 'FIELD'.
    Wells entered with disallowed 'FIELD' parent group:
     * PROD
     * INJ

    Error: Unrecoverable errors were encountered while loading input
2022-03-28 21:59:32 +02:00
Bård Skaflestad
74d7effe3f
Merge pull request #2975 from bska/restart-compat
Address Compatibility Issues in XWEL and ZUDL
2022-03-24 17:29:19 +01:00
Bård Skaflestad
920382179e Always Output All Well Flow Rates to XWEL
Additionally, items 36..38 appear to be copies of items 1..3, so
preserve this behaviour for increased compatibility.
2022-03-24 16:10:21 +01:00
Bård Skaflestad
d08b7292bf Use Uppercase Exponents in UDQDefine::input_string
Needed for compatibility reasons.
2022-03-24 16:10:21 +01:00
Bård Skaflestad
a0d9a04470 UDQ Tests: Make Utility Functions Private
Mostly to avoid diagnostics of the form "no previous declaration
for...".  While here, also sort includes
2022-03-24 16:10:21 +01:00
Markus Blatt
a162915f77
Merge pull request #2979 from bska/detect-invalid-cpdata
Add Means of Detecting Valid Cell Geometries
2022-03-24 16:05:20 +01:00
Bård Skaflestad
6f29e74692 Add Means of Detecting Valid Cell Geometries
We define a valid cell geometry as one in which all components of
all eight corner vertices of a cell have finite coordinate values
(absolute value less than 1.0E+20) and at least one pair of pillar
vertices are separated by a positive distance.
2022-03-24 11:13:32 +01:00
Markus Blatt
0cdfeae0e5 Added CMake variable to prevent timestamps in flow binary packages.
One can now set the variable OPM_BINARY_PACKAGE_VERSION to a
meaningful version string (Debian 11.2: 2021.10-4). When building
outside of git it will be used as the project hash. If the variable is
non-empty there will also be no timestamp in project-timestamp.hh (as
this would break reproducible builds).

Note that if building from git or not setting the variable then everything
will be like before.
2022-03-23 22:53:43 +01:00
Markus Blatt
283d7b3dce Do not try to get git hashes for version if built from tarballs. 2022-03-23 22:37:31 +01:00
Markus Blatt
dff978d0eb
Merge pull request #2978 from blattms/debian-use-dist-packages-only-for-usr-prefix
[python] Use dist-packages if it is used for Python's sitepackages
2022-03-22 16:42:17 +01:00
Markus Blatt
cd3a6b2ddf Make determining whether to use site-packages more bullet-proof
Seems like sometimes getsitepackages might not even be implemented.
2022-03-22 12:00:55 +01:00
Markus Blatt
bcf1ba0ba9 [python] Use dist-packages if is used for Python's sitepackages
Instead of checking whether this is Debian system we query the
sitepackages path from Python. If it matches dist-packages then
we use dist-packages if we install below /usr, otherwise site-packages
is used.
2022-03-22 11:45:02 +01:00
Bård Skaflestad
06ff1db977
Merge pull request #2977 from blattms/fail-without-setuptools
[cmake] Send error for OPM_ENABLE_PYTHON=ON without setuptools
2022-03-15 13:29:12 +01:00
Markus Blatt
af052ef3ba [cmake] Send error for OPM_ENABLE_PYTHON=ON without setuptools
Compiling will fail at a very late stage and might cause surprises
for novice users. It seems much better to issue an error in CMake with
a meaningful error message. Might prevent some support issues in the
future.
2022-03-15 13:00:24 +01:00
Bård Skaflestad
2da0f48da2
Merge pull request #2973 from GitPaean/no_aquifer_connection
throw when there is no connection for analytical aquifer
2022-03-11 10:18:55 +01:00
Bård Skaflestad
94635c03d3
Merge pull request #2968 from plgbrts/vapwat
Introducing water-gas ratio RVW keyword
2022-03-10 16:19:01 +01:00
Kai Bao
facb210275 throw when there is no connection for analytical aquifer 2022-03-10 15:08:40 +01:00