diff --git a/SConstruct b/SConstruct index f2b561d8d2..be1bf77641 100644 --- a/SConstruct +++ b/SConstruct @@ -143,8 +143,8 @@ vars.AddVariables( ('trilinos_libs', 'Trilinos libraries to link with', []), PathVariable('trilinos_src', 'Top-level source directory for trilinos.', Dir('trilinos_source15').abspath, PathVariable.PathIsDir), PathVariable('trilinos_build', 'Top-level build directory for trilinos.', Dir('#/build_trilinos').abspath, PathVariable.PathIsDirCreate), - #PathVariable('trilinos_install', 'Top-level install directory for trilinos when built', Dir('#/lib/esys').abspath, PathVariable.PathIsDirCreate), - ('trilinos_install', 'path to install trilinos libs, default is /lib/esys', 'default'), + PathVariable('trilinos_install', 'Top-level install directory for trilinos when built', Dir('#/esys.trilinos').abspath, PathVariable.PathIsDirCreate), + #('trilinos_install', 'path to install trilinos libs, default is /lib/esys', 'default'), ('trilinos_make_sh', 'path to a shell script to run trilinos make.', 'default'), BoolVariable('visit', 'Enable the VisIt simulation interface', False), ('visit_prefix', 'Prefix/Paths to VisIt installation', default_prefix), diff --git a/tools/unittesting/debian_trilinos_py3 b/tools/unittesting/debian_trilinos_py3 index 55c33964b5..e01af8b796 100644 --- a/tools/unittesting/debian_trilinos_py3 +++ b/tools/unittesting/debian_trilinos_py3 @@ -19,7 +19,7 @@ RUN apt-get -y install python3-dev python3-numpy python3-pyproj python3-gdal pyt # build escript RUN git clone https://github.com/esys-escript/esys-escript.github.io --depth 1 . RUN scons options_file=scons/docker_testing.py launcher="mpirun %b" -j`nproc --ignore=1` build_full -ENV LD_LIBRARY_PATH=/home/escript_trilinos/lib:/home/lib:/usr/local/lib:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=/home/esys.trilinos/lib:/home/lib:/usr/local/lib:$LD_LIBRARY_PATH ENV PYTHONPATH=/home:$PYTHONPATH ENV PATH=/home/bin:$PATH # run testing