OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,969 Commits 18 Branches 75 Tags 73 MiB
87a961246f
Commit Graph

13969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
8c8851039c Add hysteresis in water gas 2p model 2023-03-28 12:39:01 +02:00
Tor Harald Sandve
3cd2539b7a add THERMAL option to BC 2023-03-28 12:04:24 +02:00
Markus Blatt
055547c709 EclipseGrid: make option 3 (MAX_EMPTY_GAP) of PINCH available 
This is needed to prevent creation of NNCs if the the empty gap created
by pinched out cells is larger than this threshold.
 2023-03-28 11:55:14 +02:00
Tor Harald Sandve
4ca0daf4bb add files 2023-03-27 15:01:55 +02:00
Tor Harald Sandve
bf7cef4ebd Support DIFFCGAS and DIFFCWAT for the CO2STORE module 2023-03-27 10:15:54 +02:00
Bård Skaflestad
070a14d56d
Merge pull request #3404 from totto82/addVap2Co2 
add vapporized water to gas in co2brine model
 2023-03-24 13:56:45 +01:00
Tor Harald Sandve
92b0477a14 cleanup based on review 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
f8a61f537b return gas density directly when no vaporized water to avoid numerical inpresition in division 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
3b43c5bae8 set enable vaporization 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
63340df84e Compute mixture innerEnergy and denisty assuming ideal mixtures 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
a94a84221b compute internal energy not enthalpy 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
dd36c0b558 renaming from Oil to Water 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
8c44873301 bugfix correctly using waterCompIdx when getting molarMass from BrineCo2Pvt module 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
b5ac472f14 add convert XgWToxgW 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
c84c1d54dd Add vapporized water to gas in co2brine model 2023-03-24 12:24:16 +01:00
Tor Harald Sandve
7526a7bb77
Merge pull request #3452 from totto82/fixThermalCO2 
Fix thermal + co2
 2023-03-22 11:06:52 +01:00
Bård Skaflestad
66bf31051a
Merge pull request #3437 from bska/load-aquflux-rst-info 
Load Constant Flux Aquifer Objects from Restart File
 2023-03-22 09:54:56 +01:00
Bård Skaflestad
303889516f Load Constant Flux Aquifer Objects from Restart File 
This commit adds logic and structures for bringing in constant flux
aquifer objects-keyword AQUFLUX-from the restart file and forming
the requisite dynamic objects in the Schedule.

In particular, the 'RstAquifer' gets a new bare-bones representation
of these aquifer types and we add new constant flux aquifer objects
to the pertinent 'ScheduleState' when these exist.  We also add this
aquifer type to 'data::Aquifers' in preparation of reinitialising
the simulator's aquifer container from the restart file.  In
particular, this needs the total produced volume from the aquifer so
far.
 2023-03-21 17:50:24 +01:00
Bård Skaflestad
f8f77ff081
Merge pull request #3076 from goncalvesmachadoc/carfinManager 
Read CARFIN and create LGR object
 2023-03-21 17:46:18 +01:00
goncalvesmachadoc
3e08afeafd delete makeState 2023-03-21 14:24:23 +01:00
Bård Skaflestad
94283ee43e
Merge pull request #3453 from hnil/missing_quadinclude 
fixed missing include
 2023-03-17 18:21:27 +01:00
hnil
352e2a8316 -fixed missing include 2023-03-17 17:06:30 +01:00
goncalvesmachadoc
7c29f6c2a5 test read name 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
4c93e18971 integration test framework 2023-03-17 14:26:26 +01:00
goncalvesmachadoc
ca08609810 rebase 2023-03-17 14:26:25 +01:00
Bård Skaflestad
c5d25fa663
Merge pull request #3436 from hnil/fem-withpolygrid 
fixed error if dune-fem is buildt with polygongrid
 2023-03-17 13:46:26 +01:00
Bård Skaflestad
fcf02b639a
Merge pull request #3447 from bska/enable-inplace-solution-insert 
Enable In-Place Element Construction in Insert()
 2023-03-16 18:11:41 +01:00
Bård Skaflestad
f1b4ae527a Enable In-Place Element Construction in Insert() 2023-03-16 16:15:41 +01:00
Bård Skaflestad
7f1e56e436 Adjust Whitespace in Data::Solution Implementation 
In preparation of enabling in-place construction in insert().
 2023-03-16 16:15:41 +01:00
Tor Harald Sandve
5f438d19cc fix sign bug in thermal Brine density calculations 2023-03-16 15:26:54 +01:00
Tor Harald Sandve
94c738538f use mass fraction not mole fractions 2023-03-16 15:26:03 +01:00
Bård Skaflestad
5f55ffe21a
Merge pull request #3442 from goncalvesmachadoc/co2store 
CO2STORE + GASWAT parsing
 2023-03-16 15:22:09 +01:00
Arne Morten Kvarving
9adb6d2586
Merge pull request #3450 from bska/restore-non-default-dune-install-builds 
Restore Builds With Dune in Non-Default Installed Locations
 2023-03-16 13:00:30 +01:00
Bård Skaflestad
bdf6951e62 Restore Builds With Dune in Non-Default Installed Locations 
In general we'd need to link to dune-common ("target_link_library")
to get the appropriate include directories for Dune in that case,
but in this specific instance we can get by with not specialising
Dune's 'className' function if Dune is not available.

Thanks to [at]akva2 for suggesting this workaround.
 2023-03-16 12:44:17 +01:00
Bård Skaflestad
32b104f828
Merge pull request #3449 from totto82/output_moles 
add moles unit to unitsystem
 2023-03-16 12:33:16 +01:00
Bård Skaflestad
e074054a57
Merge pull request #3448 from totto82/convertRsw 
add convertRswToXwg
 2023-03-16 12:25:54 +01:00
Bård Skaflestad
dec47944e3
Merge pull request #3446 from bska/celldata-ctor 
Add Constructors for CellData Objects
 2023-03-16 12:22:53 +01:00
Bård Skaflestad
ae29bb9101 Add Constructors for CellData Objects 
This enables using in-place construction in Solution::insert().
 2023-03-16 12:15:44 +01:00
Bård Skaflestad
553688b73e
Merge pull request #3424 from bska/write-aquflux-rst-info 
Add Restart File Output Support for Constant Flux Aquifers
 2023-03-16 12:04:14 +01:00
goncalvesmachadoc
f6402e2bc8 extra keywords 2023-03-16 10:50:59 +01:00
Bård Skaflestad
0adcc7dd07 Add Restart File Output Support for Constant Flux Aquifers 
We support constant flux aquifers (AQUFLUX keyword) entered both in
the SOLUTION and in the SCHEDULE sections.  The primary structural
change is that we have to support analytic aquifers being introduced
dynamically, whence the connection information (xCAQ) must be
captured without knowing the full set of analytic aquifers.  We
therefore allocate those output arrays purely from the maximum sizes
entered in the RUNSPEC section whereas we defer determining the
maximum aquifer ID to the point of capturing the dynamic values.

The xAAQ values for constant flux aquifers amount to a new aquifer
type integer value (=2) in IAAQ[11] and the flux value in SAAQ[0].
 2023-03-16 10:32:43 +01:00
Bård Skaflestad
53a7c2343a Split Aquifer Type Handling out to Helper Functions 
In preparation of adding support for outputting constant flux
aquifer values.
 2023-03-16 10:32:43 +01:00
Arne Morten Kvarving
ff2e8c8333
Merge pull request #3435 from akva2/sync_find_quadmath 
sync FindQuadMath with dune
 2023-03-16 10:00:33 +01:00
Tor Harald Sandve
932ed862d5 add moles unit to unitsystem 2023-03-16 09:18:39 +01:00
Arne Morten Kvarving
215fdae47d changed: remove explicit option to enable/disable quadmath 
not necessary as it is now only used for relevant targets
you can still use the generic -DCMAKE_DISABLE_FIND_PACKAGE_QuadMath=1 if you
so desire
 2023-03-16 09:07:13 +01:00
Arne Morten Kvarving
509a018ae7 fixed: fix debug printing with quad 
std::to_string(__float128) is not defined
we need to instance the evaluation formatter for __float128
 2023-03-16 09:07:13 +01:00
Arne Morten Kvarving
27ecbe5c98 fixed: instance CO2Tables for quad if QuadMath was found 2023-03-16 09:07:13 +01:00
Arne Morten Kvarving
1ef0492763 sync FindQuadMath with dune 
while at it, change to FindQuadMath, not FindQuadmath
 2023-03-16 09:07:13 +01:00
Tor Harald Sandve
1db6e4d7dd add convertRswToXwg 2023-03-16 08:48:56 +01:00
Arne Morten Kvarving
6b71f3d3c2
Merge pull request #3417 from blattms/fix-hdf5-dune-2.6 
Do not use FieldVector::data() mehod as it misses from DUNE 2.6.
 2023-03-15 21:10:34 +01:00