Commit Graph

590 Commits

Author SHA1 Message Date
Robert Kloefkorn
5c19ead909 [bugfix][Ewoms] make compile with dune-fem 2.5 2018-05-22 22:17:04 +02:00
Tor Harald Sandve
98c2b03667 change ecl output name from SSOL to SSOLVENT 2018-05-09 14:52:43 +02:00
Andreas Lauser
a53ef08699 ecloutputblackoilmodule.hh: adapt coding style to the rest of eWoms
the style was mostly fine, but there were a few leftovers from the
pre-eWoms epoch of that code.
2018-04-30 19:06:07 +02:00
Tor Harald Sandve
91139efa27 Merge pull request #311 from andlaus/fixes
ebos fix and compiler workaround
2018-04-13 13:53:43 +02:00
Tor Harald Sandve
a697b523a3 Merge pull request #310 from andlaus/update_changelog
Update changelog
2018-04-13 10:46:26 +02:00
Andreas Lauser
f96d553d8e ebos: salvage temperature from the initial fluid states for isothermal simulations
this is required because temperature needs to be always specified. in
the case of isothermal simulations, the temperature is assumed to be
the initial one, i.e., freeing up the initial fluid states also makes
the temperature undefined.

I suspect that the reason why this did not lead to crashes is that for
isothermal `BlackOilFluidState` objects, the temperature is stored in
a static member variable.

thanks to at [at]bska for catching this issue.
2018-04-12 14:22:10 +02:00
Andreas Lauser
ae779f2132 make all headers autonomous again 2018-04-11 13:06:56 +02:00
Andreas Lauser
b64ca374c3 make ebos compile with dune-fem being around for dune 2.6
dune 2.6 seems to expect a referenceElement(geo) free function.
2018-04-10 13:31:04 +02:00
Andreas Lauser
ede2ef35af rename compatibility.hh to ebos/femcpgridcompat.hh
the purpose of this seems to be to make 'Opm::CpGrid' usable with
'dune-fem'. This is quite a fringe case, and the code should better go
to opm-grid.
2018-04-10 13:31:04 +02:00
Andreas Lauser
1af2996b2a move the base class for auxiliary modules to ewoms/disc/common
that's where it belonged in the first place.
2018-04-10 10:05:18 +02:00
Andreas Lauser
ffe3914ddd thermal blackoil: fix a few issues with thermal conductivity 2018-04-05 19:31:55 +02:00
Andreas Lauser
26228ec5f3 fix the issues that emerged in the context of [at]totto82's review 2018-04-05 19:31:55 +02:00
Andreas Lauser
54c96aa1c2 blackoil, ebos: implement non-trivial boundary conditions
with this, it is possible do define fluxes of conservation quantities
over the domain boundaries by specifying the thermodynamic state on
the boundary when using the black-oil model. The main motivation is
are thermal fluxes which are required to maintain geothermal
temperature gradients over time.
2018-04-05 19:31:55 +02:00
Andreas Lauser
815be1451b implement the ebos part of energy conservation
I.e. everything which is ECL specific.
2018-04-05 19:31:55 +02:00
Andreas Lauser
4241986e94 equil initializer: use TEMPI to specify the initial temperature
this also implicitly takes care of RTEMPVD, RTEMP and all the other
ways of specifying the initial reservoir temperature.
2018-04-05 19:31:12 +02:00
Andreas Lauser
3288548c7e disable asynchronous output for the ECL output test
this leads to crashes deeply inside libecl. My cursory hypotheses are
that this test makes the assumption that the output is written
synchronously (it tries to read back the results from disk
immediately) and/or that libecl is not threadsafe.
2018-03-21 10:31:15 +01:00
Andreas Lauser
ddb6ef2acb generalize the tasklet mechanism to an arbitrary number of worker threads
this has been quite a bit more complicated than I initially thought.
2018-03-15 11:05:10 +01:00
Andreas Lauser
b39b60109d cosmetic changes to EclWriter
this commit does not do any logic changes, just identation, variable
names, etc.
2018-03-12 16:51:30 +01:00
Andreas Lauser
8f61fe03fa switch the EclWriter to the new tasklet infrastructure 2018-03-12 16:51:30 +01:00
Andreas Lauser
7b56e9e9df clean up the determination of the directory for output
this should be done by the vanguard, not by the problem!
2018-03-12 16:51:30 +01:00
Andreas Lauser
5f8fdb2324 make all headers fully autonomous again 2018-03-12 14:31:37 +01:00
Kai Bao
f071c4c647 changing the PVTO in test_ecl_output
to make the table passing the sanity check.
2018-03-08 09:54:08 +01:00
Arne Morten Kvarving
397c69dded Merge pull request #293 from akva2/adjust_ecl
adjustments for eclipse support in opm-common
2018-03-06 15:34:52 +01:00
Arne Morten Kvarving
a1601afd21 adjustments for eclipse support in opm-common 2018-03-06 09:09:17 +01:00
Tor Harald Sandve
6a1f7c8006 BUGfix enableEclOutput false 2018-03-05 14:56:48 +01:00
Andreas Lauser
21cce7514e fix a few "unused variable" warnings that occur on more uncommon compilers
i.e. on ICC. the compiler is right in producing warnings here, though.
2018-03-03 13:27:48 +01:00
Atgeirr Flø Rasmussen
aaf885098d Merge pull request #288 from totto82/fix_restart_norne
Fix restart norne
2018-02-21 11:32:55 +01:00
Tor Harald Sandve
d15a86b039 clean up 2018-02-21 10:41:27 +01:00
Tor Harald Sandve
9372f9d2ca Make sure the updateMaxOilSaturation_ is called
The order of operation is left-to-right.
2018-02-21 10:38:52 +01:00
Tor Harald Sandve
44ab370fae Make the restart code more robust.
Don't assume all needed data is given in the restart file.
i.e. make it possible to run a solvent restart run from a standard
blackoil run.
2018-02-21 10:38:52 +01:00
Tor Harald Sandve
f90e074947 Demand the hystereris values if enalbed. 2018-02-21 10:38:52 +01:00
Tor Harald Sandve
b89a960a50 Fix bug in setting the max oil saturation after restart 2018-02-21 10:38:52 +01:00
Joakim Hove
b6e8e9c6fb Rename test-deck to get consistent case 2018-02-20 14:34:31 +01:00
Atgeirr Flø Rasmussen
875aafe0f9 Merge pull request #289 from totto82/fix_default_output_dir
Fix default output directory
2018-02-19 17:04:41 +01:00
Tor Harald Sandve
afe26e8f12 Split the PackUnPack class
into PackUnPackBlockData, PackUnPackCellData and PackUnPackWellData
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
998a6339cb Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
3ede6ecc69 Rename ThreadHandle.hpp -> threadHandle.hh
Also adding some comments.
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
76edfa7789 clean up after rebase 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
932527d772 Pass RFT output via data::well
With this no cell data is used by the output code in opm-output
2018-02-19 13:18:56 +01:00
Tor Harald Sandve
bbe2ae4a7b fix rebase failure 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
56bcb419fb Add async output 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
27beb2faec Fix default output directory
Get default ecl output directory from IOConfig.
2018-02-19 13:16:49 +01:00
Atgeirr Flø Rasmussen
39793ec932 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Andreas Lauser
436c9f8791 rename the "grid manager" to "vanguard"
IMO the term "vanguard" expresses better what these classes are
supposed to do: level the ground for the cavalry. Normally this simply
means to create and distribute a grid object, but it can become quite
a bit more complicated, as exemplified by the vanguard classes of
ebos..
2018-02-08 16:26:58 +01:00
Andreas Lauser
61461dd61c Merge pull request #282 from andlaus/separate_opm-common_concerns
adapt to the move of code from opm-common to opm-material
2018-02-08 16:25:10 +01:00
Kai Bao
2c298b2b99 removing the completions after createGrid in eclbasegridmanager 2018-02-08 14:28:20 +01:00
Andreas Lauser
260d62c2b8 adapt to the move of code from opm-common to opm-material 2018-02-08 12:11:20 +01:00
Tor Harald Sandve
d3cb81a7ba Minor clean-up based on review 2018-02-05 14:24:11 +01:00
Tor Harald Sandve
154e4fd97a Obey the input given by the deck.
Don't try to make the initial condition consistent for explicitly given
initial values.
2018-02-05 14:24:11 +01:00
Tor Harald Sandve
fb27ebd4eb Add output of temperature 2018-02-05 14:24:11 +01:00