Commit Graph
100 Commits
Author SHA1 Message Date
Markus Blatt 3134bdedf9 Merge pull request #4332 from bska/rename-convergence-output-option
Rename Convergence Output Option
2022-12-20 13:46:25 +01:00
Markus Blatt 8cde90fbd0 [bugfix,mswell] Throw for connections not attached to segments.
If there are connections of a multisegment well that are not
connected to any segment, we throw with a meaningful error message
instead of a silent segmentation fault. In that case an invalid segment index
of zero would be returned. The corresponding storage index returned by
segmentToNumberIndex ould become -1. This previously lead to segmentation
faults when using it to index a container.
2022-12-16 16:12:47 +01:00
Markus Blatt f6ae49fec4 Honor MULTZ- when determining TRANSZ over pinched cells (pinch all).
Previously, a barrier between cells in Z-direction was only honored if
it was done using MULTZ. We disregarded MULTZ- completely when
calculating the TRANZ over pinched cells.

Now we also take into account MULTZ-.
2022-12-14 15:00:41 +01:00
Markus Blatt aa9fd77860 Merge pull request #4324 from akva2/liveoilpvt_encapsulate
add missing include after upstream header removal
2022-12-13 18:22:43 +01:00
Markus Blatt b4acdedefd Merge pull request #4310 from totto82/groupinfo_stage2
BUGFIX we now use group_info in stage 2 and need to make sure its communicated
2022-12-08 09:01:01 +01:00
Markus Blatt 8fc13d4bef Merge pull request #4252 from bska/report-segment-dyn-data-2
Report Solution GOR and OGR at Segment Level
2022-11-22 22:39:19 +01:00
Markus Blatt 42fdc38ae0 Merge pull request #4273 from Tongdongq/add-test
Add test for cusparseSolver
2022-11-22 13:55:11 +01:00
Markus Blatt d8ca55fe34 Merge pull request #4265 from totto82/well_temp
adapt to changes in temperature location in opm-common
2022-11-22 12:26:46 +01:00
Markus Blatt 58d8ca144e Merge pull request #4259 from blattms/do-dereference-unset-optional
[bugfix] Do not unconditionally dereference std::optional.
2022-11-22 10:26:30 +01:00
Markus Blatt ccdb2eda93 Merge pull request #4269 from akva2/istlsolverebos_alugrid
ISTLSolverEbos: instance for ALUGrid
2022-11-16 21:36:43 +01:00
Markus Blatt 81b296a682 Merge pull request #4182 from totto82/bc_dirichlet
implement dirichlet boundary conditions
2022-11-11 22:23:14 +01:00
Markus Blatt 9cb6d53dcb [bugfix] Do not unconditionally dereference std::optional.
In WellGroupHelpers we unconditional referenced the region
member of GPMaint. Unfortunately, that is a std:optional and
doing this can create quite some havoc.

Now we stop processing if it is unset.
2022-11-09 16:49:07 +01:00
Markus Blatt 4988f98060 Merge pull request #4178 from Tongdongq/rocalution
Add rocalutionSolver
2022-11-09 16:44:35 +01:00
Markus Blatt 6f5931ca1b Remove ununsed ancient LinearSolverRequireFullSparsityPattern option.
It is unused since 2018 when we moved away from autodiff implementation.
2022-11-04 21:04:40 +01:00
Markus Blatt 2dc73a7c47 [bugfix] recover support for selecting GMRes as solver.
Previously, passing --use-gmres=true had now effect. Probably was lost
when introducing FlexibleSolver. With this change the FlexibleSolver
will now use GMRes if the option is true.

Closes #4240
2022-11-04 20:30:13 +01:00
Markus Blatt c8813a4dd0 Merge pull request #4201 from bska/collect-varlength-data-conn
Support Variable Length Connection Data in Distributed Wells
2022-11-03 13:33:01 +01:00
Markus Blatt 060dfde864 Fixed typo: acess -> access 2022-11-01 21:45:47 +01:00
Markus Blatt 50eff23710 Merge pull request #4219 from akva2/use_fmt
BlackoilWellModel: use fmt::format
2022-10-31 11:54:57 +01:00
Markus Blatt d0816a2d35 Added mssing include of functional to StandardWellGeneric.hpp
Without including functional compilation fails with Debian experimental.
2022-10-31 10:12:14 +01:00
Markus Blatt c91cf5cca7 Updated flow manpage. 2022-10-31 10:12:14 +01:00
Markus Blatt 8cdd8f0c6c Fixed --flow-newton-max-iterations in compareEclFiles.cmake
Needs to be --newton-max-iterations now
2022-10-28 16:44:58 +02:00
Markus Blatt 2fdc9e6cc6 Remove references of flow i usage string of Newton method properties.
This makes them constent to NewtonMaxIterations
2022-10-28 16:41:54 +02:00
Markus Blatt 2c8a63fc3d Use consistent NewtonMaxIteration usage string.
Needed to prevent an exception. Apparently both the value and usage
sting must match each time we register a parameter no matter
whether the template parameters differs or not.
2022-10-28 16:41:54 +02:00
Markus Blatt 0ab28551e5 Merge pull request #4200 from totto82/2p_expvfp
fix 2p case wvfpexp
2022-10-26 12:40:16 +02:00
Markus Blatt 3e680e41f5 Merge pull request #4136 from Tongdongq/remove_reordering
Remove reordering for opencl
2022-10-19 15:30:01 +02:00
Markus Blatt fc96ef86c1 [bugfix] Unconditionally compile WellContributions.cpp et al
Otherwise we get undefined references. Fixes problems introduced with #4157
2022-10-17 16:51:53 +02:00
Markus Blatt f49739cb52 Merge pull request #4168 from bska/expand-bitset-serialization
Add Serialization Support for std::bitset<3>
2022-10-17 12:04:11 +02:00
Markus Blatt 8d522a2c42 Get rid deprecation warning for newer DUNE versions. 2022-10-14 21:29:09 +02:00
Markus Blatt 7e1c63c92d Merge pull request #4163 from bska/remove-close-brace-semicolon
Remove Trailing Semicolon on Function's Close Brace
2022-10-13 11:47:38 +02:00
Markus Blatt fcc3690832 Added missing include of config.h in cpp files. 2022-10-12 15:28:38 +02:00
Markus Blatt b9aa7bdc3b Move include of config.h to cpp-file
One should never include config.h in a header. To the very least it results
in redefined macros.
2022-10-12 14:30:26 +02:00
Markus Blatt c2963560d2 Fix compilationw with amgcl/vexcl and without CUDA/OpenCL.
There is no reason to omit WellContributions if neither CUDA nor
OpenCL is found as the implementations/functions only use C++-
To the contrary, the defines used for deactivating were not
consistent with usage elsewhere and resulted in compiler erorrs
for exotic configuration
2022-10-11 10:42:08 +02:00
Markus Blatt 02666a6677 Use CMake's find_file to find install.py for Python installation.
This seems to be a more stable approach as it does not produce
```
/usr/bin/python3.9: can't open file
'/home/mblatt/src/dune/opm-2.9/opm-common//install.py': [Errno 2] No such file or directory
```
for rebuilds after failed attempts.
2022-09-30 18:05:40 +02:00
Markus Blatt d6232f03ec Merge pull request #4130 from OPMUSER/LinearSolverVerbosity
LinearSolverVerbosity
2022-09-29 12:37:55 +02:00
Markus Blatt a1f27654c7 Merge pull request #4120 from akva2/zoltanparam_cleanup
ZoltanParams: some cleanup
2022-09-19 10:45:11 +02:00
Markus Blatt 42ef6ed9de Merge pull request #4107 from akva2/mpipacker_refactor
Refactor MPIPacker
2022-09-15 20:25:34 +02:00
Markus Blatt e7d186b416 Merge pull request #4104 from akva2/serializer_handle_pairs
changed: handle all pairs in eclmpiserializer
2022-09-13 15:52:09 +02:00
Markus Blatt 6ef3a28472 Merge pull request #4020 from akva2/istlsolverebos_separate
put parts of ISTLSolverEbos in separate compile unit
2022-09-12 20:24:21 +02:00
Markus Blatt a4360b4961 Merge pull request #4028 from akva2/reduce_dup
changed: get rid of duplicate MatrixBlock headers/classes
2022-09-09 15:30:30 +02:00
Markus Blatt 15ca494164 Merge pull request #4084 from akva2/tran_distribute_eclmpiserializer
changed: use EclMpiSerializer to distribute transmissibilities
2022-09-07 10:05:05 +02:00
Markus Blatt c58a30068e Merge pull request #4027 from aritorto/lambda
Code modernization
2022-08-26 12:19:47 +02:00
Markus Blatt 32ea42006c Merge pull request #4019 from akva2/paroverlap_separate_unit
put ParallelOverlappingILU0 in separate compile unit
2022-08-22 12:06:26 +02:00
Markus Blatt c631a4ee63 Merge pull request #4018 from akva2/preconditionerfactory_separate
changed: split PreconditionerFactory in _impl file
2022-08-22 10:16:45 +02:00
Markus Blatt e7cc14de4c Revert: Split PreconditionerFactory in _impl file
This reverts commit 7f8c88769e.
Apparently the macros unconditionally use Classes that are only
there for parallel builds.
2022-08-19 14:42:55 +02:00
Markus Blatt 2c26249bb6 Merge pull request #4011 from akva2/preconditionerfactory_separate
changed: split PreconditionerFactory in _impl file
2022-08-19 13:46:19 +02:00
Markus Blatt f3c82fb123 Merge pull request #4010 from akva2/separate_parallelistlinfo
changed: put ParallelIstlInformation in separate compile unit
2022-08-18 11:45:46 +02:00
Markus Blatt 3068424382 Merge pull request #3968 from totto82/drift_fix
Adapt drift compensation code to the way Flow checks convergence.
2022-08-18 11:39:25 +02:00
Markus Blatt acff71c3d1 Merge pull request #4006 from akva2/milu_refactor
changed: put MILU in separate compile unit
2022-08-16 15:31:23 +02:00
Markus Blatt 7a0a4c647c Merge pull request #4005 from akva2/use_std_array
changed: consistently use std::array
2022-08-16 15:08:39 +02:00
Markus Blatt 39ab188791 Merge pull request #3986 from akva2/remove_unused
remove use of Unused.hpp
2022-08-02 14:20:12 +02:00
Markus Blatt af28030123 Merge pull request #3983 from blattms/fix-perf-all-zero
[bugfix] Fixes deadlocks with agressively distributed wells
2022-07-29 09:37:10 +02:00
Markus Blatt 941957c13e Fix shadowed variable warning. 2022-07-28 19:50:24 +02:00
Markus Blatt c22114af41 Handle injection/producer targets correctly for distributed wells.
We should never return in a function if there are no local
perforations for a distributed well, but that is what we did before
this fix.
2022-07-28 17:52:26 +02:00
Markus Blatt 560c6fed4e Merge pull request #3980 from akva2/cleanup_schedule
add missing include
2022-07-27 17:21:45 +02:00
Markus Blatt 1ac012ea71 Merge pull request #3978 from akva2/fix_eclipsestate_includes
add some missing EclipseState includes
2022-07-27 17:03:37 +02:00
Markus Blatt f7dec58ee2 Fix deadlock for distributed wells when calculating densities/pressures
There was a check that is supposed that all rates are zero but for
distributed wells it only checked local perforations. Of course that
can lead to different outcome on processes for distributed wells.
2022-07-15 17:58:04 +02:00
Markus Blatt 412cf1d6cd Merge pull request #3976 from blattms/well-fix-distributed-tw
[bugfix] Fix well transmissibility weights for distributed wells.
2022-07-15 10:39:48 +02:00
Markus Blatt bfd1d3187a [bugfix] Fix well transmissibility weights for distributed wells.
If we compute a sum over all perforations than we need to cater for the
case of distributed wells. That is we need to also sum up over all processes
involved after performing the local sum.

One of these global sums was missing in computeWellConnectionDensitesPressures
for producers when we compute the weights based on well transmissibilities.
2022-07-13 13:40:16 +02:00
Markus Blatt f22d58a1d0 Merge pull request #3953 from Tongdongq/tweak-opencl-launch-params
Tweak opencl launch params
2022-07-07 10:43:15 +02:00
Markus Blatt 6aea0fab37 Added instantiations of OrderedMap with truncated keys for parallel. 2022-06-27 13:09:09 +02:00
Markus Blatt ebb8fc7aae Warn about about long fault -name 2022-06-27 13:09:08 +02:00
Markus Blatt e14823c6d8 Merge pull request #3941 from akva2/remove_int_sim_config
Remove support for internal simulator configuration
2022-06-27 11:05:18 +02:00
Markus Blatt 25a92c2c2c Merge pull request #3958 from Tongdongq/fix-gpu-well-apply
Fix stdwell apply on GPU
2022-06-24 16:02:34 +02:00
Markus Blatt f3bf15ab2f Merge pull request #3946 from Tongdongq/fix-gpu-verbose-timing
Fix: verbose timing for openclSolver
2022-06-22 16:13:57 +02:00
Markus Blatt 9f7de03a80 Merge pull request #3938 from hakonhagland/copy_python
Only copy the necessary files from the source python folder to the build folder
2022-06-10 15:37:27 +02:00
Markus Blatt 5a7029f53c Merge pull request #3933 from hakonhagland/python_nsp
Make the Python `opm` package a namespace package
2022-06-10 15:01:14 +02:00
Markus Blatt 4121be612b Merge pull request #3918 from hakonhagland/python_rates3
Dynamically update Opm::Schedule from Python (part II)
2022-06-10 14:56:24 +02:00
Markus Blatt 5e00a0ae59 Merge pull request #3928 from bska/make-jacobi-prec-opencl-only
Temporarily Limit Block-Jacobi Partitioner to OpenCL Only
2022-06-08 17:24:13 +02:00
Markus Blatt ac59429e01 Merge pull request #3935 from Tongdongq/fix-replace-zero-diagonal
Fix: zeros were not replaced correctly in the diagonal for GPU
2022-06-08 12:28:30 +02:00
Markus Blatt f225521680 Merge pull request #3929 from bska/remove-gridv-param
Use Consistent Grid Views for Transmissibility Calculation
2022-06-01 16:02:16 +02:00
Markus Blatt ad74355aed Merge pull request #3886 from bska/bxip-smry-values
Extract Block-Level Component-in-Place Summary Values
2022-05-23 16:30:17 +02:00
Markus Blatt 10b7f4fbc0 Merge pull request #3912 from bska/attribute-missing-kw-terminator
Emit Actual Message on Input Failure
2022-05-20 23:05:22 +02:00
Markus Blatt 02aaec82f7 Merge pull request #3815 from Tongdongq/subdomain-matrix-for-opencl
Subdomain matrix for opencl ILU preconditioner
2022-05-20 16:05:14 +02:00
Markus Blatt 97ccaca239 Merge pull request #3917 from blattms/bump-version-2022.10
Bump version to 2022.10-pre
2022-05-19 16:53:09 +02:00
Markus Blatt b4d1fd5913 Bump version to 2022.10-pre 2022-05-19 16:46:35 +02:00
Markus Blatt cd663351f6 Merge pull request #3897 from akva2/missing_config_h_include
fixed: add missing config.h include
2022-04-28 12:48:58 +02:00
Markus Blatt 51d8c9536e Spelling fix geomtry -> geometry.
Actually one should rename the function used from opm-common, too.
But that is for later...
2022-04-27 20:52:30 +02:00
Markus Blatt 42c2f649d3 Merge pull request #3893 from akva2/onephase_use_flow_binary
changed: also run the parallel onephase tests through flow binary
2022-04-27 16:33:42 +02:00
Markus Blatt 355f71bda9 Merge pull request #3891 from blattms/flow-add-wateronly-enery
Added support for water-only and water-only + thermal to flow.
2022-04-26 18:08:00 +02:00
Markus Blatt 9b98a8fdc1 Use flow to update reference data for onephase test cases 2022-04-26 17:07:09 +02:00
Markus Blatt c66fb8a93d Added support for water-only and water-only + thermal to flow.
Also run the onephase tests with flow now.
2022-04-26 17:07:09 +02:00
Markus Blatt d58e11d591 Merge pull request #3875 from OPMUSER/Radial-Spider-Grid-Update-Backport-Candidate
Radial and Spider Grid Keywords Not Supported
2022-04-22 14:24:54 +02:00
Markus Blatt aba4c5f487 Merge pull request #3880 from Tongdongq/fix-gpu-tests
Fix GPU tests, use Dune as reference instead of hardcoded
2022-04-21 15:21:07 +02:00
Markus Blatt 1486690738 Merge pull request #3878 from totto82/fixDrsdtcon
fix saturated density in DRSDTCON
2022-04-21 12:14:51 +02:00
Markus Blatt ec9be88736 Merge pull request #3871 from totto82/fix_init
fix density in initialization for case without DISGAS
2022-04-19 07:44:22 +02:00
Markus Blatt c3679fb2ae Merge pull request #3867 from totto82/avoid_error
avoid throw for nan residuals instead return well as unconverged
2022-04-11 10:36:31 +02:00
Markus Blatt ff410d268a Merge pull request #3863 from totto82/unsolvable_fix
fix to --shut-unsolvable-wells=true option
2022-04-11 07:33:46 +02:00
Markus Blatt f7118e42a9 Merge pull request #3862 from akva2/update_redhat_python_versioned_packages
update redhat packaging
2022-04-10 11:24:02 +02:00
Markus Blatt 11ff26bb10 Merge pull request #3861 from bska/block-level-solvent-sat-smry
Retrieve Block Level Solvent Saturation When Requested
2022-04-06 12:13:25 +02:00
Markus Blatt 282951dc44 Merge pull request #3848 from blattms/binary-package-version-no-buildtime
Use empty string for buildtime if BUILD_TIMESTAMP is not set.
2022-04-05 14:54:58 +02:00
Markus Blatt ce0ec4ec38 Merge pull request #3854 from akva2/remove_debian_package
remove in-tree debian (ubuntu) packaging
2022-03-31 19:50:35 +02:00
Markus Blatt 08fd5da6a7 Use empty string for buildtime if BUILD_TIMESTAMP is not set.
In combination with the relevant changes in opm-common this
prevent flow in binary Linux packages from having a timestamp in the
executable that changes with every rebuild.

With the changes in opm-common  one can now set the variable
OPM_BINARY_PACKAGE_VERSION to a meaningful version string (Debian
11.2: 2021.10-4). If that is done and flow is built from tarballs it
will now not have a time stamp and print the package version to the
PRT file. E.g.

Flow Version     =  2021.10 (Debian 11.2: 2021.10-1)
2022-03-23 22:46:40 +01:00
Markus Blatt f550d08122 Merge pull request #3843 from blattms/debian-use-dist-packages-only-for-usr-prefix
[python] Make sure Python files are installed similar to opm-common.
2022-03-23 15:14:36 +01:00
Markus Blatt 5c29a3c3e7 Make determining whether to use dist-packages more bullet proof.
Seems like getsitepackages is not always implemented.
2022-03-22 12:06:23 +01:00
Markus Blatt 17ca01b607 [python] Make sure Python files are installed similar to opm-common.
Instead of always using site-packages 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.

This will also make sure that the Python files end up in the same
location as for the ones of opm-common. This should make using them
easier.
2022-03-22 12:06:12 +01:00
Markus Blatt a7e2b25627 Merge pull request #3836 from blattms/spelling-fix
Fixes spelling shoule -> should
2022-03-09 17:59:45 +01:00
Markus Blatt 6e7e0098ce Fixes spelling shoule -> should 2022-03-09 17:23:59 +01:00
Markus Blatt 0203939bc6 Merge pull request #3828 from bska/report-unique-failed-dewpoint-cells
Report Unique IJK Tuples for Failed Bubble/Dew Point Calculations
2022-03-03 10:44:47 +01:00
Markus Blatt d5b74006c5 Merge pull request #3826 from bska/dont-capture-flux-unless-needed
Don't Capture Local Flux Data Unless Needed
2022-02-26 16:38:24 +01:00
Markus Blatt e2c3cbd84a Merge pull request #3821 from bska/add-iregflow-parallel-test
Add Parallel Comparison Test for RxFy Summary Vectors
2022-02-23 20:26:07 +01:00