Commit Graph

705 Commits

Author SHA1 Message Date
David Landa Marban
e513e3deb6 Thermal BC for spe11bc 2024-01-26 09:08:16 +01:00
Lisa Julia Nebel
5d8fefca33 Add comment on trailing return type with decltype that is used for detecting existence of setUseFixedOrder member function 2024-01-25 16:04:41 +01:00
Lisa Julia Nebel
b99252e2b8 Construct the matrices in the AMG hierarchy with deterministic indices if possible.
The function 'setUseFixedOrder' is called if it is defined and the matrices in the AMG hierarchy are constructed with deterministic indices.
If its not defined yet, it is not called and the matrices in the AMG hierarchy are constructed with non-deterministic indices.
2024-01-25 11:32:51 +01:00
Atgeirr Flø Rasmussen
ec8f84429e Merge pull request #859 from totto82/nodispgas
ignore dispersion in gas phase
2024-01-23 09:25:33 +01:00
Atgeirr Flø Rasmussen
073fe7594a Fix compile errors for non-blackoil models.
Also fix minor nitpicks.
2024-01-19 09:08:17 +01:00
hnil
ac2556895f fixed 2024-01-18 18:50:43 +01:00
hnil
fa37773008 - based on earlier pullrequest which is outdated reintroduced pressure scaling for reservoir
- the missing scaling is for RS/RV
2024-01-18 18:50:15 +01:00
Kai Bao
aad3f10f13 adapting to std::string_view
for componentName and phaseName
2024-01-17 12:10:03 +01:00
Kai Bao
75ced1df73 Merge pull request #863 from totto82/fixThermalAqu
avoid divition by zero for case without conductivity
2024-01-16 22:59:44 +01:00
Tor Harald Sandve
e956bfb029 Merge pull request #862 from hnil/add_maxmin_pressure
added max and minpressure
2024-01-16 15:35:21 +01:00
Tor Harald Sandve
ef198675f1 avoid divition by zero for case without conductivity 2024-01-16 15:34:09 +01:00
David Landa Marban
30ded37687 Support for dynamic capillary pressure 2024-01-12 18:29:06 +01:00
Tor Harald Sandve
b199d07531 ignore dispersion in gas phase 2024-01-12 08:43:33 +01:00
hnil
3c676f8f99 added max and minpressure 2024-01-11 11:51:56 +01:00
Tor Harald Sandve
15c91d88c6 use arithmetic averaged compaction transmissibility multipliers 2024-01-11 09:53:08 +01:00
Tor Harald Sandve
cad0b92633 Support water + gas + solvent + miscible 2023-12-22 09:44:29 +01:00
Tor Harald Sandve
5c2b577854 Add H2SOL and CO2SOL model. That allows for dissolution of solvent in water 2023-12-21 12:37:23 +01:00
Tor Harald Sandve
f6b5e27e52 factor out flux output 2023-12-13 11:00:23 +01:00
Tor Harald Sandve
415b019cf9 Add boundary flux output for flows 2023-12-05 09:24:19 +01:00
Tor Harald Sandve
7fd3e5b327 Merge pull request #833 from totto82/fixbcprop_none
fix issue when BCPROP is not set initially
2023-11-22 13:40:28 +01:00
Kai Bao
55b8aa7ceb updating based on review comments. 2023-11-22 10:25:28 +01:00
Kai Bao
76899d3751 using EWOMS_GET_PARAM for the PTFlash related run-time arguments 2023-11-21 15:52:56 +01:00
Kai Bao
9f0fb32713 various cleaning up and refactoring for co2 ptflash simulation 2023-11-21 15:52:56 +01:00
Kai Bao
df5ee732fa not dropping derivative for flux term for flashlocalresidual.hh
it contains the derivative of the pressure from the downstream cell.
2023-11-21 15:52:56 +01:00
Trine Mykkeltvedt
83cb5670b7 a simple 1D test demonstrating the usage of the PTFlash compostional modeling 2023-11-21 15:52:56 +01:00
Bård Skaflestad
5398a6977b Remove Closing Brace Semicolon
We don't need these on functions.
2023-11-20 16:56:56 +01:00
David Landa Marban
0293b39ad4 Support for mechanical dispersion 2023-11-16 16:52:55 +01:00
Tor Harald Sandve
66781e52fc Merge pull request #849 from daavid00/renamingToEnableVapwat
Renaming enableEvaporation to enableVapwat
2023-11-13 15:01:27 +01:00
Tor Harald Sandve
72de9d3a9b fix issue when BCPROP is not set initially 2023-11-13 10:38:34 +01:00
Markus Blatt
1e8b51f118 Avoid assert and rely on error handler doing the correct thing.
Checking int return types of MPI functions is inefficient. The default
error handler will abort the problem. If somebody changes that, then
they should know what they are doing.
2023-11-08 16:48:40 +01:00
David Landa Marban
c69f7f2c99 Renaming enableEvaporation to enableVapwat 2023-11-07 18:35:08 +01:00
Markus Blatt
6d70d090a8 [fix] Use return code for error detection (not uninitialized MPI_Status::ERROR
According to MPI standard the ERROR field of MPI_Status might not be initialized
unless for operations that return multiple statuses, see  Section 3.7.5
of the standard. In older OpenMPI versions (<=4.0.x) we were lucky
that ERROR was initialized to 0 always. This is not the case for 4.1.y
at least. See https://github.com/open-mpi/ompi/issues/12049.

Therefore we use the retun code to determine whether there was an
error. Note that the default error handler usually is to abort the
application if errors occur. In that case the error code will always
return success.
2023-11-07 09:44:17 +01:00
David Landa Marban
d6f39954c8 Mult well trans due to perm reduction in salt prec 2023-10-26 13:43:32 +02:00
Atgeirr Flø Rasmussen
6cece6bc49 Merge pull request #841 from totto82/fixBCFree
Fix BC Free for 2p problems
2023-10-17 14:16:48 +02:00
Tor Harald Sandve
7546716a48 Fix BC Free for 2p problems 2023-10-17 12:28:48 +02:00
Arne Morten Kvarving
4b156dd124 Merge pull request #839 from blattms/missing-header
Included missing header causing compile errors with gcc-13
2023-10-13 08:25:30 +02:00
Markus Blatt
2deab0cc49 Included missing header causing compile errors with gcc-13 2023-10-12 22:16:53 +02:00
David Landa Marban
d4bb923b7a Fix to write VTKS when THERMAL is on deck 2023-10-09 17:05:32 +02:00
Kai Bao
ca35fd963f removing flashproperties.hh from multiple files
it does not looks like it is used.
2023-10-09 12:49:06 +02:00
Kai Bao
b526025b1a removing flashintensivequantities.hh from flashratevector.hh 2023-10-09 09:05:08 +02:00
Kai Bao
361f87afe4 removing NCPFlash header file in flashratevector
it does not look like used.
2023-10-03 16:23:02 +02:00
Tor Harald Sandve
0719601e2b Use temperature from depth in primaryvariable switching 2023-09-18 12:34:52 +02:00
Vegard Kippe
06cba05a51 Store flows if any of the vectors BFLOWI|J|K are requested 2023-09-13 09:20:07 +02:00
Atgeirr Flø Rasmussen
42c399d6ff Merge pull request #826 from akva2/janitoring
anonymize unused parameters
2023-09-05 08:54:19 +02:00
Arne Morten Kvarving
b0ecbf58de anonymize unused parameters 2023-09-04 14:34:30 +02:00
Kai Bao
87805ba3ec removing compilation warnings and some cleaning up 2023-09-01 10:42:43 +02:00
hnil
7acecc7e57 modification to add tpfa diffusion
fixed tpfa for diffusion module

fixed type error
2023-08-31 15:14:07 +02:00
Kai Bao
7ec77ada7e Merge pull request #822 from hnil/tpfa_temp
TPFA version for energy
2023-08-31 11:17:23 +02:00
Tor Harald Sandve
63764d715c Merge pull request #816 from totto82/maximum_water_sat
add parameter to set maximum water saturation. Default is 1.0
2023-08-30 12:17:24 +02:00
Kai Bao
2813195e15 reusing ResidualNBInfo class in blackoillocalresidualtpfa
to ResidualNBInfo class in tpfalinearizer.
2023-08-30 10:45:12 +02:00
Tor Harald Sandve
da06e423d5 add parameter to set threshold for only water cells. Default is 1.0 2023-08-30 08:38:22 +02:00
hnil
406ebf7cff - Modification to include thermal in tpfalinearizer
- Some assosiated utilites for evaluation properties on globalIndex
2023-08-29 15:58:48 +02:00
Atgeirr Flø Rasmussen
9b55bd57e7 Avoid collective operations in single-domain calls. 2023-08-25 12:25:30 +02:00
Tor Harald Sandve
60c65ec661 add parameter to set maximum water saturation. Default is 1.0 2023-08-17 09:02:16 +02:00
Bård Skaflestad
72e1bfb749 Merge pull request #820 from blattms/try-to-detect-more-paralel-exceptions
Try to detect more exceptions during parallel simulator setup.
2023-08-11 15:18:11 +02:00
Markus Blatt
79dfb6b2a6 Try to detect more exception during parallel simulator setup.
We have experienced some deadlocks lately because of programming
errors. This change will not result in a clean exit for those
but rather an abort by MPI because of non-matching communications.

Also we cannot forsee whether people will add more exceptions in
those parts that were not protected. We better play it safe here.
2023-08-11 14:08:52 +02:00
hnil
37b87aedb1 move the dynamic refinement part related to dune fem to separate class
introduced base discretization in tagsystem to be able to change between dunefem adaptation or not
2023-08-10 15:12:12 +02:00
hnil
7e1a1b27a2 -- added missing include 2023-08-08 11:12:46 +02:00
Atgeirr Flø Rasmussen
ecfb186c38 Merge pull request #799 from hnil/geomech
added enableMech
2023-07-26 19:26:17 +02:00
Arne Morten Kvarving
9eb80228a6 add missing include 2023-07-03 13:47:26 +02:00
Tor Harald Sandve
466bdafabf support BC in schedule 2023-06-28 14:10:09 +02:00
Atgeirr Flø Rasmussen
8c79af321a Fix OPENMP ifdefs. 2023-06-16 08:46:18 +02:00
Markus Blatt
55fdc62ea7 ThreadManager: Allow querying number of threads from OpenMP in init.
We actually do set the number of OpenMP threads based on
OMP_NUM_THREADS or command line option ThreadsPerProcess for OpenMP already
in opm-simulators and these settings should just be used here, too. Hence
the new flag for skipping the command line parameter and use the
number of threads that OpenMP has available.

Querying it here results in different behavior as for FlowMainEbos.hpp:
In opm-simulators variable OMP_NUM_THREADS takes precedence over the
command line parameter, but here it would only be used if the command
line option was not used at all.
2023-06-14 11:24:19 +02:00
Arne Morten Kvarving
97a52d25fe clean up some headers 2023-06-08 14:15:34 +02:00
Atgeirr Flø Rasmussen
e7f3a7cdea Add linearization support for local solves.
This is intended to be used for nonlinear domain decomposition methods.
2023-06-08 09:24:01 +02:00
hnil
e4b1a2eda7 added resizing for vector vtk output 2023-06-01 12:20:30 +02:00
hnil
c1bb0b0e09 added enableMech 2023-06-01 12:20:30 +02:00
Bård Skaflestad
876310f060 Merge pull request #806 from atgeirr/hnil-cache_less
Enable turning off storage cache.
2023-05-26 16:19:26 +02:00
Atgeirr Flø Rasmussen
e43cb70e2c Bugfix: use soMax consistent with BlackoilIntensiveQuantities::update(). 2023-05-26 13:20:37 +02:00
Bård Skaflestad
cae0866e60 Tag Potentially Unused Parameters as Maybe_Unused
We don't reference any of the input parameters unless we're running
a thermal simulation.
2023-05-24 17:33:12 +02:00
Atgeirr Flø Rasmussen
65739e15d6 Account for the recycleFirstIteration() false possibility. 2023-05-23 21:34:16 +02:00
Atgeirr Flø Rasmussen
2628472f7a Bugfix: honor timeIdx argument of invalidateAndUpdateIntensiveQuantities(). 2023-05-23 21:34:16 +02:00
hnil
b12d9844a2 Enable turning off storage cache. 2023-05-23 21:34:16 +02:00
Tor Harald Sandve
58f985a741 Merge pull request #796 from totto82/2p_solvent
Support gas-water-solvent
2023-05-23 15:05:40 +02:00
Tor Harald Sandve
43b34d2f60 Extend foam model with solvent or water 2023-05-23 09:42:02 +02:00
Tor Harald Sandve
46e3ec59de Support gas-water-solvent 2023-05-15 09:00:15 +02:00
Atgeirr Flø Rasmussen
4131572a7b Remove unnecessary copy of GridView. 2023-05-10 13:48:22 +02:00
Atgeirr Flø Rasmussen
2ba830ebca Remove some unneeded members to speed up stencil building. 2023-05-10 13:48:22 +02:00
Tor Harald Sandve
ed732c4c32 fix gaswater case for handling of only water case 2023-04-17 14:58:42 +02:00
Tor Harald Sandve
a8fa4ee2e8 Merge pull request #795 from totto82/rockfraction
use rockfraction instead of 1 - porosity in energy equation
2023-04-13 12:37:39 +02:00
Arne Morten Kvarving
4cb870d7cf Merge pull request #788 from akva2/require_dune_2.7
minimum dune version required is now 2.7
2023-04-12 11:30:14 +02:00
Tor Harald Sandve
69da3ae689 use rockfraction instead of 1 - porosity in energy equation 2023-03-27 15:51:04 +02:00
Atgeirr Flø Rasmussen
b1c5e06609 Make existing behaviour default. 2023-03-08 16:42:36 +01:00
Atgeirr Flø Rasmussen
26c953a1f9 Use diagonal block pointers for well source contributions. 2023-03-07 14:30:55 +01:00
hnil
4a41a7fcbb add option to make well assembly based on only wells 2023-03-07 14:26:50 +01:00
Atgeirr Flø Rasmussen
cb85fcf217 Merge pull request #791 from hnil/ebos_changes
- changes to be able to override methods in blacoilmodel
2023-03-02 13:16:06 +01:00
Arne Morten Kvarving
95b277e543 include TimingMacros.hpp where used 2023-03-01 14:15:21 +01:00
hnil
fc115dcb99 - changes to be able to override methods in blacoilmodel
- chaches to update full intensive quantities including extxrution factor without elementctx
2023-02-28 22:02:39 +01:00
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
ce8d626872 ElementBorderListFromGrid: use elements range generator 2022-10-17 13:37:44 +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
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