Skip to content

Commit

Permalink
trilinos install name changed
Browse files Browse the repository at this point in the history
  • Loading branch information
LutzGross committed Sep 19, 2024
1 parent dd96b4d commit 374dde9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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 <prefix>/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 <prefix>/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),
Expand Down
2 changes: 1 addition & 1 deletion tools/unittesting/debian_trilinos_py3
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 374dde9

Please sign in to comment.