Commit Graph
8027 Commits
Author SHA1 Message Date
Kai Bao 477740ca38 introducing aquiferActive() to reduce of the overhead
for the models that does not include a aquifer model.
2018-05-31 09:51:54 +02:00
kel85uk 420fbe21d4 Merge remote-tracking branch 'nairr_github/aquifertest' into task/#3/BlackoilAquiferModel 2018-05-30 15:49:25 +02:00
kel85uk 677255055d Cleans up the BlackoilModelEbos.hpp file to address the final comments. 2018-05-30 14:26:07 +02:00
kel85uk e99fb80ce3 Corrects the whitespace again for blackoilmodelebos.hpp 2018-05-30 14:21:32 +02:00
kel85uk 7f2c2444f0 Cleans up the Aquifer model classes. 2018-05-30 14:21:30 +02:00
kel85uk 2170a00b21 Adds the influx coefficient multipler to the face area fraction calculation. Also removes more unnecessary variables and reordered initialization list to prevent ordering warnings in gcc compiler 2018-05-30 14:21:28 +02:00
kel85uk 8d3d7ccc2f Cleans up the code and removes unused functions 2018-05-30 14:21:24 +02:00
kel85uk ec680664fd Implements the correct check for aquifer face connections to make sure face is connected to the boundary 2018-05-30 14:21:22 +02:00
kel85uk 0d55b7aace Removes Eigen from interpolation of influence tables 2018-05-30 14:21:21 +02:00
kel85uk 7e1bb457cd Implemented initialization procedure. 2018-05-30 14:21:19 +02:00
kel85uk 5ca8bb676d Working aquifer object with equations implemented. Still need to do initialization solve. 2018-05-30 14:21:17 +02:00
kel85uk ae22d18e20 Working and building skeleton which works for multiple aquifers. Also gets the properties of the aquifers using AQUCT keyword. 2018-05-30 14:21:14 +02:00
kel85uk 10e896fa6b First addition of the class BlackoilAquiferModel. 2018-05-30 14:21:10 +02:00
kel85uk 05a02b9d68 Added build directory in the .gitignore 2018-05-30 14:21:06 +02:00
Joakim Hove 337ca0a3ab Merge pull request #1482 from joakim-hove/missing-GNETINJE
Mark keyword GNETINJE as not supported
2018-05-29 18:28:22 +02:00
Joakim Hove e09c86c5bf Mark keyword GNETINJE as not supported 2018-05-29 16:48:55 +02:00
Rohith Nair 5c7cc91a39 edit 2018-05-29 16:44:28 +02:00
Rohith Nair 196b5b29e8 edit 2018-05-29 16:40:40 +02:00
Rohith Nair 043c76a5d3 Add test for carter tracy aquifer 2018-05-29 16:35:26 +02:00
Arne Morten Kvarving 0e769afe9b Merge pull request #1481 from akva2/rh6_update
fixed redhat packaging for rh6
2018-05-23 08:32:41 +02:00
Arne Morten Kvarving 1a81ef0747 fixed redhat packaging for rh6 2018-05-23 08:30:22 +02:00
Joakim Hove a0538ff4bb Merge pull request #1470 from joakim-hove/use-restart-value
Use RestartValue when saving eclipse output
2018-05-18 08:58:28 +02:00
Kai Bao 979d67e714 Merge pull request #1477 from totto82/vfp_fixes
WIP fix vfp in flow
2018-05-16 10:06:10 +02:00
Joakim Hove c76898d0c9 Use RestartValue when saving eclipse output 2018-05-15 16:56:03 +02:00
Tor Harald Sandve 2534cc46db WIP fix vfp in flow 2018-05-15 10:24:50 +02:00
Arne Morten Kvarving fc169a5c16 Merge pull request #1475 from akva2/master
update redhat packaging
2018-05-14 13:34:10 +02:00
Arne Morten Kvarving a9fc6b1a27 update redhat packaging 2018-05-14 12:50:16 +02:00
Atgeirr Flø Rasmussen ffd1f76c7c Merge pull request #1474 from akva2/data_to_tests
data -> tests
2018-05-14 07:36:33 +02:00
Andreas Lauser 483e04c5da Merge pull request #1471 from totto82/implement_blackoil_energy_PR
Add blackoil + energy specialization to Flow
2018-05-08 11:30:12 +02:00
Arne Morten Kvarving 7f32dad6c7 data -> tests 2018-05-08 10:39:48 +02:00
Kai Bao 45023f304e Merge pull request #1465 from atgeirr/fix-ilu-serial
Make sure we (re-)throw MatrixBlockError also in the serial case.
2018-05-08 10:39:15 +02:00
Tor Harald Sandve 54c8a48481 code clean-up based on review 2018-05-08 10:22:47 +02:00
Tor Harald Sandve f00ad22d98 Fix thermal debug run 2018-05-02 09:15:52 +02:00
Tor Harald Sandve 936220f85c Add test case for thermal simulator in flow 2018-04-30 13:56:15 +02:00
Tor Harald Sandve ee88790dea Add a flow specialization for blackoil with energy conservation
The energy conservation is enabled by specifying either TEMP or
THERMAL in the deck. The deck also needs to contatin relevant fluid and rock
heat properties.

The blackoil + energy equations are solved fully implicit.
2018-04-30 13:45:18 +02:00
Arne Morten Kvarving 81dcc011a3 Merge pull request #1468 from andlaus/update_version
dune.module: update version to 2018.10-pre
2018-04-27 10:45:34 +02:00
Andreas Lauser 5ea9de7d47 dune.module: update version to 2018.10-pre 2018-04-26 17:47:23 +02:00
Arne Morten Kvarving 53ee44f089 build with mpi on redhat 2018-04-25 09:35:13 +02:00
Tor Harald Sandve dee7d97b8f Merge pull request #1464 from totto82/fixilu
keep using the block inversion algorithm in OPM
2018-04-24 15:18:17 +02:00
Atgeirr Flø Rasmussen f9c1fbcbe6 Make sure we (re-)throw MatrixBlockError also in the serial case. 2018-04-24 14:32:43 +02:00
Tor Harald Sandve f66fb298db keep using the block inversion algorithm in OPM 2018-04-24 11:25:33 +02:00
Joakim Hove e012363abc Merge pull request #1462 from GitPaean/fixing_vfp_running_2
adapting to the interface change of VFP related in parser.
2018-04-23 16:30:11 +02:00
Joakim Hove 8965fc3138 Merge pull request #1460 from lars-petter-hauge/restart_timestep
Only load wells that have simulated data
2018-04-23 12:21:58 +02:00
Atgeirr Flø Rasmussen 950148d66e Merge pull request #1463 from akva2/update_banners
bring banners into the new ssl enabled world
2018-04-20 12:33:57 +02:00
Arne Morten Kvarving 25fda55778 bring banners into the new ssl enabled world 2018-04-20 11:31:15 +02:00
Kai Bao 78cc2b8ca4 adapting to the interface change of VFP related in parser. 2018-04-20 11:29:22 +02:00
Lars Petter Øren Hauge 0ea2b9afe2 Only load wells that have simulated data
Wells that are added at the same time step as RESTART is initiated will
not be present in a restart file. Use the previous time step to retrieve
wells
2018-04-17 14:09:11 +02:00
Atgeirr Flø Rasmussen d9b215ec70 Merge pull request #1459 from atgeirr/update-changelog
Updated to reflect changes from the last few months.
2018-04-13 14:57:29 +02:00
Atgeirr Flø Rasmussen 07cdb7d4be Updated to reflect changes from the last few months. 2018-04-13 14:33:11 +02:00
Arne Morten Kvarving 45f70f1a38 Merge pull request #1451 from akva2/missing_tests_to_root
fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT
2018-04-13 11:48:20 +02:00