Commit Graph

872 Commits

Author SHA1 Message Date
Tor Harald Sandve
6d11c69121 Merge pull request #327 from andlaus/property_and_parameter_system_improvements
Some property- and parameter system improvements
2018-06-19 15:59:13 +02:00
Andreas Lauser
acc93ff6e7 do explicit put properties into the the Ewoms::Properties namespace anymore
instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
2018-06-15 20:22:07 +02:00
Andreas Lauser
1be1f15b47 parameter system: add support for positional parameters
further, this cleans up the code of the parameter system and the
startup routines a bit and finally, it adds positional parameters
support to ebos as well as brief descriptions to ebos and the lens
problem.
2018-06-14 11:13:30 +02:00
Joakim Hove
1f880346e9 Merge pull request #325 from joakim-hove/rename-completions
Rename Completions -> Connections
2018-06-12 13:24:02 +02:00
Joakim Hove
b9395e0291 Rename Completions -> Connections 2018-06-11 14:11:32 +02:00
Andreas Lauser
25e952fb49 tasklets test: guard against garbled output
Use a mutex to ensures that only a single prints at the same
time. this should prevent garbled terminal output and thus makes the
it much easier to read. on the flipside, some race conditions may go
unnoticed.
2018-04-23 13:24:59 +02:00
Andreas Lauser
5c9e20c00e tasklets: introduce the concept of "worker thread index"
if the current thread is not a worker thread, this returns -1.
2018-04-23 13:24:59 +02:00
Atgeirr Flø Rasmussen
de167b188b Merge pull request #312 from andlaus/tasklets_test
Fix undefined mutex unlocking behaviour, add unit test for tasklets
2018-04-23 13:05:17 +02:00
Andreas Lauser
2cb0176754 add an example for tasklets
it is IMO not good as a unit test because it does not excercise the
mechanism at all, but it shows how the mechanism is supposed to be
used.
2018-04-19 14:35:24 +02:00
Atgeirr Flø Rasmussen
1a1e164054 Merge pull request #303 from andlaus/disable_async_for_ecl_output_test
disable asynchronous output for the ECL output test
2018-03-21 14:23:02 +01:00
Andreas Lauser
7de09c08f2 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
e83cc94cea Merge pull request #299 from andlaus/tasklets
ECL output cleanup and tasklets
2018-03-13 12:15:46 +01:00
Andreas Lauser
e2241beef5 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
2031f8c438 Merge pull request #298 from andlaus/fix_dune_master
Fix dune master
2018-03-12 15:15:50 +01:00
Andreas Lauser
81bc44ec6d fix the build on the latest dune master
Dune::set_singularity_limit() was removed and the ILU preconditioners
seem to have been refactored. The ILU refactoring included making the
order of the preconditioner a template parameter of the preconditioner
class, i.e., it can no longer be specified at runtime.

Note that the AMG code in the dune master currently produces quite a
few warnings because of the latter point, but as far as I can see,
there is nothing which can be done about this from outside of
dune-istl.
2018-03-12 14:31:36 +01:00
Andreas Lauser
ea0c6eeec1 Merge pull request #296 from akva2/fix_conditions
fixed: fix some condition that was missed in eclipse io update
2018-03-08 11:05:19 +01:00
Kai Bao
ec6cf5c94b changing the PVTO in test_ecl_output
to make the table passing the sanity check.
2018-03-08 09:54:08 +01:00
Andreas Lauser
4f3c7fccb3 Merge pull request #292 from andlaus/fix_icc
fix a few "unused variable" warnings that occur on more uncommon compilers
2018-03-03 13:28:46 +01:00
Andreas Lauser
d8792f36a0 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
Joakim Hove
cc53ff6fd7 Merge pull request #290 from joakim-hove/test-deck-rename
Rename test-deck to get consistent case
2018-02-20 15:10:08 +01:00
Joakim Hove
e27a69a496 Rename test-deck to get consistent case 2018-02-20 14:34:31 +01:00
Atgeirr Flø Rasmussen
05d4986d7f Merge pull request #284 from totto82/MoveWell
Some more cleaning in the output code in opm-output, ewoms and opm-simulator
2018-02-19 15:05:28 +01:00
Tor Harald Sandve
c47dd68b1d Rename test_ecl_output.cpp -> test_ecl_output.cc 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
7884229085 Minor clean up 2018-02-19 13:18:56 +01:00
Tor Harald Sandve
042d288478 move Test 2018-02-19 13:18:56 +01:00
Arne Morten Kvarving
7d7c6bf46c Merge pull request #286 from atgeirr/adapt-to-opm-grid-moved-headers
Adapt to moved opm-grid headers.
2018-02-12 16:31:54 +01:00
Atgeirr Flø Rasmussen
672cfc3ca4 Adapt to moved opm-grid headers. 2018-02-12 10:20:09 +01:00
Andreas Lauser
eb6be94f7a Merge pull request #285 from andlaus/gridManager_to_vanguard
rename the "grid manager" to "vanguard"
2018-02-08 17:53:43 +01:00
Andreas Lauser
7afb963fdd change gridManager -> vanguard in new file test_ecl_output.cpp 2018-02-08 17:07:32 +01:00
Andreas Lauser
2f4b835a16 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
e5344a2add adapt to the move of code from opm-common to opm-material 2018-02-08 12:11:20 +01:00
Atgeirr Flø Rasmussen
23910186f8 Merge pull request #278 from totto82/RFIP
FluidInPlace, INIT and EGRID output to Ebos
2018-02-06 12:54:07 +01:00
Tor Harald Sandve
bad406b0a8 Add test for summary output
Test summary output of FIP, FPR and RPR.
2018-02-05 14:24:11 +01:00
Andreas Lauser
922036da89 Merge pull request #276 from andlaus/boundary_condition_refactoring
refactor the boundary condition handling slightly
2018-01-22 13:02:54 +01:00
Andreas Lauser
0406d6780f refactor the boundary condition handling slightly
instead of passing a "minimal" fluid state that defines the
thermodynamic conditions on the domain boundary and the models
calculating everything they need based on this, it is now assumed that
all quantities needed by the code that computes the boundary fluxes
are defined. This simplifies the boundary flux computation code, it
allows to get rid of the `paramCache` argument for these methods and
to potentially speed things up because quantities do not get
re-calculated unconditionally.

on the flipside, this requires slightly more effort to define the
conditions at the boundary on the problem level and it makes it less
obvious which quantities are actually used. That said, one now has the
freedom to shoot oneself into the foot more easily when specifying
boundary conditions and also tools like valgrind or ASAN will normally
complain about undefined quantities if this happens.
2018-01-22 12:21:35 +01:00
Tor Harald Sandve
46fc4b742b Add support for PBDV and PDDV in initstateequil.hh 2018-01-09 10:42:04 +01:00
Andreas Lauser
b8e714d60a Merge pull request #264 from andlaus/thermal_renames_and_fixes
consistently rename "heat conduction" to "thermal conduction" and use "solid energy" laws
2018-01-05 13:59:24 +01:00
Andreas Lauser
4f92ec5865 consistently rename "heat conduction" to "thermal conduction" and use "solid energy" laws
according to wikipedia the term "heat" is the energy transferred due
to a temperature gradient, i.e., it only makes sense if such a
gradient is present and this is not necessary for the storage term.

this means that technically the term "heat conductivity" is
meaningful, but "thermal conductivity" is IMO more consistent.

this has partially already been done in opm-material and eWoms it was
pretty inconsistent, so it also requires a patch in opm-material.
2018-01-04 15:27:02 +01:00
Andreas Lauser
f5cfd8f768 fix compiler warnings and errors on dune 2.6 2018-01-03 18:53:03 +01:00
Andreas Lauser
9955c6a6f5 add some reference solutions for the adaptive "finger" problem
for some reason, the results changed slightly, but they still look
good to me.
2018-01-03 18:53:03 +01:00
Andreas Lauser
ce6499a39b make the fracture problem compile again
it broke because of the recent refactoring of the energy material laws
in opm-material. The reason why nobody noticed is that this test
requires dune-alugrid to be compiled.
2018-01-03 18:53:03 +01:00
Andreas Lauser
5a3f25d120 make the equil test work in the presence of dune-fem 2018-01-03 18:53:03 +01:00
Atgeirr Flø Rasmussen
8c531632c0 Merge pull request #254 from andlaus/self-sustained_equil_init
Self sustained equil init
2018-01-03 14:09:13 +01:00
Andreas Lauser
adb2783a0c restore the hydrostatic equilibration test from opm-core
This involved quite a bit of kicking and screaming. The result
certainly is not pretty, but it works.
2018-01-03 12:28:12 +01:00
Andreas Lauser
c2e9a7a518 move the hydrostatic equilibrium code to its proper location and make it compile
this just moves the hydrostatic equilibrium code from its historc
location at opm/core to ebos/equil and adds minimal changes to make it
compile. this allows to clean up that code without disturbing the
legacy simulators.
2018-01-02 14:28:06 +01:00
Andreas Lauser
5e4dd59105 replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
2018-01-02 14:28:06 +01:00
Tor Harald Sandve
022f535508 Fix pvtIndex map for cases with non-active eqlnum regions. 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
54e751fe70 Adress PR review issues 2 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
da6c4bf0c4 Fix 2p bug 2018-01-02 14:28:06 +01:00
Tor Harald Sandve
1e10d25c24 Adress PR review issues 2018-01-02 14:28:06 +01:00