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,474 Commits 24 Branches 102 Tags 84 MiB
2813195e15
Commit Graph

454 Commits

Author SHA1 Message Date
Arne Morten Kvarving
b0168da21b PvsModel: use elements range generator 2022-10-17 13:37:44 +02:00
Arne Morten Kvarving
b5ec1906e1 TpfaLinearizer: use elements range generator 2022-10-17 13:37:44 +02:00
Arne Morten Kvarving
2eba75db7e FvBaseDiscretization: use elements range generator 2022-10-17 13:37:44 +02:00
Arne Morten Kvarving
91762ace6f FvBaseLinearizer: use elements range generator 2022-10-17 13:37:44 +02:00
Arne Morten Kvarving
a8bbe5549c PffGridvector: use elements range generator 2022-10-17 13:37:44 +02:00
Markus Blatt
6d747b6620 Merge pull request #733 from atgeirr/fix-vtk-default-output-dir 
Use current dir for output by default.
 2022-10-14 13:07:08 +02:00
Atgeirr Flø Rasmussen
64f7895c76 Register all (not just some) of the vtk parameters unconditionally. 2022-10-14 10:42:46 +02:00
Bård Skaflestad
e460cbd273 Merge pull request #734 from plgbrts/set-rs 
bug fix: missing setRs added
 2022-10-13 23:22:39 +02:00
Atgeirr Flø Rasmussen
83e17fd44d Merge pull request #712 from totto82/changeDefaultMaxMinTemp 
change default max/min temp in newton clamping
 2022-10-13 21:52:04 +02:00
Paul Egberts
84bb044bad missing setRs added 2022-10-13 21:14:08 +02:00
Atgeirr Flø Rasmussen
44628a902d Use current dir for output by default. 
For OPM Flow, this only affects VTK output.
 2022-10-13 16:00:58 +02:00
Markus Blatt
7725f2020f Fix compilation for DUNE 2.6 
This has been broken for month as there is no equivalent method to
Dune::MPIHelper::getCommunicator() in  DUNE 2.6.
 2022-10-11 09:50:38 +02:00
Markus Blatt
b9b6f7defd Use Communication instead of CollectiveCommunication for DUNE>=2.7. 
The later is removed in 2.9.
 2022-10-11 09:50:27 +02:00
Markus Blatt
f137d15c65 Adapt to new (>= DUNE 2.8) way of updating mappers. 2022-10-11 09:35:26 +02:00
Bård Skaflestad
3c7ba992f1 Merge pull request #718 from atgeirr/tpfa-bcs 
Boundary condition support for TpfaLinearizer
 2022-09-29 16:14:55 +02:00
Atgeirr Flø Rasmussen
521b057035 Remove unneeded timeIdx argument. 2022-09-29 14:13:23 +02:00
Markus Blatt
5abfe4ecbf Merge pull request #726 from goncalvesmachadoc/rvw 
Initialize Rvw
 2022-09-29 11:41:50 +02:00
Atgeirr Flø Rasmussen
66e5da9709 Address review comments. 2022-09-29 09:26:43 +02:00
Atgeirr Flø Rasmussen
7981fb92e0 Use std::array instead of C arrays. 2022-09-28 10:11:30 +02:00
Atgeirr Flø Rasmussen
7551517401 Finalize boundary treatment for TpfaLinearizer. 2022-09-28 10:11:30 +02:00
Atgeirr Flø Rasmussen
64cbf7e035 Add ScalarFluidSystem (for other classes' use). 2022-09-28 08:45:45 +02:00
Atgeirr Flø Rasmussen
a050c1e945 Improve doc of dirId() method. 2022-09-28 08:45:13 +02:00
Atgeirr Flø Rasmussen
6526f9a29a Add boundary condition treatment to TpfaLinearizer. 2022-09-28 08:39:27 +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
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
goncalvesmachadoc
8207f448e0 Initialize Rvw 2022-09-25 22:45:54 +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
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
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
Arne Morten Kvarving
ee9acb31cb changed: unify matrixblock.hh with downstream MatrixBlock.hpp 2022-08-25 13:31:37 +02:00
Bård Skaflestad
401441dc10 Revert "changed: unify matrixblock.hh with downstream MatrixBlock.hpp" 2022-08-24 20:33:08 +02:00
Arne Morten Kvarving
2b30ca9f53 changed: unify matrixblock.hh with downstream MatrixBlock.hpp 2022-08-24 15:49:03 +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
Arne Morten Kvarving
77eccfd869 fixed: avoid vector<bool> in fvbasediscretization 
writes to vector<bool> is not thread safe
 2022-08-11 09:51:34 +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
c0f3b0072b Remove Unused.hpp inclusion. 2022-08-09 16:14:27 +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
aa4e0d4d58 Ensure cache is updated, not only invalidated, when Newton update fails. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
dd01af1f3b More safeguarding that the intensive quantities cache is updated. 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
4001fcffcf Replace assert() with exception. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
733b6e6b11 Settle for handling wells the current way for now. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
d3f01b003d Turn on specific well processing (thereby disabling drift comp f. ex.). 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
efd6214643 Follow function renaming. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
ec944ff5e3 Order operations in the same way as existing code. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
9ff81d2a42 Do fluxes before storage, as for the existing linearizer. 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
73d609f7b5 Comment out unused items in SmallElementContext. 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
Atgeirr Flø Rasmussen
552e38bf1d Remove unused parts of TpfaLinearizer. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
bd6b42b859 Undo changes to fvbaselinearizer.hh. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
d424262a54 Make TpfaLinearizer separate class (again). 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
f21ca0c63e Remove unneeded class. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
8a15e2da08 Remove unused file. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
4aa4788740 Remove unused file. 
Content was added to fvbaselinearizer.hh.
 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
4764d174b2 Add TPFA-specific linearizer variant. 2022-08-09 11:08:51 +02:00
Atgeirr Flø Rasmussen
323cfbd5f6 Comment out OpenMP code. 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
Atgeirr Flø Rasmussen
cf208af541 Minor compile fix with HAVE_DUNE_FEM. 2022-08-09 11:08:51 +02:00
hnil
08c0848e0d tried to get openmp work 2022-08-09 11:08:51 +02:00
hnil
df32014109 global assembly with wells separate working 2022-08-09 11:08:51 +02:00
hnil
e245f0ae50 added possibility for doing well contributions separately, still error 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
f7210d7261 back to safe smallelement 2022-08-09 11:08:50 +02:00
hnil
2cbc3a1f00 even less things 2022-08-09 11:08:50 +02:00
hnil
7f7cf71269 fails with correct error 2022-08-09 11:08:50 +02:00
hnil
97a2584ad0 added element context intended to be small 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
Bård Skaflestad
326449fe0b Fix Build After "Unused.hpp" Removal 
Needed for configurations that don't have Dune-localfunctions or
which *do* have ALUGrid.
 2022-08-04 15:12:33 +02:00