Commit Graph

13918 Commits

Author SHA1 Message Date
Paul Egberts
b9012d85a3 removal of unused files 2023-03-29 17:24:13 +02:00
Paul Egberts
367ffb1aa2 added missing *.inl files to make file 2023-03-29 17:24:13 +02:00
Paul Egberts
d0fc099d75 explicit listing of header files, removed globbing 2023-03-29 17:24:11 +02:00
Paul Egberts
1d07b6ad9f attempt to fix build error 2023-03-29 17:23:21 +02:00
Paul Egberts
e7e1411146 added resinsight include files in cmake file part 2 2023-03-29 17:23:21 +02:00
Paul Egberts
7ebfb0b86f added resinsight include files in cmake file 2023-03-29 17:23:21 +02:00
Paul Egberts
98f41e2e2e cmake file fix 2023-03-29 17:23:21 +02:00
Paul Egberts
160c5bee10 added #include <string> 2023-03-29 17:23:21 +02:00
Paul Egberts
8091ea73ae repairing cmake file 2023-03-29 17:23:14 +02:00
Paul Egberts
e7ae500032 added test for calculation of CFs and IJK coordinates of intersected cells 2023-03-29 17:20:57 +02:00
Paul Egberts
3ba31d4304 finalizing and cleaning up 2023-03-29 17:20:54 +02:00
Paul Egberts
46f412e60a Processing WELTRAJ/COMPTRAJ; Calculation of intersected cells and CFs 2023-03-29 17:05:39 +02:00
Paul Egberts
88e58ba5d2 finalizing keywords COMPTRAJ and WELTRAJ 2023-03-29 17:05:39 +02:00
Paul Egberts
067e645e22 This is a combination of 5 commits.
Reorganizing and renaming files
2023-03-29 17:05:39 +02:00
Paul Egberts
5c9a59644f well trajectory calculation (re)using resinsight code 2023-03-29 17:05:37 +02:00
Paul Egberts
532b626e56 try out code 2023-03-29 17:03:56 +02:00
Paul Egberts
65eff452e3 reading new tables for grid independent well specification 2023-03-29 17:03:56 +02:00
Bård Skaflestad
0be5bee7c4
Merge pull request #3457 from totto82/addThermalBC
add THERMAL option to BC
2023-03-29 14:07:45 +02:00
Bård Skaflestad
cbb808b579
Merge pull request #3455 from totto82/diffc_co2store
Support DIFFCGAS and DIFFCWAT for the CO2STORE module
2023-03-29 13:41:40 +02:00
Tor Harald Sandve
b8ee8d8652
Merge pull request #3451 from totto82/gaswater_hyst
Enable hysteresis in water gas 2p model
2023-03-28 15:48:59 +02:00
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
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