From 11b2b04b392ab68814c07f19d4760d4ff913b0f9 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 28 Apr 2021 08:47:35 +0200
Subject: [PATCH] MSC_ROOT and MSC_VERSION have no meaning anymore

DAMASK_grid/mesh use 4 threads per default (hard coded in
parallelization.f90). It's the user's responsibility to use a different
value for OMP_NUM_THREADS
---
 env/DAMASK.sh  | 7 ++-----
 env/DAMASK.zsh | 9 ++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/env/DAMASK.sh b/env/DAMASK.sh
index edf019921..335fb4a6b 100644
--- a/env/DAMASK.sh
+++ b/env/DAMASK.sh
@@ -30,7 +30,6 @@ PATH=${DAMASK_ROOT}/bin:$PATH
 SOLVER=$(type -p DAMASK_grid || true 2>/dev/null)
 [ "x$SOLVER" == "x" ] && SOLVER=$(blink 'Not found!')
 
-[ "x$OMP_NUM_THREADS" == "x" ] && OMP_NUM_THREADS=1
 
 # currently, there is no information that unlimited stack size causes problems
 # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it
@@ -55,10 +54,8 @@ if [ ! -z "$PS1" ]; then
     [[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \
     || echo "               ~~> "$(canonicalPath "$PETSC_DIR")
   fi
-  echo -n "MSC.Marc/Mentat    "
-  [ -d $MSC_ROOT ] && echo $MSC_ROOT || blink $MSC_ROOT
-  echo
-  echo "Multithreading     OMP_NUM_THREADS=$OMP_NUM_THREADS"
+  [ "x$PETSC_ARCH" != "x" ] && echo "PETSc architecture $PETSC_ARCH"
+  [ "x$OMP_NUM_THREADS" != "x" ] && echo "Multithreading     OMP_NUM_THREADS=$OMP_NUM_THREADS"
   echo -n "heap  size         "
    [[ "$(ulimit -d)" == "unlimited" ]] \
    && echo "unlimited" \
diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh
index 07064eb7a..c4c7b705c 100644
--- a/env/DAMASK.zsh
+++ b/env/DAMASK.zsh
@@ -20,7 +20,6 @@ PATH=${DAMASK_ROOT}/bin:$PATH
 SOLVER=$(which DAMASK_grid || true 2>/dev/null)
 [[ "x$SOLVER" == "x" ]] && SOLVER=$(blink 'Not found!')
 
-[[ "x$OMP_NUM_THREADS" == "x" ]] && OMP_NUM_THREADS=1
 
 # currently, there is no information that unlimited stack size causes problems
 # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it
@@ -45,12 +44,8 @@ if [ ! -z "$PS1" ]; then
     [[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \
     || echo "               ~~> "$(canonicalPath "$PETSC_DIR")
   fi
-  [[ "x$PETSC_ARCH" == "x" ]] \
-  || echo "PETSc architecture $PETSC_ARCH"
-  echo -n "MSC.Marc/Mentat    "
-  [ -d $MSC_ROOT ] && echo $MSC_ROOT || blink $MSC_ROOT
-  echo
-  echo "Multithreading     OMP_NUM_THREADS=$OMP_NUM_THREADS"
+  [[ "x$PETSC_ARCH" != "x" ]] && echo "PETSc architecture $PETSC_ARCH"
+  [[ "x$OMP_NUM_THREADS" != "x" ]] && echo "Multithreading     OMP_NUM_THREADS=$OMP_NUM_THREADS"
   echo -n "heap  size         "
    [[ "$(ulimit -d)" == "unlimited" ]] \
    && echo "unlimited" \