OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,542 Commits 24 Branches 102 Tags 84 MiB
ec8f84429e
Commit Graph

311 Commits

Author SHA1 Message Date
Arne Morten Kvarving
f5096a6d2d Merge pull request #720 from akva2/extbo_module_params 
blackoilextbomodules: put parameters in separate class
 2022-09-20 12:20:43 +02:00
Arne Morten Kvarving
b5f141d1da Merge pull request #723 from akva2/polymer_module_params 
blackoilpolymermodules: put parameters in separate class
 2022-09-20 12:20:25 +02:00
Arne Morten Kvarving
6933875120 blackoilfoammodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-20 11:58:09 +02:00
Arne Morten Kvarving
36cce77c53 blackoilfoammodules: remove unused headers 
and add missing headers
 2022-09-20 11:58:09 +02:00
Markus Blatt
ed8d0aa181 Merge pull request #719 from akva2/brine_module_params 
BlackOilBrineModules: put parameters in separate struct
 2022-09-20 11:56:12 +02:00
Markus Blatt
54b02b1be6 Merge pull request #724 from akva2/solvent_module_params 
blackoilsolventmodules: put parameters in separate class
 2022-09-20 11:50:11 +02:00
Arne Morten Kvarving
6571488ee8 blackoilpolymermodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-20 11:44:05 +02:00
Arne Morten Kvarving
7d1ddfb566 blackoilpolymermodules: remove unused headers 
and add missing headers
 2022-09-20 11:43:35 +02:00
Håkon Hægland
e143c9ed13 Move the CopyablePtr class to a separate file 
Moved the CopyablePtr template class to opm-common, see file
opm/utility/CopyablePtr.hpp in opm-common
 2022-09-20 01:27:59 +02:00
Håkon Hægland
769577c8aa Explicitly initialize member in copy constructor 
For clarity, explicitly default construct the unique_ptr in the copy
constructor
 2022-09-19 18:48:33 +02:00
Håkon Hægland
cedb92c6d2 Make get() return a pointer instead of a reference 
This is more in line with how std::unique_ptr works.
 2022-09-19 18:15:04 +02:00
Arne Morten Kvarving
10eaf48709 blackoilsolventmodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-19 14:14:16 +02:00
Arne Morten Kvarving
f96e449094 blackoilmicpmodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-19 13:42:04 +02:00
Arne Morten Kvarving
68d009262d blackoilbrinemodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-19 13:33:58 +02:00
Arne Morten Kvarving
9068c9fdf6 blackoilextbomodules: put parameters in separate class 
limits the amount of static variable declarations
 2022-09-19 13:26:37 +02:00
Arne Morten Kvarving
893502c6b9 blackoilmicpmodules: remove MICPpara prefix from variables/methods 
unnecessary noise
 2022-09-19 13:08:58 +02:00
Arne Morten Kvarving
2d45e16291 blackoilmicpmodules: remove unused headers 
and add missing headers
 2022-09-19 13:08:58 +02:00
Arne Morten Kvarving
fdc4b704f3 blackoilextbomodules: remove unused headers 
and add missing headers
 2022-09-19 12:35:26 +02:00
Arne Morten Kvarving
7341104b74 blackoilbrinemodule: remove unused headers 2022-09-19 11:17:57 +02:00
Håkon Hægland
d15c5b51c8 Use a copyable unique pointer 
Use a copyable unique pointer instead of writing custom copy constructor
and assignment operator.
 2022-09-19 01:42:09 +02:00
Håkon Hægland
38add2ed66 Rename dirId() to faceDirFromDirId() 2022-09-16 09:22:17 +02:00
Håkon Hægland
dc6141af13 Make updateRelperms() a static function 
To aid readability, we make updateRelperms() a static function.
 2022-09-16 09:20:48 +02:00
Håkon Hægland
ee8e565137 Use unique_ptr for dirMob_ instead of shared_ptr 
To make each copy of the IQ unique, we change dirMob_ to be a shared_ptr
instead of a unique_ptr.
 2022-09-16 09:17:39 +02:00
hnil
f346792427 removed whitespace 2022-09-15 14:01:36 +02:00
Håkon Hægland
7eeca28018 Add more support for directional relperms 
Adds support for directional relperms for the tpfa linearizer.
 2022-09-14 23:37:10 +02:00
hnil
6386714f2c made definition of model fluid,indices and primaryvariables public 2022-09-14 17:22:22 +02:00
Håkon Hægland
fe7b415350 Fix typo 2022-09-14 15:34:38 +02:00
Håkon Hægland
ca78d271ce Only store directional mobilities if needed 2022-09-14 15:34:38 +02:00
Håkon Hægland
81cf436630 Add support for KRNUM 2022-09-14 15:34:38 +02:00
goncalvesmachadoc
71ac8676e5 corrrection 2022-09-12 17:12:44 +02:00
Atgeirr Flø Rasmussen
d034fc3b58 Merge pull request #713 from atgeirr/fix-fast-assembly-twophase 
Bugfix: make TPFA version of local linearizer work for two-phase runs.
 2022-09-01 16:50:55 +02:00
Atgeirr Flø Rasmussen
92e9bd5c37 Bugfix: make TPFA version of local linearizer work for two-phase runs. 2022-09-01 13:52:58 +02:00
Tor Harald Sandve
8102874f16 change default max/min temp in newton clamping 2022-09-01 08:28:35 +02:00
Arne Morten Kvarving
1058b371da changed: consistently use std::array 2022-08-26 08:27:40 +02:00
Bård Skaflestad
758473ffd8 Merge pull request #707 from plgbrts/gas-water-fix 
fix for gaswater system with water evaporation
 2022-08-23 15:14:23 +02:00
Paul Egberts
23c385d3d8 reverted back constexpr nested the if 2022-08-23 14:24:47 +02:00
Paul Egberts
38fb8e114b removed constexpr in if - else construction 2022-08-23 11:56:50 +02:00
Paul Egberts
45a968fe46 fix for gaswater system with water evaporation 2022-08-22 17:48:43 +02:00
Markus Blatt
2ef11d18d6 Merge pull request #699 from totto82/eqWeight 
Set eq weights externally in the blackoil model
 2022-08-18 11:39:16 +02:00
Arne Morten Kvarving
7f8828988c changed: consistently use std::array 2022-08-16 08:36:21 +02:00
Atgeirr Flø Rasmussen
23b9e36331 Merge pull request #703 from atgeirr/faster_assembly_minimal 
Faster assembly minimal
 2022-08-10 11:20:51 +02:00
Atgeirr Flø Rasmussen
0d4c19b723 Remove unneeded timeIdx function parameters. 2022-08-10 10:00:12 +02:00
Tor Harald Sandve
6405b2b6e0 Set eq weights externally in the blackoil model 2022-08-10 09:40:02 +02:00
Atgeirr Flø Rasmussen
3e8c024cdb Ensure test suite compiles. 
Adding new methods to problem class, and using the Context API for the
BlackoilIntensiveQuantities' porosity update.
 2022-08-09 16:24:54 +02:00
Atgeirr Flø Rasmussen
3b0c492b52 Add static asserts to prevent bugs from incompatible combinations. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
f4e98c6d32 Cleanup in new classes. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
75a5a3d135 Remove changes not needed for a minimal PR. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
b6986a24f7 Make the flux actually a velocity, also for the new callpath. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
6c0d5ea8c5 Refactoring in BlackOilLocalResidualTpfa. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
1b2c18f089 Remove unused code block, refactor addStorage(). 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
658b366ee1 Fix: update rockCompTransMultiplier_. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
ad83a9531c Refactor and unify the BlackoilIntensiveQuantities[Simple] classes. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
eb8d3a0b2d Use simpler APIs. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
0013c49aa2 Use existing formula for compressibility effect. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
8543e677c1 Reduce differences. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
1d3fbb54c8 Make the blackoil intensive quantities classes more similar. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
7f05fcd7b7 Minor update to match change in eclproblem API. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
75c8f34e3e Make extrusion factors work properly. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
d756c36cd7 Undoing minor changes not required anymore. 2022-08-09 11:08:51 +02:00
hnil
3616e68d3a need for true impes 2022-08-09 11:08:51 +02:00
hnil
b7f2a85534 fixe openmp 
fixed add well matrix in new system
 2022-08-09 11:08:51 +02:00
hnil
08c0848e0d tried to get openmp work 2022-08-09 11:08:51 +02:00
hnil
cfd727b012 global assembly 2022-08-09 11:08:51 +02:00
hnil
c9481aaa66 refactoring to not need use local indices 2022-08-09 11:08:51 +02:00
hnil
56f742ed7d changes to make local update of primaryvariables and intensive quantities possible 2022-08-09 11:08:51 +02:00
hnil
112c2c3573 update with out element context 2022-08-09 11:08:51 +02:00
hnil
e12cab262d small fix 2022-08-09 11:08:50 +02:00
hnil
d986ef1add working with small increase in performance 2022-08-09 11:08:50 +02:00
hnil
487cf2376e working refatoring 2022-08-09 11:08:50 +02:00
hnil
3856a5a84e added tpfa variant 2022-08-09 11:08:50 +02:00
Arne Morten Kvarving
45b2898c6e BlackOilSolventModules: use if constexpr 2022-08-09 09:59:48 +02:00
Arne Morten Kvarving
04c8d8f232 BlackOilRateVector: use if constexpr 2022-08-09 09:59:48 +02:00
Arne Morten Kvarving
4d003ea85a BlackOilPrimaryVariables: use if constexpr 2022-08-09 09:55:30 +02:00
Arne Morten Kvarving
d2ba89f39a BlackOilPolymerModules: use if constexpr 2022-08-09 09:55:30 +02:00
Arne Morten Kvarving
5213f3b526 BlackOilModel: use if constexpr 2022-08-09 09:55:30 +02:00
Arne Morten Kvarving
d593214308 BlackOilIntensiveQuantities: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
641cadc8e5 BlackOilFoamModules: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
7aaa3f2261 BlackOilExtBoModules: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
31c2442a22 BlackOilEnergyModules: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
0a182d51f6 BlackOilBrineModules: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
368a2414c3 BlackOilBoundaryRateVector: use if constexpr 2022-08-09 09:08:24 +02:00
Arne Morten Kvarving
d6c378e6a9 remove use of Unused.hpp 2022-08-02 11:24:40 +02:00
Arne Morten Kvarving
92209466c5 remove unnecessary includes 2022-07-26 18:32:03 +02:00
Tor Harald Sandve
3b1ebfcda7 fix blackoil diffusion module 2022-06-22 14:07:16 +02:00
Bård Skaflestad
17643455ba Merge pull request #688 from plgbrts/vapoilwat 
adding primary variable combination/switching
 2022-05-25 15:19:15 +02:00
Bård Skaflestad
1231781525 Merge pull request #692 from akva2/avoid_diffusion_copy 
fixed: avoid copying int quants for diffusion
 2022-05-02 10:31:16 +02:00
Arne Morten Kvarving
18af8c239e fixed: avoid copying int quants for diffusion if diffusion is not enabled 2022-04-29 10:36:13 +02:00
Paul Egberts
5d364cc560 Explanation for primary variable switches 2022-04-28 16:35:35 +02:00
Markus Blatt
fc0907b78d [bugfix] Prevent accessing undefined variables for brine. 
It seems like currentValue.primaryVarsMeaningBrine() will return an
uninitialized variable if enableSaltPrecipitation is false. This can
lead to undefined behavior especially in a parallel run. Hence we
also check whether salt precipitation is is enabled and do nothing
otherwise.
 2022-04-20 16:48:50 +02:00
Paul Egberts
a678f5f471 fix adaptPrimaryVariables 2022-04-14 13:24:01 +02:00
Paul Egberts
a246d4b098 clean up 2022-04-11 21:50:28 +02:00
Paul Egberts
2d5710fdfc adding primary variable combination/switching relevant for combined vaporization of water and oil into gas phase 2022-04-08 21:50:21 +02:00
Paul Egberts
658834a261 treating permeability reduction via mobility term 2022-03-14 15:07:12 +01:00
Paul Egberts
90a04a351b clean up 2022-03-06 18:13:13 +01:00
Paul Egberts
b5836354c2 clean up 2022-03-06 18:07:32 +01:00
Paul Egberts
7b04c9641d add water-gas ratio term to the black-oil equations and primary variable switching between Sw and Rvw 2022-03-01 17:29:46 +01:00
Paul Egberts
8bfc490367 flux corrections 2022-03-01 17:20:17 +01:00
Tor Harald Sandve
c464bceb3b Merge pull request #681 from plgbrts/saltp 
Enable salt precipitation/dissolution
 2022-01-18 12:02:18 +01:00
Paul Egberts
acde56916d fix for 2phase case water+gas + BRINE option 2022-01-15 17:33:12 +01:00
Paul Egberts
e9b94a1e3e fix for compilation issue of opm-models/tests/reservoir_blackoil_vcfv.cc 2022-01-12 18:50:03 +01:00
Paul Egberts
1623d8dbbf minor fix 2022-01-07 14:41:16 +01:00
Paul Egberts
5cc1e4c09e corrected path to include files 2022-01-07 14:27:01 +01:00
Paul Egberts
aa1054317e enable salt precipitation 2022-01-06 15:37:21 +01:00
Tor Harald Sandve
35d2eec705 Extrapolate pvt properties in the extended blackoil model 2022-01-06 15:15:48 +01:00
Joakim Hove
2a42da1ff7 Downstream of filesystem reorganisation in opm-common 2021-12-14 08:38:58 +01:00
goncalvesmachadoc
3f11f6629a fix 2021-12-07 20:34:18 +01:00
goncalvesmachadoc
db3ef09fc0 add flags to Propertities 
add flags to Propertities

add flags to Propertities
 2021-12-07 17:43:48 +01:00
Arne Morten Kvarving
2c697457d7 remove unnecessary includes 2021-10-18 11:52:45 +02:00
Arne Morten Kvarving
f09dd916b8 use [[maybe_unused]] instead of macro 2021-10-18 11:52:31 +02:00
daavid00
9ebb3db5cc first version of micp implementation in flow 2021-10-14 17:41:40 +02:00
Markus Blatt
f4dab07a68 Merge pull request #666 from akva2/drop_unused_macro 
changed: get rid of OPM_UNUSED macro usage
 2021-08-18 16:32:03 +02:00
Arne Morten Kvarving
ebe2448e57 extbomodule: enable extrapolation for function evaluations 2021-08-05 13:16:54 +02:00
Arne Morten Kvarving
e4d6acc23b changed: get rid of OPM_UNUSED macro usage 
prefer anonymous parameters and c++17 [[maybe_unused]]
 2021-08-03 10:10:01 +02:00
Paul Egberts
a63e775155 fix compositionSwitchEnabled specification 2021-08-01 21:26:39 +02:00
Paul Egberts
0f2ced8891 fix compositionSwitchEnabled specification. For gas-water it is disabled 2021-08-01 21:25:02 +02:00
Paul Egberts
a217974f9d fix for gas-water system, set gas saturation 2021-08-01 21:20:35 +02:00
Paul Egberts
abd775fe21 fix for gas-water system 2021-08-01 21:19:13 +02:00
Paul Egberts
abcf933673 compositionswitch should not be enabled for gas-water system 2021-08-01 21:14:10 +02:00
Arne Morten Kvarving
ae537f536d fixed: do not use Opm:: prefix when inside namespace Opm 2021-05-25 11:46: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
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
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
Tor Harald Sandve
4a101f1412 fix conductivity harmonic mean computation 2021-03-26 15:31:30 +01:00
Tor Harald Sandve
aebe1a789a Only update diffusion quanteties if DIFFUSE is in the deck 2021-02-25 11:15:28 +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
Tor Harald Sandve
7606cc911b Fix 2-phase blackoil boundary 2021-01-14 10:56:27 +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
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
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
Joakim Hove
b2cac8fa44 Remove unused #include of Exceptions 2020-09-21 10:57:42 +02:00
Joakim Hove
d9c9f84f74 Use non table TLMIXPAR implementation 2020-08-12 09:12:04 +02:00
hnil
e4e349eb7e Add LinearizationType, which will be used for sequential methods. 2020-06-19 14:58:49 +02:00
Bernd Flemisch
d72de0f308 [cleanup] replace typedef by using 2020-06-10 13:49:42 +02:00
Bernd Flemisch
bdb7bac3e8 [properties] replace remaining macro calls 2020-06-10 13:07:19 +02:00
Bernd Flemisch
cbffa2a7ba [properties] replace SET_SCALAR_PROP calls 2020-06-09 10:43:28 +02:00
Bernd Flemisch
725c022e69 [properties] replace BEGIN/END_PROPERTIES macro calls 2020-06-08 17:11:48 +02:00
Bernd Flemisch
880c5223ac [properties] replace macro calls by native C++ 2020-06-08 16:41:02 +02:00
Atgeirr Flø Rasmussen
61eb74b1d6 Merge pull request #591 from OPM/feature/replace-propertysystem 
Replace property system
 2020-05-28 12:05:11 +02:00