OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,768 Commits 24 Branches 101 Tags 97 MiB
4f75d1ab8d
Commit Graph

13768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
4f75d1ab8d Add gasoil + energy simulator 
Useful when combining CO2STORE + THERMAL

This PR also fixes an issue with missing phases in computation of output temperature
 2021-12-07 09:18:38 +01:00
Joakim Hove
ad10e419da
Merge pull request #3707 from joakim-hove/tracer-optional 
Initialize tracers based on optional values in TracerConfig
 2021-11-24 09:42:18 +01:00
Bård Skaflestad
842766d6d6
Merge pull request #3705 from totto82/fixSignPot 
guard against negative and trivial potentials
 2021-11-23 20:12:53 +01:00
Tor Harald Sandve
50ab26c330 cleanup 2021-11-23 14:01:07 +00:00
Joakim Hove
8869d7f02d
Merge pull request #3704 from joakim-hove/refactor-deck-api 
Update deck access api
 2021-11-23 14:58:40 +01:00
Joakim Hove
8f31d3150e Initialize tracers based on optional values in TracerConfig 2021-11-23 13:00:50 +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
Tor Harald Sandve
43fd50e355 only mark negative potentials as not operable 2021-11-22 11:27:45 +00:00
Tor Harald Sandve
b5cdb1048a Mark wells with negative and trivial potentials as not operable 
The simulator will try to compute potentials at every iterations to
try to reopen the well.
 2021-11-22 08:44:17 +00:00
Joakim Hove
36281b2aed Update deck access api 2021-11-18 15:11:50 +01:00
Joakim Hove
2903814649
Merge pull request #3702 from joakim-hove/mark-tracer-solution 
Flag tracer solution data with data type RESTART_TRACER_SOLUTION
 2021-11-18 09:39:31 +01:00
Arne Morten Kvarving
ec7998d584
Merge pull request #3703 from blattms/fix-bda-wellcontrib-incomplete 
Fixes compile error incomplete type WellContributions
 2021-11-17 20:16:03 +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
Joakim Hove
b4b1045dc2 Flag tracer solution data with data type RESTART_TRACER_SOLUTION 2021-11-17 14:27:46 +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
Bård Skaflestad
d163bebcdc
Merge pull request #3699 from blattms/man-page-spelling 
Adds manpage and fixes several spelling issue found by lintian
 2021-11-17 09:59:50 +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
Arne Morten Kvarving
11c0a75080 fixed: build without any bda backend 2021-11-16 15:48:29 +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
Joakim Hove
2b0bce970c
Merge pull request #3698 from joakim-hove/rename-restart 
Suggestion: Rename restart case to ${CASE}_RESTART in regression test
 2021-11-16 10:46:58 +01:00
Joakim Hove
11ac39fa52
Merge pull request #3686 from joakim-hove/geo-actionx 
Geo actionx
 2021-11-15 22:30:52 +01:00
Kai Bao
c2e18fd077
Merge pull request #3573 from totto82/crossFlowEcon 
remove assert and handle opposite rates in wecon related fractions.
 2021-11-15 15:31:05 +01:00
Joakim Hove
4d1fb8c797
Merge pull request #3700 from blattms/gcc-11 
Include limits header where needed for g++-11
 2021-11-15 13:13:07 +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
Bård Skaflestad
f2fab4475b
Merge pull request #3695 from GitPaean/remove_pv_fraction 
removing --relaxed-max-pv-fraction for num aquifer tests
 2021-11-14 22:44:43 +01:00
Joakim Hove
3d07797670
Merge pull request #3683 from bska/fix-incorrect-vector-tag 
Fix Incorrect Solution Array Tag
 2021-11-14 16:12:54 +01:00
Bård Skaflestad
6bf741502f Fix Incorrect Solution Array Tag 
The Flow specific PORV_RC and TMULT_RC solution arrays were tagged
as ECLIPSE compatible.  Mark them as Flow specific so they do not
cause restart problems in the ECLIPSE compatible case.
 2021-11-14 15:41:14 +01:00
Joakim Hove
ccb708e716 Rename restart case to ${CASE}_RESTART 2021-11-14 13:16:57 +01:00
Joakim Hove
b28c3abbc5
Merge pull request #3693 from akva2/fix_changed_tests 
fixed: only update files if they actually changed
 2021-11-14 13:11:12 +01:00
Kai Bao
e7010ba6f4 removing --relaxed-max-pv-fraction for num aquifer tests 2021-11-12 14:32:10 +01:00
Tor Harald Sandve
ae5a1df29c
Merge pull request #3638 from blattms/exclude-pv-aquifer-cnv 
Exclude pv of numerical aquifer cells in ratio of cells violating CNV
 2021-11-12 13:27:58 +01:00
Arne Morten Kvarving
06fe93a430 changed: do not always start update_data branch from origin/master 
this allows for update_data from opm-tests. the generated
PR will include the contents of the PR it was generated for
 2021-11-12 11:57:13 +01:00
Arne Morten Kvarving
9e01b3b790 fixed: only update files if they actually changed 
fixes the changed tests output
 2021-11-12 11:25:45 +01:00
Arne Morten Kvarving
069882f3e4 fixed: no device handling in test_cusparseSolver 
the exception is not thrown while setting up the bridge as in
opencl. rather the exception is thrown in the solve_system call.
 2021-11-12 10:29:26 +01:00
Joakim Hove
ae69c92280
Merge pull request #3692 from joakim-hove/reorder-summary-solution 
Reorder SUMMARY and SOLUTION section in test deck
 2021-11-12 10:00:24 +01:00
Joakim Hove
46ed61455d Reorder SUMMARY and SOLUTION section in test deck 2021-11-12 09:08:30 +01:00
Joakim Hove
4fc5d34090 Apply new GEO keywords when ACTIONX has applied geo multiplier 2021-11-12 08:02:52 +01:00
Joakim Hove
7b038ba376
Merge pull request #3685 from joakim-hove/sim-update 
Use struct SimulatorUpdate as return type from Schedule::applyAction
 2021-11-11 14:58:58 +01:00
Arne Morten Kvarving
e25caba8ed changed: refactor BDA well contributions 
split in API specific classes for Cuda/OpenCL

this to
1) it's cleaner
2) it avoids pulling in openCL code in cuda classes which leads
to clashes between nvidia headers and opencl.hpp

there is still too much API specific things in interface between the
bda components to work through a virtual interface so we still have to cast
to the relevant implementation in various places.
 2021-11-11 14:49:33 +01:00