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
13,334 Commits 31 Branches 117 Tags
72b14cf07ee95d9de971a844e900e6f75b9c65dd
Commit Graph
13334 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tong Dong Qiu a23d881817 Reuse amgcl parameters 2021-07-07 16:24:51 +02:00
Tong Dong Qiu 47e2899ba8 Moved amgcl declarations to header 2021-07-07 16:24:51 +02:00
Tong Dong Qiu 7c7911b9bc Allow to use amgcl when CUDA and OpenCL are not found 2021-07-07 16:24:51 +02:00
Tong Dong Qiu c2869810e2 Added amgclSolverBackend 2021-07-07 16:24:51 +02:00
Tong Dong Qiu 5918c64b54 Add useWellConn parameter to WellContributions() 2021-07-07 16:24:51 +02:00
Bård Skaflestad d637f5983e Add Serialization Test for WriteRestartFileEvents 2021-07-07 14:30:46 +02:00
Bård Skaflestad 4c870373c9 Merge pull request #3438 from bska/remove-unsed-argument 
Don't Pass 'log' Argument to 'Schedule::rst_file'
 2021-07-07 14:29:45 +02:00
Bård Skaflestad cec3098c3a Don't Pass 'log' Argument to 'Schedule::rst_file' 
The function does not use that argument.
 2021-07-07 14:06:38 +02:00
Bård Skaflestad 2627a05c1e Merge pull request #3433 from osae/tracerDefaultTrue 
Default activation of tracer model.
 2021-07-07 11:54:28 +02:00
Joakim Hove c121247524 Merge pull request #3427 from joakim-hove/rst-load-udq 
Rst load udq
 2021-07-07 07:20:51 +02:00
Bård Skaflestad e64574dfcf Merge pull request #3430 from osae/tracerCrossFlow 
Some regularisation of tracer rate reporting.
 2021-07-07 00:32:53 +02:00
Bård Skaflestad 24db9d43e2 Merge pull request #3432 from akva2/code_to_data 
changed: replace code with data in restart output
 2021-07-06 20:34:12 +02:00
Ove Sævareid 738877fc1b Default activation of tracer model. 2021-07-06 17:06:10 +02:00
Arne Morten Kvarving d13b413011 changed: replace code with data in restart output 2021-07-06 15:30:34 +02:00
Ove Sævareid 6db925189c Some regularisation of tracer rate reporting. 2021-07-06 12:54:16 +02:00
Arne Morten Kvarving 8443306fb6 remove ebos_altidx 
building a whole simulator for this, and then not even
running a test for it, seems rather excessive. if a test for
index-conformance is wanted, a better approach should be taken.
 2021-07-05 13:17:13 +02:00
Joakim Hove c62a9ba198 Set external UDQState for flow blackoil 2021-07-04 08:55:07 +02:00
Joakim Hove 2b680f27af Load udq state results from restart file 2021-07-03 10:08:25 +02:00
Bård Skaflestad bbd8beb822 Merge pull request #3423 from joakim-hove/set-udq-state 
Assemble UDQState external to the vanguard
 2021-07-02 23:53:11 +02:00
Bård Skaflestad 71594c1311 Merge pull request #3411 from joakim-hove/restart-summary-only 
Restart summary only
 2021-07-02 23:48:18 +02:00
Markus Blatt ef8bd1861f Merge pull request #3425 from akva2/nullopt 
changed: use std::nullopt
 2021-07-01 15:31:09 +02:00
Markus Blatt 8d0a254211 Merge pull request #3364 from blattms/flexible-solver-determine-pressure-idx-from-model 
Determine index of pressure from model used to increase usability
 2021-07-01 15:22:50 +02:00
Tor Harald Sandve 65f207836b Merge pull request #3421 from totto82/compPotNW 
compute potentials for newly opened wells due to testing
 2021-07-01 12:08:13 +02:00
Arne Morten Kvarving b0a2fc8a67 changed: use std::nullopt 
the alternative causes some compilers to emit uninitialized
use warnings
 2021-07-01 09:00:56 +02:00
Joakim Hove 528078e8e1 Assemble UDQState external to the vanguard 2021-07-01 08:24:59 +02:00
Bård Skaflestad d5658e39db Merge pull request #3422 from bska/glift-2p 
Don't Access Phase Rates Unless Active
 2021-06-30 19:31:51 +02:00
Bård Skaflestad 4392cc8713 Don't Access Phase Rates Unless Active 
Fixes two-phase Oil/Water runs.  Probably needs more refinement
later.
 2021-06-30 17:21:52 +02:00
Arne Morten Kvarving 60cd7faaeb Merge pull request #3419 from akva2/rh_boost 
fix redhat packaging
 2021-06-30 15:10:25 +02:00
Arne Morten Kvarving 2bd59b6c35 fix redhat packaging 
- use system level boost now that RHEL6 is dead
 2021-06-30 15:05:43 +02:00
Tor Harald Sandve a00c42c673 compute potentials for newly opened wells due to testing 2021-06-30 13:13:56 +02:00
Bård Skaflestad 5ddac2e8d5 Merge pull request #3406 from GitPaean/new_fixing_guide_rate_update_together 
[new attempt] updating the guide rates for all the wells and groups at the same time
 2021-06-30 12:40:45 +02:00
Bård Skaflestad 92f636773e Merge pull request #3407 from totto82/fixGaslift 
Potentially reduce gaslift when under well is under group control
 2021-06-30 12:12:22 +02:00
Tor Harald Sandve 60f59cd6e6 Potentially reduce gaslift when under well is under group control 
Current implemention only support ORAT and GRAT controlled groups
 2021-06-30 09:59:09 +02:00
Kai Bao 12fa7a4ac8 putting all the guide rate update function in one single function 
to make sure we only do once checking of the expiration of the guide
rates.
 2021-06-29 11:41:26 +02:00
Tor Harald Sandve 42dd7ad56d Merge pull request #3413 from totto82/fixLocalFraction 
make sure the newly switched well is included in the local fraction sum
 2021-06-28 15:41:45 +02:00
Bård Skaflestad b79b08e86f Merge pull request #3414 from OPMUSER/RUNSPEC-GRID 
Add GRAVITY keyword to UnsupportedFlowKeywords
 2021-06-28 13:26:43 +02:00