Kai Bao
5e74466aed
Merge pull request #3445 from plgbrts/rateconvfixed
...
Rateconvfixed
2021-08-03 00:07:19 +02:00
Bård Skaflestad
76b16d2699
Merge pull request #3455 from akva2/no_unused_macro
...
changed: get rid of OPM_UNUSED macro usages
2021-08-02 20:38:06 +02:00
Arne Morten Kvarving
78c5675daf
changed: get rid of OPM_UNUSED macro usages
...
prefer anonymous parameters or c++17 [[maybe_unused]]
2021-08-02 14:55:41 +02:00
Paul Egberts
a80894d679
using if constexpr ()
2021-08-02 13:39:55 +02:00
Paul Egberts
8e8f6c5ff2
fix compositionSwitchEnabled declaration. For gas-water it is disabled
2021-08-01 21:02:07 +02:00
Paul Egberts
70d43fbefc
using has_wfrac(gfrac)_variable logic, In case of gas-water system GFrac is primary variable index
2021-08-01 20:51:28 +02:00
Paul Egberts
5be63a59e0
Introduction of has_wfrac(gfrac)_variables analogue to multisegmentwell implementation
2021-08-01 20:40:04 +02:00
Paul Egberts
367c762a06
moved WFrac, GFrac definition to StandardWellEval.hpp
2021-08-01 20:36:05 +02:00
Paul Egberts
d5653d9ca2
removed exit failure for gas-water system
2021-08-01 18:11:56 +02:00
Paul Egberts
e25b78f106
fix for relative change calculation for gas-water system
2021-08-01 18:09:54 +02:00
Paul Egberts
25393cddee
removed throw for water-gas system
2021-08-01 17:57:08 +02:00
Paul Egberts
b8b881d6e9
allow for water-gas system
2021-08-01 17:53:57 +02:00
Paul Egberts
ec4bb5c9c7
set gas saturation for water-gas system
2021-08-01 17:52:33 +02:00
Joakim Hove
e01910adc2
Add methods WellState::size() and WellState::producer()
2021-07-26 14:21:50 +02:00
Joakim Hove
a39fcc9708
Set WellState::thp when loading restart file
2021-07-26 13:07:12 +02:00
Joakim Hove
057db0ec0e
Add method WellState::name()
2021-07-26 13:07:12 +02:00
Paul Egberts
0efe03497a
some clean up
2021-07-23 16:41:50 +02:00
Paul Egberts
92f7b19594
delete head message
2021-07-23 16:41:50 +02:00
Paul Egberts
a813d9e875
fix for the situation that hydrocarbon consist only of gas
2021-07-23 16:41:50 +02:00
Markus Blatt
ea4e4a1520
Merge pull request #3346 from Tongdongq/amgcl-support
...
Amgcl support
2021-07-21 15:02:25 +02:00
Markus Blatt
bb9f941f2f
Merge pull request #3443 from bska/address-static-analysis-warnings
...
Address Static Code Analysis Warnings
2021-07-15 08:58:30 +02:00
Bård Skaflestad
48e1af8bbe
Address Static Code Analysis Warnings
...
In particular, don't print uninitialized memory (Reorder.cpp:left)
and don't capture objects ('prm') that aren't actually used. While
here, refactor the initialization of the MT19937 random number
generator. Constructing this object is too expensive to do for each
try, especially when we can just run the generator in place.
2021-07-13 11:37:57 +02:00
Joakim Hove
847288ea68
Merge pull request #3440 from OPMUSER/ValidationKeywords
...
Partially Supported Keywords Validation
2021-07-10 18:10:24 +02:00
OPMUSER
272ae1c8f8
Minor updates
...
Delete time stamp
update WCONPROD, TRACER and TRACERS
2021-07-10 14:05:33 +08:00
OPMUSER
22a2720e5a
Partially Supported Keywords Validation
...
All keywords that can be checked with the existing validation frame work. All failures will continue, even if the message says "will STOP". The only exception is GUIDERAT(2) as parser check results in the STOP; however, this going to change so the STOP will happen with this code.
Comments and agreement between continue and STOP actions appreciated-
2021-07-10 14:05:33 +08:00
OPMUSER
741fddc2f7
Update UnsupportedFlowKeywords with Some Output Comments
...
Just minor changes to the output strings for better clarity.
2021-07-10 14:05:33 +08:00
OPMUSER
82834c0a3b
Unsupported Keywords: Fix RVCONST add ROCKOPTS
...
Added ROCKOPTS to unsupported keyword list, as there are no opm-test examples, is this correct?
If ROCKOPTS is supported what is supported?
2021-07-10 14:05:33 +08:00
Tong Dong Qiu
796d1b7f8a
Allow to choose a platform and device when using amgcl with VexCL
2021-07-09 17:03:11 +02:00
Tong Dong Qiu
0ee6b58fb0
Only initialize VexCL once
2021-07-09 15:39:35 +02:00
Tong Dong Qiu
b0749ce7d4
Use default parameters if json file does not specify all.
...
Throw exception if json file cannot be parsed.
2021-07-09 14:07:55 +02:00
Bård Skaflestad
bf3216ed1e
Merge pull request #3441 from atgeirr/fix-bug-and-warning
...
Fix bug and warning
2021-07-08 18:26:30 +02:00
Atgeirr Flø Rasmussen
38d68fbae4
Do not use C99 variable-length arrays.
2021-07-08 17:55:28 +02:00
Atgeirr Flø Rasmussen
3253a79693
Instantiate pack etc. for new integer type.
...
The std::uint_fast64_t is used in WriteRestartFileEvents, from
opm-common.
2021-07-08 17:55:28 +02:00
Arne Morten Kvarving
4b8b63aa85
Merge pull request #3431 from bska/write-restart-file-events
...
Add Serialization Test for WriteRestartFileEvents
2021-07-08 10:49:08 +02:00
Tong Dong Qiu
aa63da2bd3
Update GPU tests
2021-07-07 17:03:48 +02:00
Tong Dong Qiu
f77d745b51
Factor out CUDA part of amgclSolver
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
b2156a4edc
Remove unused variable warnings
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
b28c96699b
Combine blocked and unblocked VexCL implementations
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
5306ae6a60
Allow VexCL to use unblocked matrices
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
47ffeaf24a
Allow VexCL to use runtime parameters
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
b4eb711c71
Enable the VexCL backend, disabled for blocksize=1
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
a3d8d6655f
Added enum for amgcl_backend_type
2021-07-07 16:24:52 +02:00
Markus Blatt
7b004d34e8
Prevent warnings form VexCL/amgcl using system include directories.
2021-07-07 16:24:52 +02:00
Markus Blatt
adc2bf46b9
Search for VexCL and create an imported target.
...
Unfortunately, we cannot us the imported targets. They add some compile
parameters using generator expressions based on the CXX_COMPILER_ID.
While we are using the system CXX compiler for most of the stuff, some
cuda code is compiled with nvcc which at least for some versions does
not support -Wno-catch-value (which gets passed as normal compiler
option).
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
d45f9d08f7
Allow amgcl without CUDA
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
e556124405
Allow to choose amgcl backend at runtime, added default amgcl params
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
282f611f92
Make sure amgcl can be used without CUDA
2021-07-07 16:24:52 +02:00
Markus Blatt
b197130b3e
Use amgcl::amgcl target, but only extract INTERFACE_INCLUDE_DIRS.
...
There is no AMGCL_INCLUDE_DIRS when using find_package. We now query
the target amgcl::amgcl for INTERFACE_INCLUDE_DIRS and store the
result in AMGCL_INCLUDE_DIRS.
Note that we cannot link amgcl::amgcl target to libopmsimulators as
this sets the -fopenmp flag for all the source files and makes
compilation with nvcc fail.
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
a08195a983
Use CMake config of amgcl itself
2021-07-07 16:24:52 +02:00
Tong Dong Qiu
3c1bfeb72f
Let amgcl use runtime parameters via JSON file
2021-07-07 16:24:52 +02:00
