OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,479 Commits 31 Branches 117 Tags
fc45b1bd472da2a95089c33aa5f72bdcc37254d9
Commit Graph
11479 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve fc45b1bd47 Add inner iterations for standard wells also 2020-08-11 09:10:19 +02:00
Markus Blatt c1effde738 Merge pull request #2722 from blattms/fix-reorder-ilu0-opencl 
[OpenCL] Fixes out of bounds read in reordering code in ILU0.
 2020-08-07 18:09:12 +02:00
Markus Blatt 5743a979e3 Formatting: added missing space. 2020-08-07 09:38:10 +02:00
Markus Blatt 8d3eac81a5 [OpenCL] Fixes out of bounds read in reordering code in ILU0. 
rowPerColor only has size numColors!
 2020-08-05 21:22:01 +02:00
Markus Blatt da40f0200e Merge pull request #2720 from blattms/correctly-free-cuda-mem-for-ms 
Also free memory allocated with CUDA later with CUDA
 2020-08-04 13:50:33 +02:00
Markus Blatt c28a12636a Also free memory allocated with CUDA also with CUDA 
With multisegment wells we allocate WellContributions::hx and hy with
`CudaMallocHost`. Yet we tried to deallocate them with
`delete[]`. This caused segementation faults e.g. for
model1/MSW_MODEL_1. Now we use `CudaFreeHost` for freeing if we used
CUDA.

Closes #2719
 2020-08-04 12:54:27 +02:00
Atgeirr Flø Rasmussen 3a0469cde1 Merge pull request #2704 from bska/remove-basic-warning 
Cell Data: Don't Warn About Supported Output Directives
 2020-07-28 15:52:59 +02:00
Bård Skaflestad 8c8635d221 Cell Data: Don't Warn About Supported Output Directives 
This commit ensures that we don't issue misleading warning about
output creation directives such as

    BASIC
    FREQ
    RESTART

that could be, and typically are, put into keywords like RPTRST and
RPTSCHED.  Previously, we would interpret these directives as names
of cell vectors and we would get very confusing diagnostic messages
of the form

    Keyword 'BASIC' is unhandled for output to file

which suggests that 'BASIC' is unsupported despite the output system
supporting the directive for quite some time.  While here, also
apply the same reasoning to the vectors we always output such as
SWAT, SGAS, or PRESSURE.
 2020-07-28 13:36:25 +02:00
Atgeirr Flø Rasmussen af413f474c Merge pull request #2715 from atgeirr/fix-opencl-cmake 
Fix CMake variable case bug.
 2020-07-28 13:17:13 +02:00
Atgeirr Flø Rasmussen 0205f54caf Fix CMake variable case bug. 
This caused compile failure on a system without the c++ OpenCL binding header cl.hpp.
 2020-07-28 12:42:55 +02:00
Markus Blatt 6c1f8bd872 Merge pull request #2707 from blattms/fix-opencl-warnings 
Fix some warnings in the OpenCl Solver.
 2020-07-21 14:18:26 +02:00
Markus Blatt f37fa8bbd9 Prevent unused variable warnings without CUDA in WellContributions. 2020-07-21 11:24:19 +02:00
Markus Blatt 59064b4ac2 Prevent warning about shadowing dim_wells and dim. 2020-07-10 13:40:38 +02:00
Markus Blatt efd3aeb290 Catch exceptions by const reference to prevent warnings. 
e.g. gcc issued: "warning: catching polymorphic type ‘class cl::Error’ by value [-Wcatch-value=]"
 2020-07-10 13:40:38 +02:00
Markus Blatt faaee51d09 Merge pull request #2682 from Tongdongq/openclSolver 
Added openclSolver
 2020-07-10 13:38:32 +02:00
T.D. (Tongdong) Qiu 5971a7ae9e Split WellContributions into .cpp and .cu 2020-07-10 11:13:55 +02:00
Bård Skaflestad 2212229481 Merge pull request #2705 from joakim-hove/actionx-wlist 
Add WListManager argument when constructing ActionContext
 2020-07-09 15:59:27 +02:00
Tongdongq f90bb85960 Merge pull request #1 from blattms/openCLSolver-g++-8.3 
include missing header for OpenCLSolver with g++-8.3
 2020-07-09 09:25:08 +02:00
Joakim Hove 8f78a15938 Add WListManager argument when constructing ActionContext 2020-07-09 07:30:37 +02:00
Bård Skaflestad 47d4a5087f Merge pull request #2698 from totto82/applyPVTWsalt 
Pass the salt concentration to the water PVT
 2020-07-08 09:32:51 +02:00
T.D. (Tongdong) Qiu af02fc3924 Added try-catch around the linear solve 2020-07-07 16:07:42 +02:00
T.D. (Tongdong) Qiu 0b20762e59 Clarified parameter help print and chosen OpenCL platform and device 2020-07-07 14:26:02 +02:00
T.D. (Tongdong) Qiu ab49f60eca Added opencl.hpp to define variables and import opencl 
Added opencl.cpp to get OpenCL error strings
 2020-07-07 13:46:47 +02:00
T.D. (Tongdong) Qiu 91591abd56 Removed removed file from cmake install list 2020-07-07 11:42:00 +02:00
Markus Blatt 7a571c98db include missing header for OpenCLSolver with g++-8.3 
Without I got compilation errors.
 2020-07-07 11:10:19 +02:00
T.D. (Tongdong) Qiu 478e2ee971 Improved rowsPerColor usage 2020-07-07 11:00:38 +02:00
T.D. (Tongdong) Qiu 5aa8dda487 Changed default parallel strategy to GRAPH_COLORING 2020-07-06 13:56:27 +02:00
T.D. (Tongdong) Qiu 4c037b0998 Removed unused test kernels 2020-07-06 13:56:27 +02:00
T.D. (Tongdong) Qiu a164a57220 Added memory management to BlockedMatrix 2020-07-06 13:55:50 +02:00
T.D. (Tongdong) Qiu 779a713330 Simplified BdaSolverStatus 2020-07-06 13:40:44 +02:00
T.D. (Tongdong) Qiu 833ea8ae72 Added templated blockinversion for C-style arrays 2020-07-06 13:40:44 +02:00
T.D. (Tongdong) Qiu bb622449b6 Changed platformID and deviceID to commandline parameter. Make sure Flow exits cleanly upon invalid platform- or deviceID. 2020-07-06 13:38:57 +02:00
Tom Hogervorst c8eb14aaac Graph coloring now uses CSC-format version of input pattern as well. 2020-07-06 13:29:30 +02:00
Tom Hogervorst 38c58bffae Renamed functions to all used Camel case, and renamed parameters to better represent what is stored in them. 
Fixed mistake of using wrong sparsity pattern data to call canBeStarted function, and removed nnzValues of CSCmat, which were never used.
 2020-07-06 13:18:46 +02:00
T.D. (Tongdong) Qiu 7f8faa018b Replaced timing function with Dune::Timer 2020-07-06 11:22:11 +02:00
T.D. (Tongdong) Qiu 845563c37b Replaced hardcoded constant with template 2020-07-06 11:20:43 +02:00
Bård Skaflestad fef0c7c03f Merge pull request #2703 from joakim-hove/restartvalue-add-group 
Add data::GroupValues member to RestartValue
 2020-07-05 19:31:27 +02:00
Joakim Hove b9b1e734cb Add data::GroupValues member to RestartValue 2020-07-04 10:06:03 +02:00
Joakim Hove 30a4f2b34b Merge pull request #2696 from bska/chase-groupdata-api 
Simulator Group Data: Chase Upstream API Update
 2020-07-02 21:37:24 +02:00
Tor Harald Sandve fdf0f1ed27 SALTVD and BDENSITY is not implemented 2020-07-02 13:49:05 +02:00
Tor Harald Sandve 88ee892fdf pass the saltConcentration to the waterPVT 2020-07-02 13:44:01 +02:00
Bård Skaflestad 5bb4321824 Simulator Group Data: Chase Upstream API Update 
This commit makes the 'groupData()' function return a

    map<string, Opm::data::GroupData>

object instead of a

    map<string, Opm::data::GroupConstraints>

object.  The 'GroupData' structure adds a level of indirection to
the current per-group summary quantities that are directly assigned
by the simulator.  While here, also move the assignment of the
current group constraints/control values out to a separate helper
to reduce the body of the per-group loop in 'groupData()'.

This is in preparation of adding support for reporting group-level
production/injection guiderates (Gx[IP]GR) to the summary file.
 2020-07-01 22:52:26 +02:00
Bård Skaflestad 6a6f55b099 Merge pull request #2697 from bska/restore-sequential-build 
Don't Name Type that does not Exist in Sequential Configurations
 2020-07-01 22:50:58 +02:00
Bård Skaflestad 8e20e0957f Don't Name Type that does not Exist in Sequential Configurations 
This commit makes the constructor PressureInverseOperator that
accepts a Dune::OwnerOverlapCopyCommunication<> object contingent on
having MPI.  The type does not exist otherwise.
 2020-07-01 21:52:57 +02:00
Markus Blatt c01e6d14f7 Merge pull request #2694 from atgeirr/flexible-wellop 
Allow well operators with FlexibleSolver.
 2020-07-01 20:30:44 +02:00
Atgeirr Flø Rasmussen f2395f6d94 Merge pull request #2695 from totto82/addBrineOutput 
Add brine to output
 2020-07-01 11:46:23 +02:00
Atgeirr Flø Rasmussen a66260fe87 Merge pull request #2684 from totto82/convertUsingPriviousRates 
use rates from previous time-step in the guiderate conversion
 2020-07-01 11:04:22 +02:00
Atgeirr Flø Rasmussen 4448d8f5ed Merge pull request #2691 from bska/prepare-guiderate-smry 
EclWriter: Refactor Cell Loop out to Helper Function
 2020-07-01 10:48:03 +02:00
Atgeirr Flø Rasmussen 3554fae75b Merge pull request #2693 from totto82/addOilWaterBrine 
Add oil water brine specialization
 2020-07-01 09:58:45 +02:00
Tor Harald Sandve 6a7e816368 Add brine to output 2020-06-30 14:15:54 +02:00