Commit Graph

5619 Commits

Author SHA1 Message Date
Andreas Lauser
7f8120d609 flow: do not set the ExportGlobalTransmissibility property anymore
this has not been required anymore since the output code was moved to
the ebos core.
2018-07-11 13:49:17 +02:00
Arne Morten Kvarving
4fe6ac5bab
Merge pull request #1531 from andlaus/better_well_API
use a raw pointer to specify the auxiliary module for wells
2018-07-10 13:26:33 +02:00
Joakim Hove
b4fa06f305 Mark keyword ACTIONX as not supported 2018-07-10 09:37:25 +02:00
Andreas Lauser
ccd0da2e4c use a raw pointer to specify the auxiliary module for wells
this is necessiated by the replacement of `std::shared_ptr` by raw
pointers for the eWoms auxiliary equation infrastructure. Note that by
default `flow` will *not* create an auxiliary equation module because
it modifies the operator that is used by the linear solver instead.
2018-07-09 12:14:43 +02:00
Tor Harald Sandve
4a2780d161 split close wells from close connection 2018-07-03 15:13:30 +02:00
Tor Harald Sandve
a5f5581441 Fix more minor issues based on review 2018-07-03 14:07:53 +02:00
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
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
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
Atgeirr Flø Rasmussen
576612c4b2 Rename .CASE.DEBUG -> CASE.DBG. 2018-06-25 22:22:29 +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
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
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
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
bd57d574d3 Rename Completion -> Connection 2018-06-11 17:23:28 +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
Kai Bao
1b587fa118 removing some whitespaces 2018-06-05 09:24:50 +02:00
kel85uk
e560242a19 Resolved conflicts by taking changes from pull request 2018-06-04 16:33:34 +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
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
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
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