Commit Graph

1103 Commits

Author SHA1 Message Date
Arne Morten Kvarving
44267fd206 fixed: do not assert conditions guaranteed by unsigned 2021-06-18 13:26:57 +02:00
Markus Blatt
eab6faeea3 Merge pull request #659 from akva2/no_opm_in_opm
fixed: do not use Opm:: prefix when inside namespace Opm
2021-05-26 16:08:05 +02:00
Arne Morten Kvarving
ae537f536d fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-25 11:46:55 +02:00
Atgeirr Flø Rasmussen
056364bb35 Merge pull request #658 from akva2/add_cc_quell_warning
Remove explicit assignment-operator from class
2021-05-19 14:23:55 +02:00
Arne Morten Kvarving
40bae8ba9e remove assignment-operator from class
if an assignment-operator is defined, implicitly
definition of cc is deprecated. there is no reason
we have to override the parent assignment operator,
so simply remove both of them.

quells a clang warning
2021-05-19 08:22:47 +02:00
Bård Skaflestad
6769e1b9c7 Merge pull request #657 from akva2/unused_changes
Use [[maybe_unused]] and anonymous parameters instead of UNUSED macros.
2021-05-14 15:50:12 +02:00
Arne Morten Kvarving
c559e348d4 anonymized unused parameters 2021-05-14 13:55:12 +02:00
Arne Morten Kvarving
4695dc9354 changed: use c++17 [[maybe_unused]] 2021-05-14 13:54:58 +02:00
Bård Skaflestad
a432050b20 Merge pull request #656 from akva2/adjust_upstream_enums
adjust to enum changes in upstream
2021-05-07 21:47:22 +02:00
Markus Blatt
654e26f3fb Merge pull request #655 from akva2/no_opm_in_opm
fixed: do not use Opm:: prefix when inside namespace Opm
2021-05-07 08:57:33 +02:00
Arne Morten Kvarving
58dfda3082 adjust to enum changes in upstream 2021-05-05 21:59:50 +02:00
Arne Morten Kvarving
d049cdd59d fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-05 09:50:05 +02:00
Bård Skaflestad
075d9223ce Merge pull request #654 from akva2/janitoring
anonymize unused parameters to quell warnings
2021-04-30 16:11:41 +02:00
Arne Morten Kvarving
4ffebbbbb0 anonymize unused parameters to quell warnings 2021-04-30 13:16:21 +02:00
Bård Skaflestad
4ca6f13e8d Merge pull request #650 from totto82/robustThermal
Restrict the temperature update using provided parameters
2021-04-26 22:37:05 +02:00
Bård Skaflestad
5c70a37c8a Merge pull request #651 from akva2/include_opmlog
blackoilpolymermodules: include OpmLog.h
2021-04-26 18:41:33 +02:00
Tor Harald Sandve
6816dbaf94 Restrict the temperature update using provided parameters 2021-04-26 16:31:37 +02:00
Arne Morten Kvarving
016e0164a8 blackoilpolymermodules: include OpmLog.h 2021-04-26 11:23:42 +02:00
Bård Skaflestad
754c37106d Merge pull request #645 from totto82/fixCond
fix conductivity harmonic mean computation
2021-03-27 13:58:44 +01:00
Tor Harald Sandve
4a101f1412 fix conductivity harmonic mean computation 2021-03-26 15:31:30 +01:00
Bård Skaflestad
4dbb65910d Merge pull request #642 from totto82/testDiff
Only update diffusion quanteties if DIFFUSE is in the deck
2021-03-19 23:40:11 +01:00
Arne Morten Kvarving
8dd56cac23 Merge pull request #643 from totto82/fixBoundaryIssueAgain
move the boundary check downstream
2021-03-09 14:42:46 +01:00
Tor Harald Sandve
4801d4e03a move the boundary check downstream 2021-03-09 09:45:31 +01:00
Tor Harald Sandve
aebe1a789a Only update diffusion quanteties if DIFFUSE is in the deck 2021-02-25 11:15:28 +01:00
Bård Skaflestad
24f2841ce9 Merge pull request #640 from totto82/addDiffusionToBO
Add blackoil diffusion module
2021-02-18 18:18:42 +01:00
Tor Harald Sandve
3f6782e2d2 include stdexcept 2021-02-18 14:08:16 +01:00
Tor Harald Sandve
7226209791 fix model for efficient diffusion coefficient and add reference 2021-02-16 11:07:32 +01:00
Tor Harald Sandve
59707e0f64 divide diffusivity by face area since opm-models expects pr area flux 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
0b0fae607f scale diffusion by saturation 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
87abc2c36b use diffusivity 2021-02-12 08:36:39 +01:00
Tor Harald Sandve
eadcf4f99d Add blackoil diffusion model 2021-02-12 08:36:39 +01:00
Markus Blatt
731e262fd2 Merge pull request #641 from totto82/fixBoundaryMPI
fix boundary face index in parallel
2021-02-11 09:07:12 +01:00
Tor Harald Sandve
02b978b523 fix boundary face index in parallel 2021-02-09 12:35:44 +01:00
Tor Harald Sandve
2f4131232c Merge pull request #638 from totto82/fixBoundaryContextIncrement
fix incrementer in boundarycontext
2021-01-18 13:45:51 +01:00
Tor Harald Sandve
5bdccf43d7 return a copy of the intersection to avoid passing reference to a temporary object 2021-01-18 09:00:14 +01:00
Tor Harald Sandve
1b4f0cf2c5 fix incrementer in boundarycontext 2021-01-15 10:37:53 +01:00
Tor Harald Sandve
589d640f65 Merge pull request #639 from totto82/fix2pboundary
Fix 2-phase blackoil boundary
2021-01-14 15:41:25 +01:00
Tor Harald Sandve
7606cc911b Fix 2-phase blackoil boundary 2021-01-14 10:56:27 +01:00
Atgeirr Flø Rasmussen
732931d952 Merge pull request #637 from goncalvesmachadoc/patch-1
Remove water saturation as primary variable of flow_onephase
2020-12-01 08:35:16 +01:00
Cintia Goncalves Machado
47c06c54d8 Remove water saturation as primary variable of flow_onephase 2020-11-23 10:41:11 +01:00
Bård Skaflestad
215c885d0b Merge pull request #636 from bska/fix-duplicate-overloads
ExtBoModule: Don't Overload on Scalar and Evaluation
2020-11-19 10:56:33 +01:00
Bård Skaflestad
fb001a04c4 ExtBoModule: Don't Overload on Scalar and Evaluation
The two types may be the same, in which case this is a build
failure.
2020-11-18 19:00:47 +01:00
Tor Harald Sandve
5d9783f9b1 Merge pull request #628 from osae/extboModels
Alternative solvent extension for the black oil model.
2020-11-18 14:01:11 +01:00
Ove Sævareid
ae2cc8eb0d Removed unused args. 2020-11-18 11:34:33 +01:00
Ove Sævareid
a6d90e3b29 Handle OnePhaseIndices 2020-11-17 18:10:21 +01:00
Ove Sævareid
db0bd548c6 Shadow warning. 2020-11-17 15:20:35 +01:00
Ove Sævareid
9b652488e2 Remove unused. 2020-11-16 17:47:43 +01:00
Ove Sævareid
a6bf939101 Compute undersaturated compressibilities from pvt input. Cleaning up, and adding some expl comments. 2020-11-16 16:52:16 +01:00
Ove Sævareid
d86602c18d Alternative solvent extension for the black oil model. 2020-11-16 16:52:16 +01:00
Arne Morten Kvarving
c2049ca096 Merge pull request #630 from atgeirr/disable-property-macros
Disable property macros.
2020-10-19 15:50:01 +02:00