Commit Graph

1567 Commits

Author SHA1 Message Date
Arne Morten Kvarving
0d9312b5ee remove last remnants of property system macros
these have been deactivated for years
2024-03-22 12:11:55 +01:00
Arne Morten Kvarving
99ac834401 fixed: initialize meaning variables
in particular the solventMeaning can lead to
out-of-bounds dereferences in updatePrimaryVariables
2024-03-11 14:40:22 +01:00
Kai Bao
6f9ab6189f Merge pull request #875 from akva2/adjust_outputmodule
adjust to output module accessor change
2024-03-05 23:31:34 +01:00
Arne Morten Kvarving
866a1f43b6 Merge pull request #878 from bska/maybe-unused-parameters
Tag Certain Parameters As Maybe-Unused
2024-03-01 15:01:45 +01:00
Bård Skaflestad
2b0d9a7d55 Tag Certain Parameters As Maybe-Unused
These parameters get referenced only in certain configurations.
2024-03-01 12:03:11 +01:00
Atgeirr Flø Rasmussen
cdc86b46df Merge pull request #874 from totto82/fixNNCFlows
Fix Flows/Flores for NNCs
2024-02-12 20:45:37 +01:00
Tor Harald Sandve
e6c8eedeb8 Fix Flows/Flores for NNCs 2024-02-12 15:57:50 +01:00
Arne Morten Kvarving
c76c3b8fc6 adjust to output module accessor change 2024-02-12 12:05:33 +01:00
Atgeirr Flø Rasmussen
edbe1a113a Merge pull request #873 from blattms/nnc-fix-flows-flores
[bugfix] Do not try to save FLOWS or FLOWRES values for NNCs.
2024-02-07 11:50:40 +01:00
Markus Blatt
57da17b591 [bugfix] Do not try to save FLOWS or FLOWRES values for NNCs.
If we would try that then we would index vectors with index -1 and
possibly overwriting other system information. This was the case for
some models resulting in cryptic errror " corrupted size vs. prev_size"

Now we simply do nothing for NNCs.
2024-02-06 16:06:11 +01:00
Tor Harald Sandve
d0951e83ff Merge pull request #869 from totto82/vapwatdiff
Enables diffusion of water in gas phase
2024-02-06 14:57:31 +01:00
Bård Skaflestad
e503d2f2dc Merge pull request #872 from akva2/janitoring
add missing include
2024-02-06 13:01:56 +01:00
Arne Morten Kvarving
feec519be8 add missing include 2024-02-06 10:40:35 +01:00
Tor Harald Sandve
2d697eb240 Enables diffusion for vapporized water 2024-02-05 09:09:57 +01:00
Tor Harald Sandve
4c8d6b5a22 Merge pull request #868 from totto82/massFractionDiffusion
Add mass fraction diffusion coefficients
2024-02-05 08:48:40 +01:00
Tor Harald Sandve
521de7a6e5 Add mass fraction diffusion coeficients 2024-02-02 16:02:24 +01:00
Tor Harald Sandve
5f7180b1f8 Merge pull request #870 from totto82/fixOutputDisp
Only output warning if dispersion is activated
2024-02-01 11:54:21 +01:00
Tor Harald Sandve
fe1a488e77 Only output warning if dispersion is activated 2024-02-01 09:28:33 +01:00
Markus Blatt
3aa2e0969f Merge pull request #864 from lisajulia/feature/deterministic-indicesSyncer
Construct the matrices in the AMG hierarchy with deterministic indices if possible.
2024-01-29 13:59:44 +01:00
Tor Harald Sandve
d5d7ad2d20 Merge pull request #866 from totto82/fixSolventRs
BUGFIX allow for solvent flux when disgasw
2024-01-26 12:08:08 +01:00
Tor Harald Sandve
14786bcba5 BUGFIX allow for solvent flux when disgasw 2024-01-26 10:35:05 +01:00
Tor Harald Sandve
d1e8be32c1 Merge pull request #865 from daavid00/fixthermalbc
Thermal BC for spe11bc
2024-01-26 10:26:33 +01:00
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
2ca9dc5526 Merge pull request #786 from hnil/scaled_blackoil_new
- based on earlier pullrequest which is outdated reintroduced pressur…
2024-01-19 10:43:53 +01:00
Halvor Møll Nilsen
f858b65602 Merge pull request #5 from atgeirr/hnil-scaled_blackoil_new
Fix compile errors for non-blackoil models.
2024-01-19 09:27:51 +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
Bård Skaflestad
7167766806 Merge pull request #855 from GitPaean/trying_dynamic_fluid_system_new
using GenericFluidSystem for co2ptflash problem
2024-01-17 14:50:39 +01:00
Kai Bao
b9131f7a63 adapting to the changes in GenericOilGasFluidSystem 2024-01-17 12:10:03 +01:00
Kai Bao
aad3f10f13 adapting to std::string_view
for componentName and phaseName
2024-01-17 12:10:03 +01:00
Kai Bao
8b9e8aefee using GenericFluidSystem for co2ptflash problem 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
Tor Harald Sandve
37612b95db Merge pull request #860 from daavid00/dyncppres
Support for dynamic scaling of capillary pressure due to salt precipitation
2024-01-15 11:12:52 +01:00
David Landa Marban
30ded37687 Support for dynamic capillary pressure 2024-01-12 18:29:06 +01:00
Tor Harald Sandve
c2004e2209 Merge pull request #858 from totto82/avgTransMult
use arithmetic averaged compaction transmissibility multipliers
2024-01-12 10:01:00 +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
7b7bb2ae44 Merge pull request #856 from totto82/supportMiscGasWaterSolvent
Support water + gas + solvent + miscible
2023-12-22 13:30:20 +01:00
Tor Harald Sandve
cad0b92633 Support water + gas + solvent + miscible 2023-12-22 09:44:29 +01:00
Tor Harald Sandve
b2e6510aed Merge pull request #851 from totto82/solventrsw
Add H2SOL and CO2SOL model. That allows for dissolution of solvent in water
2023-12-21 14:54:54 +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
Bård Skaflestad
a928b8ffe3 Merge pull request #854 from totto82/addBondaryFluxOutput
Add bondary flux output
2023-12-13 13:17:31 +01:00
Tor Harald Sandve
f6b5e27e52 factor out flux output 2023-12-13 11:00:23 +01:00