Commit Graph

462 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
6a3715e01b Merge pull request #789 from atgeirr/add_timing_block
Add timing block
2023-02-28 15:24:07 +01:00
Atgeirr Flø Rasmussen
cda0a9daa3 Include missing header and minor adjustments. 2023-02-28 14:09:40 +01:00
Arne Morten Kvarving
dcc67bd11d minimum dune version required is now 2.7 2023-02-27 09:47:39 +01:00
Atgeirr Flø Rasmussen
4bc0869ebd Ensure serialization of the solution object also with dune-fem. 2023-02-17 11:26:39 +01:00
hnil
9a63513afb more timings 2023-02-15 11:06:25 +01:00
hnil
f5a427a55b added timing block to most important parts 2023-02-15 09:40:17 +01:00
Arne Morten Kvarving
0a430fc16a Simulator: add serialization support 2023-02-14 14:53:54 +01:00
Bård Skaflestad
1a0a9cd25e Merge pull request #780 from akva2/fvbasediscretization_serialize
FvBaseDiscretization: add serialization support
2023-02-14 14:45:14 +01:00
Arne Morten Kvarving
244d6caabf FvBaseDiscretization: add serialization of dynamic state 2023-02-14 12:42:21 +01:00
hnil
1990d45d77 fixed one more comment 2023-02-14 11:19:22 +01:00
hnil
cf5cc122d4 corrected error in rewrite of comment 2023-02-14 11:15:35 +01:00
hnil
8a12f02db3 - removed not nice comments
- made output text nicer
2023-02-14 11:11:19 +01:00
Arne Morten Kvarving
9c17781de2 BlackoilPrimaryVariables: add serialization support 2023-02-09 09:05:15 +01:00
Bård Skaflestad
b6db23f518 Merge pull request #778 from akva2/forward_backend
fvbaseproperties: forward ParallelBiCGStabLinearSolver
2023-02-08 16:10:34 +01:00
David Landa Marban
94b8f5a941 Fix to the flores indices 2023-02-07 13:29:39 +01:00
David Landa Marban
8ff952fd84 Support for FLOWS and FLORES 2023-02-02 11:37:47 +01:00
Arne Morten Kvarving
7a24173717 fvbaseproperties: forward ParallelBiCGStabLinearSolver 2023-01-19 15:33:40 +01:00
Bård Skaflestad
55a1747595 Merge pull request #773 from totto82/fixSolventRho
Fix Todd-Longstaff model for density.
2023-01-13 12:42:21 +01:00
Arne Morten Kvarving
3e46a11164 propertysystem: avoid pulling in istream 2023-01-03 15:28:15 +01:00
Arne Morten Kvarving
14807363ea EcfvStencil: avoid use of sstream 2023-01-02 13:55:17 +01:00
Tor Harald Sandve
47acc80588 Merge pull request #763 from totto82/support_dissolved_gas_in_water
Support dissolved gas in water
2022-12-21 13:40:16 +01:00
Atgeirr Flø Rasmussen
29ff1c75f7 Merge pull request #770 from hnil/matrix_direct_access
Matrix direct access
2022-12-19 13:19:20 +01:00
Tor Harald Sandve
9454ba1fe5 Fix Todd-Longstaff model. Only modify density (i.e) the effective gravity contribution and not the volumes itself 2022-12-19 12:36:16 +01:00
Bård Skaflestad
3a6cb1422f Merge pull request #766 from akva2/janitoring
remove namespace qualifiers from symbols in Opm namespace
2022-12-19 12:04:01 +01:00
hnil
da1c174770 more review comments addressed 2022-12-19 11:38:16 +01:00
hnil
e5c76f6eb2 fixed rest of review comments 2022-12-19 11:34:06 +01:00
hnil
83e7bbb140 addressed review comments 2022-12-19 11:32:49 +01:00
Tor Harald Sandve
0e5eeaaa90 Add support for dissolved gas in water
If DISGASW is present accout for dissolved gas in water
2022-12-16 13:55:26 +01:00
hnil
d465ebdb78 fixed direct acces to matrix in lineariser 2022-12-14 20:01:35 +01:00
hnil
888565c335 start on direct access to matrices 2022-12-14 11:59:47 +01:00
Arne Morten Kvarving
205ca849f6 remove namespace qualifiers from symbols in Opm namespace 2022-12-13 13:09:01 +01:00
Arne Morten Kvarving
c57e37fffe use exception classes from opm-common 2022-12-13 12:55:20 +01:00
Atgeirr Flø Rasmussen
9fabd9b49d Merge pull request #761 from atgeirr/fix-multflt-early-bug
Allow updateStoredTransmissibilities() before createMatrix_().
2022-12-01 08:14:05 +01:00
Atgeirr Flø Rasmussen
684332bb3f Allow updateStoredTransmissibilities() before createMatrix_().
A bug was triggered by a case placing MULTFLT at the start of the SCHEDULE.
Then the required structures would be empty and the simulator bombed. With
the change, we increase robustness and address this.
2022-11-30 11:53:17 +01:00
Tor Harald Sandve
bebbdd3a04 add more comments to the variable switching code 2022-11-28 09:17:35 +01:00
Tor Harald Sandve
899dcc253c Rename PrimaryVarsMeaning{Water/Gas/Pressure/Brine} to {Water/Gas/Pressure/Brine}Meaning 2022-11-25 13:03:58 +01:00
Tor Harald Sandve
74dde790a2 Change enum to enum class for primary variable meaning 2022-11-25 10:41:02 +01:00
Tor Harald Sandve
de09a3eb3c adapt to rename of waterSaturationIdx -> waterSwitchIdx 2022-11-25 10:39:33 +01:00
Tor Harald Sandve
2d70d08fdc Refactor primary variable switching meaning
The primary variable meaning enums are split into three
water, gas and pressure to allow for all combination
of the variables. This simplify the code and logic
it also make it easier to add more swithing options.
2022-11-25 10:39:33 +01:00
Bård Skaflestad
6cd200a254 Merge pull request #745 from goncalvesmachadoc/salt-density
add Salt Density
2022-11-24 16:32:16 +01:00
Markus Blatt
1a8d71ea58 Merge pull request #755 from akva2/fix_quadrature_alugrid
Fix test_quadrature with dune-alugrid
2022-11-16 21:36:09 +01:00
Arne Morten Kvarving
e61a5a3e21 remove pointless assert
unsigned is always positive
2022-11-15 12:12:45 +01:00
goncalvesmachadoc
c826598759 readSaltdenTable 2022-11-14 16:36:45 +01:00
goncalvesmachadoc
00d480fcd2 fix comment 2022-11-14 14:02:49 +01:00
goncalvesmachadoc
c5da05a59d addSaltDensity 2022-11-14 14:02:49 +01:00
Markus Blatt
f2886fcf52 Merge pull request #739 from totto82/bc_dirichlet
implement dirichlet boundary conditions
2022-11-11 22:23:04 +01:00
Atgeirr Flø Rasmussen
9b6c493da4 Merge pull request #746 from totto82/fixThB
fix bug in boundary conditions for energy by adding the scaling factor
2022-11-03 08:54:23 +01:00
Bård Skaflestad
183c75fa05 Merge pull request #744 from plgbrts/rwgsalt
added salt concentration dependency of saturated water-gas ratio
2022-11-01 21:28:07 +01:00
Bård Skaflestad
46c1068c60 Merge pull request #741 from blattms/newton-props-separate-header
Put properties of Newton method into separate header for reuse.
2022-10-29 20:36:52 +02:00
Bård Skaflestad
488a67a1c1 Merge pull request #748 from atgeirr/update-stored-trans
Add interface for updating stored parameters in linearizers.
2022-10-27 17:46:30 +02:00
Atgeirr Flø Rasmussen
477acf0c6c Add interface for updating stored parameters in linearizers.
Implement for the TpfaLinearizer to update transmissibilities.
2022-10-27 09:56:01 +02:00
Arne Morten Kvarving
3fe4b6ac4b remove shadowing local typedef 2022-10-26 10:53:41 +02:00
Tor Harald Sandve
c23c64893e fix bug in boundary conditions for energy by adding the scaling factor 2022-10-21 15:34:05 +02:00
Paul Egberts
d420a78585 added salt concentration dependency of water-gas ratio 2022-10-20 11:22:18 +02:00
Markus Blatt
e1ac4c15d6 Use flow's default for NewtonMaxIterations here.
Unfortunately, each registration of a parameter has to be done with
the exact value and usage string or an exception will be thrown.
2022-10-19 21:34:24 +02:00
Markus Blatt
5cfe0385aa Put properties of Newton method into separate header for reuse.
Now they can be reused in opm-simulators without any hassle.
2022-10-19 16:30:01 +02:00
Kai Bao
d90937419c using Dune::MPIHelper::getCommunicator() in newtonmethod.hh
removing function details::getMPIHelperCommunicator() in newtonmethod.hh
2022-10-19 13:51:41 +02:00
Tor Harald Sandve
2bd0575523 implement dirichlet boundary conditions 2022-10-19 09:16:35 +02:00
Bård Skaflestad
6f54bd9310 Merge pull request #736 from akva2/use_range_generators
Use elements range generator
2022-10-17 18:10:48 +02:00
Atgeirr Flø Rasmussen
7dde54c21a Merge pull request #730 from blattms/dune-2.9-compiles
Fixes compilation with DUNE 2.9 and 2.6
2022-10-17 15:22:03 +02:00
Arne Morten Kvarving
85ac4160ee MultiPhaseBaseProblem: use elements range generator 2022-10-17 13:37:44 +02:00
Arne Morten Kvarving
96913df6c9 BlackOilModel: use elements range generator 2022-10-17 13:37:44 +02:00
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