Joakim Hove
5034e25ab8
Merge pull request #1494 from joakim-hove/rename-completions
...
Rename Completion -> Connection
2018-06-12 13:23:05 +02:00
Joakim Hove
bd57d574d3
Rename Completion -> Connection
2018-06-11 17:23:28 +02:00
Atgeirr Flø Rasmussen
a570cf59bf
Merge pull request #1493 from atgeirr/add-missing-files
...
Add forgotten new headers to file list for installation.
2018-06-08 15:37:23 +02:00
Atgeirr Flø Rasmussen
ad2f157554
Add forgotten new headers to file list for installation.
2018-06-08 15:01:59 +02:00
Atgeirr Flø Rasmussen
0bce417e9f
Merge pull request #1491 from andlaus/remove_more_state
...
Remove more state
2018-06-08 09:56:42 +02:00
Andreas Lauser
5a9b81db33
remove the hasDisgas and hasVapoil arguments from SimulatorFullyImplicitBlackoilEbos
...
They seemed to be unused already. I suspect that were only there for
API compatibility reasons.
2018-06-06 10:59:42 +02:00
Andreas Lauser
37b6a540af
remove BlackoilOutputEbos
...
after the actual output writing code has been moved to core ebos, this
was just a unnecessary glue layer for API compatibility.
2018-06-06 10:59:41 +02:00
Andreas Lauser
dfbc24b35f
flow: avoid wrangling around with dummy state objects
...
these objects are only used by flow_legacy, so not having to deal with
them anymore lets non-legacy flow avoid to jump through a lot of hoops
for the sake of having a common API.
this required a fork of the NonlinearSolver and AdaptiveTimeStepping
classes. this is not a problem because the original classes would get
pruned to look like the new ones once flow_legacy gets moved out of
the opm-simulators module.
2018-06-06 10:59:41 +02:00
Atgeirr Flø Rasmussen
2672f38375
Merge pull request #1489 from GitPaean/removing_whitespaces
...
removing some whitespaces
2018-06-05 12:09:12 +02:00
Kai Bao
1b587fa118
removing some whitespaces
2018-06-05 09:24:50 +02:00
Kai Bao
b3e3b625b6
Merge pull request #1371 from kel85uk/task/#3/BlackoilAquiferModel
...
[WIP] Task/#1372/blackoil aquifer model
2018-06-04 22:02:26 +02:00
kel85uk
e560242a19
Resolved conflicts by taking changes from pull request
2018-06-04 16:33:34 +02:00
Kelvin Loh
1c6dfbf295
Merge pull request #13 from GitPaean/kel85uk-task/#3/BlackoilAquiferModel
...
Introduces aquiferActive() to reduce overhead during matrix assembly without aquifers.
2018-06-04 16:02:05 +02:00
Rohith Nair
755b3cc814
edit
2018-06-04 15:29:02 +02:00
Rohith Nair
123d3c68c5
edit
2018-06-04 15:29:01 +02:00
Rohith Nair
a0db7c3229
Add test for carter tracy aquifer
2018-06-04 15:29:00 +02:00
kel85uk
1237724c9a
Cleans up the BlackoilModelEbos.hpp file to address the final comments.
2018-06-04 15:28:58 +02:00
kel85uk
963d42aab3
Corrects the whitespace again for blackoilmodelebos.hpp
2018-06-04 15:28:57 +02:00
kel85uk
b7fbe66c91
Cleans up the Aquifer model classes.
2018-06-04 15:28:56 +02:00
kel85uk
2fe24e16cf
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-06-04 15:28:54 +02:00
kel85uk
1a33e81d9c
Cleans up the code and removes unused functions
2018-06-04 15:28:53 +02:00
kel85uk
0df51a8797
Implements the correct check for aquifer face connections to make sure face is connected to the boundary
2018-06-04 15:28:52 +02:00
kel85uk
d8f8646452
Removes Eigen from interpolation of influence tables
2018-06-04 15:28:51 +02:00
kel85uk
e2513038c4
Implemented initialization procedure.
2018-06-04 15:28:49 +02:00
kel85uk
89255da464
Working aquifer object with equations implemented. Still need to do initialization solve.
2018-06-04 15:28:48 +02:00
kel85uk
ac7204fb2b
Working and building skeleton which works for multiple aquifers. Also gets the properties of the aquifers using AQUCT keyword.
2018-06-04 15:28:47 +02:00
kel85uk
5a87818bb2
First addition of the class BlackoilAquiferModel.
2018-06-04 15:28:46 +02:00
kel85uk
78caac2c20
Added build directory in the .gitignore
2018-06-04 15:28:44 +02:00
Tor Harald Sandve
e128dc7e87
Merge pull request #1478 from GitPaean/adding_control_equations
...
Adding well control equations
2018-06-04 15:12:31 +02:00
Joakim Hove
ac85b8a81c
Merge pull request #1488 from joakim-hove/load-THPRES
...
Load thpres
2018-06-01 11:47:19 +02:00
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
Kai Bao
cb9fea6ba0
changing GTotal to WQTotal for StandardWell
2018-05-30 15:44:05 +02:00
Joakim Hove
dd3fb03286
THPRES API updates
2018-05-30 14:27:32 +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