If you set CMAKE_INSTALL_PREFIX, have the dependencies installed there, but
the source of them lying around in the parent directory of the build
directory, then the build will fail starting with opm-models because
we assume that ../opm-material is a build directory and set opm-material_DIR
to it. CMake will complain about not finding opm-material-config.cmake or
Opm-materialConfig.cmake. With this commit we will only set opm-material_DIR
if the directory contains a file CMakeCache.txt (which should be the case in
a configured build directory.
Directory outline of the failing situation is
- ${CMAKE_INSTALL_PREFIX} # where all dependencies are installed
- parent_dir
|____ opm-common #source dir
|____ opm-material #source dir
|____ ...
|____ build #build directory for current module (e.g. opm-modules)
Change is tested with sibling build
- build
|___ opm-common #build dir
|___ opm-material #build dir
|___ ...
and the dune version of it
- parent_dir
|___ opm-common # source dir
|____ build # build dir opm-common
|___ opm-material # source dir
|____ build # build dir opm-material
...
further changes to Actionx - restart
further changes for Actionx data to Restart file
additional changes to output Actionx data to Restart file
add test data for UDQ-ACTIONX
changes to add unit tests for InteHead - Actionx
Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file
changes to add ZLACT to restart output
Further changes - add ZACN - prelim
further changes to add ZACN to restart file
Additional changes to output IACN and SACN to restart
further changes to add IACN and SACN to the restart file
further changes to make unit tests for Actionx data / keywords
further changes to actionx restart and unit tests therefore
Added code for unit tests - not finished
some changes to correct for changes in upstream/master
changes correct errors in IACN and SACN
Initial work to add Actionx data to Eclipse compatible restart file
further changes to Actionx - restart
further changes for Actionx data to Restart file
additional changes to output Actionx data to Restart file
add test data for UDQ-ACTIONX
changes to add unit tests for InteHead - Actionx
Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file
changes to add ZLACT to restart output
Further changes - add ZACN - prelim
further changes to add ZACN to restart file
Additional changes to output IACN and SACN to restart
further changes to add IACN and SACN to the restart file
further changes to make unit tests for Actionx data / keywords
further changes to actionx restart and unit tests therefore
Added code for unit tests - not finished
some changes to correct for changes in upstream/master
changes correct errors in IACN and SACN
changes to avoid change in output data for restart file
further changes to avoid change in RESTART data
minor change to avoid data change in Restart file
This commit switches the 'test_Summary' unit test to use class ESmry
for inspecting the values output to disk by 'out::Summary'. As a
consequence, we are not able to verify units of measure for the
parameters, at least not for the time being. Moreover, class ESmry
exclusively uses the "i,j,k" sub-key for block-related parameters so
switch those to reference the IJK identifiers.
Finally, as class ESmry currently does not support reading separate
(multiple) summary files, switch the input decks to generate unified
output.
This commit switches a set of OPM-Common's unit tests away from
using direct calls to libecl functions and into using base types
from OPM-Common itself (along with Boost.Filesystem).
In particular summary related queries are replaced by calls to ESmry
member functions (wrapped in libecl-like interfaces to minimise code
changes). We disable checks on unit strings since ESmry currently
does not have a way of associating those with individual variables.
This commit takes a pass at the implementation files in opm-common
and removes references to libecl functions where practical. In
particular we switch to using types from C++'s standard library (and
Boost.Filesystem) to achieve the effects of the interfaces being
replaced.
We also insert direct calls to Posix function fnmatch() to preserve
existing pattern matching behaviour (well lists and well templates).
This commit introduces a new member function
int ESmry::miniStepIdxAtReportStep(rptStep)
which returns the zero-based ministep corresponding to the start of
the given report step (one-based indexing). This will simplify
decoupling a few unit tests from libecl.
- Main cmake based python installation is based on small script install.py and
not setup.py
- Python installation is guarded by cmake switch OPM_INSTALL_PYTHON
- Configure convenience shell script setup-install.sh for setup.py based
installation.
- Remove PYTHONPATH hacks from setup.py
