Commit Graph

1125 Commits

Author SHA1 Message Date
Kai Bao
054a768225 adding the CO2, C1, C10 component with exact Julia properties 2022-06-27 10:37:16 +02:00
Kai Bao
fe42b8a5b3 some cleaning up, no functionality change 2022-06-27 10:37:16 +02:00
Kai Bao
ad4d1bee4f removing the tempalte parameter Evaluation for ChiFlash 2022-06-27 10:37:16 +02:00
Kai Bao
0c9cffbd60 adding the spe5 using chiflash
to compile, you need to change the function name criticalMolarVolume to
criticalVolume in Spe5FluidSystem.

And the commented out code in PengRobinson.hpp looks like needed for
spe5 flash.
2022-06-27 10:37:16 +02:00
Kai Bao
2fb4676fee remvoing unused types for clarity. 2022-06-27 10:37:16 +02:00
hnil
22e79cd97a fixed it 2022-06-27 10:37:16 +02:00
hnil
1637633b21 added a scalar test 2022-06-27 10:37:16 +02:00
Kai Bao
6833b8e434 some small changes, not functionality change. 2022-06-27 10:37:16 +02:00
Kai Bao
df50b67ed3 compiled and running now. 2022-06-27 10:37:16 +02:00
Kai Bao
52f23ec882 using the same types from the co2-compositional
it compiles now. Not sure why the running is terminated due to NaN.
2022-06-27 10:37:16 +02:00
Kai Bao
a205ff502e continuing WIP for the test_chiflash
not compiled but reproducing the same compilation error with much
smaller code.
2022-06-27 10:37:16 +02:00
Kai Bao
fc38c68735 WIP to make the test_chiflash using TwoPhaseThreeComponentFluidSystem 2022-06-27 10:37:16 +02:00
Kai Bao
db5ab02dd2 incoporating K, L, twophaseflag to FluidStateCompositionModules
It was done by Norce in the co2-compositional branch.
It removes some compilation errors.
2022-06-27 10:37:16 +02:00
Atgeirr Flø Rasmussen
261bf56fab [WIP] Add ChiFlash and test. Not compiling. 2022-06-27 10:37:16 +02:00
Tor Harald Sandve
694fe3b85c Merge pull request #515 from totto82/fixExtrapolateDiff
Extrapolate gas diffusion in CO2 module
2022-06-21 09:10:24 +02:00
Tor Harald Sandve
dba0fe19c5 Merge pull request #500 from plgbrts/JouleThomson
Adding Joule-Thomson effect in energy calculations
2022-06-20 11:04:15 +02:00
Tor Harald Sandve
f4118ed61d Extrapolate gas diffusion in CO2 module 2022-06-20 10:59:15 +02:00
Paul Egberts
0168b7719f added Rvw argument for gas inverseFormationVolumeFactor function 2022-06-13 15:04:40 +02:00
Paul Egberts
dcc6eb2e0c modified density calculation to include oil vapor and dissolved gas 2022-06-13 11:39:11 +02:00
Paul Egberts
25adfda7d9 adjustments needed for new Joule-Thomson keywords 2022-06-13 11:39:11 +02:00
Paul Egberts
a2aa7b9603 adjusted internal energy calculation to include (optional) Joule-Thomson effect 2022-06-13 11:39:10 +02:00
Paul Egberts
a721fbba1f joule thomson 2022-06-13 11:39:10 +02:00
Bård Skaflestad
fc98447a97 Merge pull request #497 from plgbrts/vapoilwat
Add PVT for combined wet (vaporized oil)  and humid (vaporized water) gas
2022-05-25 15:14:10 +02:00
Tor Harald Sandve
d8ed221390 Merge pull request #489 from osae/letRelperm
Saturation functions based on LET-curves.
2022-05-03 13:39:13 +02:00
Bård Skaflestad
36ceeded74 Merge pull request #505 from totto82/fix_constant_rsrv
only remove duplicated points if there are more than two unique points
2022-05-02 11:04:55 +02:00
Bård Skaflestad
7990d1571e Merge pull request #510 from blattms/fix-spelling
Fixes spelling (amount -> amount)
2022-04-27 23:22:48 +02:00
Markus Blatt
520a406228 Fixes spelling (amount -> amount) 2022-04-27 22:13:07 +02:00
Markus Blatt
caefe67bb0 Merge pull request #507 from blattms/co2brinepvt-man
Added man page for co2brinepvt.
2022-04-26 17:23:54 +02:00
Ove Sævareid
10abd8efa2 Fixup. 2022-04-26 16:27:42 +02:00
Markus Blatt
a9595f80b3 Added man page for co2brinepvt. 2022-04-26 15:56:20 +02:00
Tor Harald Sandve
cb4ec94fcc only remove duplicated points if there are more than two unique points 2022-04-26 10:46:34 +02:00
Atgeirr Flø Rasmussen
f0c272f180 Merge pull request #504 from totto82/setEnableDissolution
return rsSat = 0 when dissolution is disabled in co2module
2022-04-20 15:14:44 +02:00
Tor Harald Sandve
1dc3d9b711 return rsSat = 0 when dissolution is disabled 2022-04-20 09:58:21 +02:00
Markus Blatt
1267a246e1 Merge pull request #499 from totto82/co2brinepvt_refPR
Co2brinepvt ref pr
2022-04-19 13:57:07 +02:00
Markus Blatt
1daaa303b0 Merge pull request #501 from goncalvesmachadoc/patch-4
[Release 2022.04] Fix bug WATDENT
2022-04-19 11:02:30 +02:00
Markus Blatt
54dda0b9ca Merge pull request #498 from totto82/co2brine_fix
Fix conversion from density to bo
2022-04-19 10:59:45 +02:00
Cintia Goncalves Machado
1720805f19 Fix division by zero in WATDENT implementation 2022-04-15 19:26:51 +02:00
Paul Egberts
405d435530 added water-gas ratio argument for co2brinepvt properties 2022-04-12 11:34:37 +02:00
Paul Egberts
9375ccd2ea fixed comment 2022-04-12 11:15:23 +02:00
Paul Egberts
7d66a1eef3 added water-gas ratio argument 2022-04-12 11:15:23 +02:00
Paul Egberts
2cc76c5c53 PVT for combined wet(vaporized oil) and humid (vaprized water) gas 2022-04-12 11:15:22 +02:00
Tor Harald Sandve
6130499031 adapt density computations to fix for invB 2022-04-12 10:08:31 +02:00
Tor Harald Sandve
3845e23ba3 Add prop B and diffusionCoefficient to co2brinepvt 2022-04-12 09:55:25 +02:00
Tor Harald Sandve
39712270b5 compute ref densities based on std conditions in co2/brine pvt modules 2022-04-12 09:55:25 +02:00
Tor Harald Sandve
9310f93eaf Fix conversion from density og bo 2022-04-12 09:37:09 +02:00
Markus Blatt
d5b6152d6d Merge pull request #494 from totto82/co2brinepvt
add a simple program to access the pvt properties of co2 and brine
2022-04-10 11:08:18 +02:00
Ove Sævareid
9b770715ef Some LET related tests. 2022-04-08 11:46:33 +02:00
Ove Sævareid
d464c26e4a LET-based saturation functions. Run-time selection of LET vs tabulated functions. 2022-04-08 11:46:33 +02:00
Tor Harald Sandve
a85b6a3475 Merge pull request #491 from plgbrts/vapwat
Adding PVT for gas without oil-vapor (dry) and  with vaporized water (humid)
2022-04-05 11:33:19 +02:00
Paul Egberts
b50bf7ec22 cleanup 2022-04-04 14:34:16 +02:00