Skip to content

Commit

Permalink
Merge branch 'develop' Fix issue #9
Browse files Browse the repository at this point in the history
  • Loading branch information
gdolle committed Mar 11, 2016
2 parents 9ff9a98 + 24d924d commit 05a70ca
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 125 deletions.
File renamed without changes.
File renamed without changes.
66 changes: 66 additions & 0 deletions etc/feelpprc.d/backup/hpc-login.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
################################################################################
# Author(s): Guillaume dollé <gdolle@math.unistra.fr>
# Machine: Mesocentre Strasbourg
################################################################################

#------------------------------------------------------------------------------
# CUSTOM PATH
#------------------------------------------------------------------------------

# Default feel++ local install
export FEELPP_SHARE_PATH=/usr/local/feelpp

# Default feel++ module path.
#export FEELPP_MODULE_PATH=/usr/local/feelpp/config/modules

# Custom feel++ modules
export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/files/$FEELPP_HPCNAME
export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/profiles/$FEELPP_HPCNAME

# Compilers
export FEELPP_CLANG33_PATH=$FEELPP_SHARE_PATH/clang-3.3
export FEELPP_CLANG34_PATH=$FEELPP_SHARE_PATH/clang-3.4
export FEELPP_CLANG35_PATH=$FEELPP_SHARE_PATH/clang-3.5
export FEELPP_GCC463_PATH=$FEELPP_SHARE_PATH/gcc-3.6.3
export FEELPP_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2
export FEELPP_GCC473_PATH=$FEELPP_SHARE_PATH/gcc-4.7.3
export FEELPP_GCC481_PATH=$FEELPP_SHARE_PATH/gcc-4.8.1
export FEELPP_CMAKE28_PATH=$FEELPP_SHARE_PATH/cmake
export FEELPP_CMAKE302_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/cmake-3.0.2

# Libraries
export FEELPP_LIBSTCPPV3_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2
export FEELPP_BOOST149_AUTOCC_PATH=$FEELPP_SHARE_PATH/boost
export FEELPP_BOOST149_GCC472_PATH=$FEELPP_SHARE_PATH/boost/gcc-4.7.2
export FEELPP_BOOST154_GCC463_PATH=$FEELPP_SHARE_PATH/boost/1.54
export FEELPP_BOOST155_PATH=$FEELPP_SHARE_PATH/boost/1.55
export FEELPP_BOOST156_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56
export FEELPP_PETSC33_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.3
export FEELPP_PETSC342_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.4.2
export FEELPP_PETSC351_OMPI163_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.5.1
export FEELPP_PETSC351_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/petsc-3.5.1
export FEELPP_SLEPC342_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.4.2
export FEELPP_SLEPC350_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.5.0
export FEELPP_SLEPC351_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/slepc-3.5.1
export FEELPP_HDF51813_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13

# Mpi
export FEELPP_OPENMPI163_AUTOCC_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3
export FEELPP_OPENMPI163_GCC472_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3/gcc-4.7.2
export FEELPP_OPENMPI181_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.1
export FEELPP_OPENMPI182_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.2
export FEELPP_OPENMPI183_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/openmpi-1.8.3

# Science
export FEELPP_GMSH261_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.6.1
export FEELPP_GMSH282_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.8.2
export FEELPP_GMSH285_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/gmsh-2.8.5

# Tools
export FEELPP_PARAVIEW420_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/ParaView-v4.2.0

#------------------------------------------------------------------------------
# CUSTOM COMMANDS
#------------------------------------------------------------------------------

module load batch/slurm
File renamed without changes.
88 changes: 22 additions & 66 deletions etc/feelpprc.d/hpc-login.sh
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,66 +1,22 @@
################################################################################
# Author(s): Guillaume dollé <gdolle@math.unistra.fr>
# Machine: Mesocentre Strasbourg
################################################################################

#------------------------------------------------------------------------------
# CUSTOM PATH
#------------------------------------------------------------------------------

# Default feel++ local install
export FEELPP_SHARE_PATH=/usr/local/feelpp

# Default feel++ module path.
#export FEELPP_MODULE_PATH=/usr/local/feelpp/config/modules

# Custom feel++ modules
export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/files/$FEELPP_HPCNAME
export MODULEPATH=$MODULEPATH:$FEELPP_MODULE_PATH/profiles/$FEELPP_HPCNAME

# Compilers
export FEELPP_CLANG33_PATH=$FEELPP_SHARE_PATH/clang-3.3
export FEELPP_CLANG34_PATH=$FEELPP_SHARE_PATH/clang-3.4
export FEELPP_CLANG35_PATH=$FEELPP_SHARE_PATH/clang-3.5
export FEELPP_GCC463_PATH=$FEELPP_SHARE_PATH/gcc-3.6.3
export FEELPP_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2
export FEELPP_GCC473_PATH=$FEELPP_SHARE_PATH/gcc-4.7.3
export FEELPP_GCC481_PATH=$FEELPP_SHARE_PATH/gcc-4.8.1
export FEELPP_CMAKE28_PATH=$FEELPP_SHARE_PATH/cmake
export FEELPP_CMAKE302_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/cmake-3.0.2

# Libraries
export FEELPP_LIBSTCPPV3_GCC472_PATH=$FEELPP_SHARE_PATH/gcc-4.7.2
export FEELPP_BOOST149_AUTOCC_PATH=$FEELPP_SHARE_PATH/boost
export FEELPP_BOOST149_GCC472_PATH=$FEELPP_SHARE_PATH/boost/gcc-4.7.2
export FEELPP_BOOST154_GCC463_PATH=$FEELPP_SHARE_PATH/boost/1.54
export FEELPP_BOOST155_PATH=$FEELPP_SHARE_PATH/boost/1.55
export FEELPP_BOOST156_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56
export FEELPP_PETSC33_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.3
export FEELPP_PETSC342_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.4.2
export FEELPP_PETSC351_OMPI163_GCC_PATH=$FEELPP_SHARE_PATH/petsc/3.5.1
export FEELPP_PETSC351_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/petsc-3.5.1
export FEELPP_SLEPC342_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.4.2
export FEELPP_SLEPC350_GCC_PATH=$FEELPP_SHARE_PATH/slepc/3.5.0
export FEELPP_SLEPC351_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/slepc-3.5.1
export FEELPP_HDF51813_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13

# Mpi
export FEELPP_OPENMPI163_AUTOCC_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3
export FEELPP_OPENMPI163_GCC472_PATH=$FEELPP_SHARE_PATH/openmpi/1.6.3/gcc-4.7.2
export FEELPP_OPENMPI181_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.1
export FEELPP_OPENMPI182_PATH=$FEELPP_SHARE_PATH/openmpi/1.8.2
export FEELPP_OPENMPI183_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/openmpi-1.8.3

# Science
export FEELPP_GMSH261_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.6.1
export FEELPP_GMSH282_GCC_PATH=$FEELPP_SHARE_PATH/gmsh/2.8.2
export FEELPP_GMSH285_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/gmsh-2.8.5

# Tools
export FEELPP_PARAVIEW420_GCC_PATH=$FEELPP_SHARE_PATH/install/with-gcc-4.8.1/with-openmpi-1.8.3/ParaView-v4.2.0

#------------------------------------------------------------------------------
# CUSTOM COMMANDS
#------------------------------------------------------------------------------

module load batch/slurm
FEELPP_CLANG33_PATH=/usr/local/feelpp/clang-3.3
FEELPP_CLANG34_PATH=/usr/local/feelpp/clang-3.4
FEELPP_CLANG35_PATH=/usr/local/feelpp/clang-3.5
FEELPP_GCC463_PATH=/usr/local/feelpp/gcc-4.6.3
FEELPP_GCC472_PATH=/usr/local/feelpp/gcc-4.7.2
FEELPP_GCC473_PATH=/usr/local/feelpp/gcc-4.7.3
FEELPP_GCC481_PATH=/usr/local/feelpp/gcc-4.8.1
FEELPP_BOOST155_PATH=/usr/local/feelpp/boost/1.55
FEELPP_BOOST156_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/with-openmpi-1.8.3/boost-1.56
FEELPP_HDF51813_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/with-openmpi-1.8.3/hdf5-1.8.13
FEELPP_LIBSTDC++V3_GCC472_PATH=/usr/local/feelpp/gcc-4.7.2
FEELPP_PETSC342_PATH=/usr/local/feelpp/petsc/3.4.2
FEELPP_PETSC351_PATH=/usr/local/feelpp/petsc/3.5.1
FEELPP_PETSC351_OMPI182_PATH=/usr/local/feelpp/petsc/3.5.1_ompi182
FEELPP_SLEPC342_PATH=/usr/local/feelpp/slepc/3.4.2
FEELPP_SLEPC351_PATH=/usr/local/feelpp/slepc/3.5.1
FEELPP_OPENMPI163_AUTOCC_PATH=/usr/local/feelpp/openmpi/1.6.3
FEELPP_OPENMPI163_GCC472_PATH=/usr/local/feelpp/openmpi/1.6.3/gcc-4.7.2
FEELPP_OPENMPI182_PATH=/usr/local/feelpp/openmpi/1.8.2
FEELPP_OPENMPI183_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/openmpi-1.8.3
FEELPP_GMSH285_PATH=/usr/local/feelpp/gmsh/2.8.5
FEELPP_CMAKE302_PATH=/usr/local/feelpp/install/with-gcc-4.8.1/cmake-3.0.2
59 changes: 0 additions & 59 deletions etc/feelpprc.d/template.sh

This file was deleted.

0 comments on commit 05a70ca

Please sign in to comment.