Commit Graph

1312 Commits

Author SHA1 Message Date
Bård Skaflestad
b0bf34d20e Merge pull request #728 from bska/silence-unused-param-warnings
Tag 'updateRelperms' Parameters as Maybe Unused
2022-09-27 10:24:29 +02:00
Bård Skaflestad
29fb7eea72 Tag 'updateRelperms' Parameters as Maybe Unused
That way we won't get compiler warnings about unused parameters.
2022-09-27 09:25:28 +02:00
Tor Harald Sandve
5a0bc72878 Merge pull request #727 from hakonhagland/update_relp
Move updateRelperms() to the problem class
2022-09-27 08:45:59 +02:00
Håkon Hægland
5aa9f6cdea Simplify statement
We do not need to explicitly mention the template parameter here.
2022-09-26 17:55:30 +02:00
Håkon Hægland
4a9da82e94 Move updateRelperms() to the problem class
Moves the updateRelperms() method in BlackOilInstensiveQuantities to the
Problem class. This is a more natural place for this method and it avoids
including EclMaterialManager into the  BlackOilInstensiveQuantities. The
DirectionalMobility struct is moved to a separate file such that it can be
include from both the Problem files and the BlackOilInstensiveQuanMove
updateRelperms() to the problem class
2022-09-26 17:11:43 +02:00
Tor Harald Sandve
c4705de5b1 Merge pull request #714 from hakonhagland/krnum
Add support for directional relative permeabilities
2022-09-26 09:10:32 +02:00
Håkon Hægland
f36aa67804 Return a nullptr to the EclMaterialLawManager
Define a method materialLawManagerPtr() that returns a nullpointer
to EclMaterialLawManager, but that can be overridden in derived classes
e.g. EclProblem
2022-09-23 00:05:09 +02:00
Atgeirr Flø Rasmussen
bc6e4ffa26 Merge pull request #717 from hnil/cpr_analytic
made definition of model fluid,indices and primaryvariables public
2022-09-21 09:12:03 +02:00
Håkon Hægland
a941ba49c0 Try to fix: no type named EclMaterialLawManager
Try to fix jenkins build error: no type named EclMaterialLawManager
2022-09-20 22:09:04 +02:00
Håkon Hægland
90a3ae8940 Include missing header 2022-09-20 21:59:00 +02:00
Arne Morten Kvarving
84717a874d Merge pull request #721 from akva2/foam_module_params
blackoilfoammodules: put parameters in separate class
2022-09-20 12:42:31 +02:00
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
Markus Blatt
453261d6ad Merge pull request #722 from akva2/micp_module_params
blackoilmicpmodules: put parameters in separate class
2022-09-20 11:42:23 +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
Håkon Hægland
d9c6ecf79d Add missing include file 2022-09-19 12:03:22 +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
Bård Skaflestad
a5e9af95fc Merge pull request #716 from goncalvesmachadoc/patch-2
Bug fix on solid salt calculation
2022-09-15 14:12:46 +02:00
hnil
f346792427 removed whitespace 2022-09-15 14:01:36 +02:00
Markus Blatt
b1b0b4ef2c Merge pull request #715 from akva2/janitoring
fixed: respect rule-of-three for fvbaseintensivequantities
2022-09-15 12:49:48 +02:00
Arne Morten Kvarving
7552df1529 fvbaseintensivequantities: remove default ctor
it does nothing, no need to declare it
2022-09-15 11:26:42 +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
Markus Blatt
d1d37f3cee Merge pull request #710 from akva2/reduce_dup
changed: unify matrixblock.hh with downstream MatrixBlock.hpp
2022-09-09 15:30:20 +02:00
Arne Morten Kvarving
8e38edf928 fixed: respect rule-of-three for fvbaseintensivequantities
is no need to explicitly declare the cc here
2022-09-09 08:18:02 +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