Tor Harald Sandve
6606bb75b2
Minor fix based on code review
2018-06-29 13:33:56 +02:00
Tor Harald Sandve
d769e7649a
Name completion and connection consistently
2018-06-28 13:47:10 +02:00
Tor Harald Sandve
834f680587
Add support for COMPLUMP in WECON and WTEST
2018-06-28 13:28:30 +02:00
Tor Harald Sandve
0f4038342d
add update data for wecon_wtest
...
and fix filename inconsistency
2018-06-28 10:16:29 +02:00
Tor Harald Sandve
22755cc257
Add support for combination of multi-segmented wells and WTEST
2018-06-28 10:16:29 +02:00
Tor Harald Sandve
3e53ed6386
implement WTEST support
2018-06-28 10:16:29 +02:00
Joakim Hove
7568ec0f90
Merge pull request #1519 from joakim-hove/completion-refactor
...
Completion refactor
2018-06-28 09:58:51 +02:00
Tor Harald Sandve
b1e03d5196
Merge pull request #1523 from atgeirr/fix-currentDateTime
...
Cast argument for milliseconds() call to an integer.
2018-06-28 07:51:53 +02:00
Atgeirr Flø Rasmussen
8d6fefbd29
Merge pull request #1524 from andlaus/correct_timekeeping
...
flow: fix the time held by the simulator object
2018-06-27 15:34:01 +02:00
Andreas Lauser
c794028bcf
flow: fix the time held by the simulator object
2018-06-27 12:13:50 +02:00
Atgeirr Flø Rasmussen
53e46ca017
Cast argument for milliseconds() call to an integer.
...
Apparently required by boost::posix_time::milliseconds.
2018-06-27 11:11:27 +02:00
Joakim Hove
514cdc574c
Completion refactor
2018-06-26 12:30:54 +02:00
Andreas Lauser
01c830656d
Merge pull request #1518 from atgeirr/rename-debug-file
...
Rename .CASE.DEBUG -> CASE.DBG.
2018-06-26 10:17:23 +02:00
Atgeirr Flø Rasmussen
576612c4b2
Rename .CASE.DEBUG -> CASE.DBG.
2018-06-25 22:22:29 +02:00
Alf Birger Rustad
10b0c45c2f
Merge pull request #1515 from alfbr/master
...
Reduce default number of threads from four to two with OpenMP
2018-06-25 18:36:51 +02:00
Arne Morten Kvarving
ba1972d02d
fixed: do not require specific versions of upstream libs
...
broke nightly build installations
2018-06-25 09:05:55 +02:00
Arne Morten Kvarving
d596fe6dec
add yet another missing dependency to redhat packaging
2018-06-25 07:17:49 +02:00
Alf Birger Rustad
e72ef6bcc7
Reduce default number of threads from four to two with OpenMP
2018-06-24 21:51:04 +02:00
Arne Morten Kvarving
48bcfacb41
add missing dune depends to redhat packaging
2018-06-21 14:28:43 +02:00
Arne Morten Kvarving
6b9afda602
fix redhat nightly builds
2018-06-21 13:28:51 +02:00
Joakim Hove
06149a3b05
Merge pull request #1500 from joakim-hove/rename-completion-set
...
Refactor of connections & completions
2018-06-21 08:13:56 +02:00
Arne Morten Kvarving
2a3a29d94c
Merge pull request #1509 from akva2/add_mpich
...
add mpich packages to redhat
2018-06-20 12:42:56 +02:00
Arne Morten Kvarving
a32c4ae67d
add mpich packages to redhat
2018-06-20 12:35:56 +02:00
Joakim Hove
94d57f686c
Refactor of connecrions & completions
2018-06-20 11:51:00 +02:00
Tor Harald Sandve
a255f8cc6f
Merge pull request #1497 from andlaus/pass_async_output_param
...
Pass the async_output parameter to core ebos
2018-06-20 10:38:14 +02:00
Atgeirr Flø Rasmussen
904665a10e
Merge pull request #1498 from blattms/disable-cpr-eclipse-keyword
...
Deactivate selection of CPR via eclipse keyword
2018-06-15 15:53:13 +02:00
Markus Blatt
1bd735428f
Deactivate selection of CPR via eclipse keyword
...
as this preconditioner is still considered experimental
and fails miserably for some models. Users can select
CPR using the command line.
2018-06-15 15:34:01 +02:00
Andreas Lauser
830c119362
Pass the async_output to core ebos
...
this was forgotten when moving the output writing code into the ebos
core. (this does not really matter for most people because
asynchronous output is wanted anyway and it was unconditionally
enabled.)
2018-06-15 11:44:07 +02:00
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