OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 09:22:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,187 Commits 31 Branches 117 Tags
5a7029f53c84d31c2525b791da26fff0b088e978
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Markus Blatt eb7ffdb47c Merge pull request #3811 from bska/communicate-iregflows 
Communicate Inter-Region Flows to I/O Rank
 2022-02-18 20:47:23 +01:00
Markus Blatt d7b5d0f686 Merge pull request #3796 from bska/accumulate-iregflow-values 
Accumulate Inter-Region Phase Flow Rate Contributions
 2022-02-18 14:28:20 +01:00
Markus Blatt 1d44a4beac Merge pull request #3817 from bska/fix-pedantic-warning 
Remove Extraneous Semicolon
 2022-02-18 10:10:44 +01:00
Markus Blatt a520733d5b Merge pull request #3774 from plgbrts/expli-salt 
allow for explicit initialization of SALT and SALTP
 2022-02-11 14:35:57 +01:00
Markus Blatt 3b8501469c Merge pull request #3800 from Tongdongq/move-gpu-files 
Move gpu files
 2022-02-03 12:55:41 +01:00
Markus Blatt 4407fdd3db std::regex_replace use $n for referencing and not \n. 2022-01-27 17:22:09 +01:00
Markus Blatt 710d648eda Prevent multiple *.?.dbg/prt files in production crashed parallel runs. 
There was a fallout when skipping concating these files to the
default ones (PR #1708). We should also have deactivated creating
these files at all. As a result these files appeared in all parallel
runs that were aborted.

This change now prevents creating and logging to these files in
parallel in a default
run (--enable-parallel-logging-fallout-warning=false).

Developers can still activate logging and concating to see whether
everything is only logged on the io process by passing
--enable-parallel-logging-fallout-warning=true.

Closes 3725
 2022-01-27 17:21:29 +01:00
Markus Blatt fe0387be4d Merge pull request #3779 from akva2/fix_dune2.6_build 
fixed: build with dune 2.6
 2022-01-21 08:57:02 +01:00
Markus Blatt 8bf6c9f2b5 Merge pull request #3775 from akva2/fix_csr_csc_fallout 
fixed: conditionally build test_csrToCscOffsetMap
 2022-01-18 13:57:46 +01:00
Markus Blatt 3db9a4e3e5 Merge pull request #3750 from ducbueno/isai-ilu 
Adds IncompleteSAI preconditioner to openclSolver
 2022-01-18 12:38:39 +01:00
Markus Blatt c231e3b56b Merge pull request #3767 from blattms/fix-opencl-warn-from-refactor 
Include config.h in clSources.cpp to include correct openCL header.
 2022-01-11 21:42:21 +01:00
Markus Blatt ba0bce0fa7 Include config.h in clSources.cpp to include correct openCL header. 
Otherwise the definitions determined by CMake are not available to
opm/simulators/linalg/bda/opencl.hpp and choosing the correct header
might fail.

On my system this at least fixes a warning.

Fallout from #3749
 2022-01-11 20:13:45 +01:00
Markus Blatt 790fa8044e Merge pull request #3755 from blattms/fix-opencl-apply-stdwells-rebased 
Fix opencl apply stdwells rebased (replaces #3746)
 2022-01-11 19:18:03 +01:00
Markus Blatt 9bf55a0c6c Let ctest test 3_A_MPI_MULTFLT_SCHED_MODEL2 in parallel. 
This would have detected OPM/opm-common#2922 as the test fails
with master.
Needs OPM/opm-common#2923 to succeed.
 2022-01-10 20:58:22 +01:00
Markus Blatt bf53d5b0ad Merge pull request #3765 from bska/communicate-dissolved-rates 
Accumulate Dissolved Gas and Vaporized Oil Flow Rates Across Ranks
 2022-01-10 16:15:06 +01:00
Markus Blatt 994260aaea Merge pull request #3754 from blattms/clean-opencl-kernels-rebased 
Clean opencl kernels rebased (rebased #3749)
 2021-12-22 15:52:40 +01:00
Markus Blatt 89bc7d9ef0 Variable DEBUG_KERNEL renamed to DEBUG_OPENCL_KERNELS_INTEL 
... to indicate that this only works on Intel and to make the
name less generic.
 2021-12-22 12:44:07 +01:00
Markus Blatt 723fd50d4c Merge pull request #3748 from hakonhagland/glift_swg_fx2 
Refactor some methods in `GasLiftSingleWellGeneric.cpp`
 2021-12-21 20:55:48 +01:00
Markus Blatt 0485c65d16 Merge pull request #3740 from atgeirr/make-split-comm-test-runtime-optional 
Replace DEMONSTRATE_RUN_WITH_NONWORLD_COMM macro with runtime bool.
 2021-12-20 12:46:49 +01:00
Markus Blatt 04308922c8 Merge pull request #3733 from akva2/fix_dune2.6_in_test 
fix build with dune 2.6
 2021-12-09 14:02:14 +01:00
Markus Blatt 77e03660d9 Merge pull request #3731 from blattms/fix-opencl-cpr-serial 
Fixes compilation of opencl CPR without MPI
 2021-12-08 20:55:35 +01:00
Markus Blatt ac41c318da Fixes compilation of opencl CPR without MPI 2021-12-08 20:24:14 +01:00
Markus Blatt a61f69bb79 Merge pull request #3672 from Tongdongq/add-cpr-opencl 
Add CPR preconditioner to openclSolver
 2021-12-08 19:44:59 +01:00
Markus Blatt 44faf036c9 Merge pull request #3716 from totto82/moveGetPerfCellPressureToInterface 
Move getPerfCellPressure to wellInterface
 2021-11-30 16:35:28 +01:00
Markus Blatt 6d8223f233 Merge pull request #3602 from blattms/parallel-tracers 
[feature] Adds support for computing tracers in parallel runs.
 2021-11-23 12:39:48 +01:00
Markus Blatt 50867bf23c Guard include of WellContributions.cpp 2021-11-17 19:23:46 +01:00
Markus Blatt d2caf41037 Fix incomplete type ‘Opm::WellContributions’ compiler error (g++-8) 
Fixes
```
In file included from opm-simulators/opm/simulators/flow/BlackoilModelEbos.hpp:53,
                 from opm-simulators/opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp:26,
                 from opm-simulators/flow/flow_ebos_gaswater.cpp:28:
opm-simulators/opm/simulators/linalg/ISTLSolverEbos.hpp: In member function ‘bool Opm::ISTLSolverEbos<TypeTag>::solve(Opm::ISTLSolverEbos<TypeTag>::Vector&)’:
opm-simulators/opm/simulators/linalg/ISTLSolverEbos.hpp:265:56: error: incomplete type ‘Opm::WellContributions’ used in nested name specifier
                 auto wellContribs = WellContributions::create(accelerator_mode, useWellConn_);
                                                        ^~~~~~
```
 2021-11-17 17:30:01 +01:00
Markus Blatt 6f40d63f1f [cmake] Add common source files for CUDA/OpenCL/amgcl only once. 2021-11-17 17:30:01 +01:00
Markus Blatt 95651bc35c Fixes unused variable warning. 2021-11-17 16:02:16 +01:00
Markus Blatt 9a80d806c0 Setup parallel solvers for tracers. 2021-11-17 16:02:16 +01:00
Markus Blatt 342352d100 Use cellCentroids lookup function exported from vanguard. 
That will take care of doing the right thing in parallel.
 2021-11-17 15:55:07 +01:00
Markus Blatt 89f819ce66 Honor tracers in parallel. 2021-11-17 15:55:07 +01:00
Markus Blatt a0252061fb Merge pull request #3701 from akva2/fix_bda_build 
fixed: build without any bda backend
 2021-11-17 13:40:24 +01:00
Markus Blatt 2e491fbce6 Fixed spelling errors in flow.1 mang page. 
When generating it an older version of flow (with spelling errors)
was used with help2man.
 2021-11-16 22:40:27 +01:00
Markus Blatt e2c76dff3d Updated man-page for 2021 release. 
help2man -h "-h" --version-string="2021.10" --no-discard-stderr -n \
"Eclipse compatible parallel reservoir simulator" -N flow > man.1
 2021-11-16 13:28:56 +01:00
Markus Blatt b0792db164 Include limits header where needed for g++-11 
Without this compilation fails on Debian unstable.
 2021-11-15 12:11:25 +01:00
Markus Blatt a2246d331b Spelling fixes 
Gbp-Pq: Name 0005-Spelling-fixes.patch
 2021-11-15 12:06:05 +01:00
Markus Blatt 7fa9e8d983 Manually fix unbreakable long lines. 
Warning was:

W: libopm-simulators-bin: manpage-has-errors-from-man usr/share/man/man1/flow.1.gz 202: warning [p 5, 0.5i]: cannot adjust line

Gbp-Pq: Name 0003-Manually-fix-unbreakable-long-lines.patch
 2021-11-15 12:06:05 +01:00
Markus Blatt 64cdc95fac Added man pages for flow. 
Generated using:

declare -A short_desc
short_desc['flow']='Eclipse compatible parallel reservoir simulator'
short_desc['ebos']='Eclipse compatible parallel reservoir simulator for research'
for key in "${!short_desc[@]}"; do
           help2man -h "-h" --version-string="2021.04" --no-discard-stderr -n "${short_desc[$key]}" -N $key >\
           $key.1
done

Gbp-Pq: Name 0002-Added-man-pages-for-flow-and-ebos.patch
 2021-11-15 12:06:05 +01:00
Markus Blatt afc5ed751f Merge pull request #3691 from akva2/bda_wellcontrib_refactor 
Refactor BDA well contributions
 2021-11-15 10:26:44 +01:00
Markus Blatt ec56782288 Merge pull request #3690 from akva2/wellcontrib_cleanups 
Some simple cleanup in BDA WellContributions
 2021-11-15 10:18:12 +01:00
Markus Blatt c54e85a8eb Fixes compilation of WellContributions with deactivated OpenCL. 
OpenCL header was included and OpenclKernels used unconditionally
in WellContributions.cpp. As this file is compiled if CUDA is found,
too it lead to undefined references for e.g. cl::CommandQueue if
opencl headers were there and compile error if not.
 2021-11-10 19:41:59 +01:00
Markus Blatt ad44564f27 Merge pull request #3619 from Tongdongq/opencl-refactor 
Opencl refactor
 2021-11-08 16:45:57 +01:00
Markus Blatt 02bbe995c3 Fixes warning about catching polymorphic type by value. 
Removed message in amgclbackend was:
warning: catching polymorphic type ‘class
boost::property_tree::json_parser::json_parser_error’ by value
[-Wcatch-value=]
 2021-11-03 18:07:56 +01:00
Markus Blatt 932ddcd32d Merge pull request #3652 from akva2/use_opencl_hpp 
changed: probe for cl/opencl.hpp and use if found
 2021-11-02 09:31:05 +01:00
Markus Blatt 9197ee3e20 Prevent deprecation warning about cl2.hpp: __CL_ENABLE_EXCEPTIONS. 2021-10-28 17:09:22 +02:00
Markus Blatt 4de52a8d30 Use OpenCl's CL/cl2.hpp instead of CL/cl.hpp 
We still request Standard version 1.2 only.
We need to use KernelFunctor instead of make_kernel.
In addition cl::Sources now works on std::string and
does not support std::pair<const char*, in> anymore.
 2021-10-28 16:42:43 +02:00
Markus Blatt a1e90be2aa Use grid view from simulator for element mapper. 
With dune-fem the type of the grid view is
Dune::Fem::AdaptiveLeafGridPart and not the LeafGridView
of the grid. The old approach therefore did not compile
as we passed the wrong view.
 2021-10-26 21:55:04 +02:00
Markus Blatt b8a1f04a48 Added missing explicit template instatiations for dune-fem 2.8. 2021-10-26 21:54:41 +02:00
Markus Blatt 85b5a60270 [bugfix] Exclude pv of numerical aquifer cells for CNV violation. 
In some models there will be only a few cells with rather high pore volume representing the numerical aquifer. Including them (as non-violated cells) in the ratio will make the ratio lower than without the aquifer there and might lead to accepting vectors as converged when they should not.
 2021-10-26 12:01:46 +02:00
Markus Blatt fa9e93529b Only consider perforation in the interior of the local grid. 
This is needed for distributed wells to save most of the code
from checking whether a perforation is in the interior.

We add new methods compressedIndexForInterior that return -1
for non-interior cells and use that for the wells. This restores
the old behaviour before 1cfe3e0aad
 2021-10-19 16:50:42 +02:00
Markus Blatt 23e0b06387 Allow communicators other than MPI_COMM_WORLD. 2021-10-19 12:44:41 +02:00
Markus Blatt 6f0461691a [bugfix] Make tracerConcentrations_ valid for non-restart writes. 
We decide whether to write tracer concentrations based on the size
of the tracerConcentrations_ container. Hence we need to make sure
that its size is zero after the concentrations have been written
and now resize the container to reflect that.

Before this change only the container inside tracerConcentrations_
were moved (and hence made empty) and next tiem we passed empty
containers to the output writing functions (which in parallel
triggered an assertion).
 2021-10-14 11:05:33 +02:00
Markus Blatt cc1adf0b2a Merge pull request #3586 from blattms/tracer-use-well-container 
[refactor] Use well_container and PerforationData for tracers
 2021-10-12 09:55:33 +02:00
Markus Blatt ed73f1b326 Merge pull request #3592 from blattms/fix-3574 
remove assert for isfinite and correctly handle exceptions
 2021-10-08 21:18:18 +02:00
Markus Blatt fc7609bfd2 [bugfix] Make sure all ranks participate in collective communication. 
No need an early return if there are no local wells, anyway. The
algorithms can handle empty containers like a charm.
 2021-10-08 16:01:18 +02:00
Markus Blatt 1520f9c85f [bugfix] handle exception when linearizing the wells. 
As multisegment wells may throw in applyUMFPack this is now needed and
the exception needs to communicated to all processes. We do this in
the linearize method of the well model.

Before this change this is what could happen:
- The process with the exception would have chopped the time step
- The others would have successfully setup the systems and entered the
  linear solve

This  poduced a deadlock. One processes was waiting in
OPM_END_PARALLEL_TRY  during the setup of the shorter time step and in
collective communication during the setup of the linear solver for the
unchopped time step.
 2021-10-08 16:01:07 +02:00
Markus Blatt d4ab9ea4b1 [refactor] Use well_container and PerforationData for tracers 
This saves some (expensive?) lookups that already have been done
in the well model. We had to make the well_container accessible from
the well model for this.

Using the perforation data will automatically make sure that the
perforations are not shut and reside on this process in a parallel run.
 2021-10-07 21:55:41 +02:00
Markus Blatt f2ce097b4b Merge pull request #3575 from Tongdongq/fix-ilu-decomp-gpu 
Create and use scale kernel for relaxation of ILU
 2021-10-07 15:55:17 +02:00
Markus Blatt 011fb1034e Merge pull request #3571 from atgeirr/allow-non-world-comm 
Replacing use of MPI_COMM_WORLD with a variable communicator.
 2021-10-06 15:52:17 +02:00
Markus Blatt 457d270bdf [refactor] Move cell centroid lookup magic to vanguard for reuse. 
In addition to transmissibilities We will need this for the tracers,
too, and should prevent code duplication.
 2021-10-04 09:47:03 +02:00
Markus Blatt af74de9a5b Merge pull request #3558 from bska/detect-serializeOp-member 
Serializer: Detect Existence of 'serializeOp' Member Function
 2021-09-29 16:40:46 +02:00
Markus Blatt f6ecacf1b7 Merge pull request #3551 from joakim-hove/pinfo-ws 
Use SingleWellState to manage parallel well info
 2021-09-29 09:59:00 +02:00
Markus Blatt 88ae5b5963 Merge pull request #3545 from blattms/fix-parallel-try-catch 
[bugfix] Fix deadlocks because of parallel try-catch for some CO2 storage cases
 2021-09-27 13:02:34 +02:00
Markus Blatt e0f7b082c1 Merge pull request #3542 from blattms/unordered_map-compressed2cartesian 
Save space for cartesianToCompressed mapping.
 2021-09-24 10:24:34 +02:00