Commit c0a40317 authored by Christof Schulze's avatar Christof Schulze 😎 Committed by cschulze
Browse files

new deal.ii library version 8.5

fixes for hdf5 module file for deal.ii cmake compatibility

parent 4ab885e8
Loading
Loading
Loading
Loading
+47 −0
Original line number Diff line number Diff line
#%Module
#
# Deal.II 8.5.0
#
set     version      "8.5.0"

proc ModulesHelp { } {
        global version
        puts stderr "\tSets up the environment for the Debug version of Deal.II ($version) including the Trilinos solver.\n"
        puts stderr "\t- DEAL_II_DIR\t- the Deal.II directory\n"
        puts stderr "\t- DEAL_II_BIN\t- directory where executables can be found\n"
        puts stderr "\t- DEAL_II_LIB\t- directory containing the libraries\n"
        puts stderr "\t- DEAL_II_INC\t- directory containing the header files\n"

        puts stderr "\t- PATH\n"
        puts stderr "\t- LD_LIBRARY_PATH\n"

}

module-whatis   "sets up the environment for the Debug version of Deal.II $version"

prereq          mpi/openmpi-x86_64
conflict        intel
conflict	dealii
prereq          trilinos/12.10.1-deal85-mpi
prereq		p4est/2.0
prereq		petsc/3.7.6-lite

set                     pkghome        		/opt/apps/dealii/$version-tri-petsc-hdf5-mpi-dbg


setenv                  DEAL_II_DIR      	$pkghome
setenv                  DEAL_II_INC     	$pkghome/include
setenv                  DEAL_II_LIB     	$pkghome/lib
setenv                  DEAL_II_BIN     	$pkghome/bin
setenv			DEAL_II_VERSION		$version

prepend-path            PATH    		$pkghome/bin

prepend-path            LD_LIBRARY_PATH 	$pkghome/lib
#prepend-path           PYTHONPATH      	$pkghome/lib/python2.7/site-packages


unset           pkghome


#source $env(MODULESHOME)/modincludes/info_logging.tcl

dealii/85

0 → 100644
+13 −0
Original line number Diff line number Diff line
#%Module
#
# Deal.II 8.5.0
#
set     version      "8.5.0"

module load mpi/openmpi-x86_64
module load p4est/2.0
module load parmetis/4.0.3
module load petsc/3.7.6-lite
module load trilinos/12.10.1-deal85-mpi
module load hdf5/1.8.17-system-mpi
module load dealii/8.5.0-tri-petsc-hdf5-mpi-dbg
+7 −5
Original line number Diff line number Diff line
@@ -26,26 +26,28 @@ prereq mpi/openmpi-x86_64
#prereq		mpi

set 	        	pkghome		/usr
#set		      pkglibdir	/usr/lib64/openmpi/lib
set		        pkglibdir	$::env(MPI_LIB)
set			pkgincdir	$::env(MPI_INCLUDE)

setenv  HDF5_BASE       $pkghome
setenv  HDF5_LIBDIR     $pkglibdir
setenv  HDF5_LIB        "-L$pkglibdir -lhdf5_hl -lhdf5"
setenv  HDF5_INCDIR     $pkghome/include
setenv  HDF5_INC        "-I$pkghome/include"
setenv  HDF5_INCDIR     $pkgincdir
setenv	HDF5_INCLUDE_DIR   $pkgincdir
setenv  HDF5_INC        "-I$pkgincdir"
setenv  HDF5_F90_LIB    "-L$pkglibdir -lhdf5hl_fortran -lhdf5_fortran"

if { [ file exists $pkglibdir/libhdf5_cpp.so ] } {
  setenv       HDF5_CPP_LIB      "-L$pkglibdir -lhdf5_hl_cpp -lhdf5_cpp"
}
setenv	HDF5_VERSION	$version

# NO, Never add /usr/bin to path, will remove system env from PATH when unloaded
#prepend-path    PATH            $pkghome/bin
prepend-path    LD_LIBRARY_PATH $pkglibdir

unset        	pkghome
unset		pkglibdir
unset		pkgincdir

#set MSG ""
#source $env(MODULESHOME)/modincludes/info_logging.tcl