updated Marc/Mentat integration once more to minimze interference with original instal

added support for Marc2013, which is now default in apply_DAMASK_modifications
This commit is contained in:
Franz Roters 2013-07-24 08:41:58 +00:00
parent ebe8361af0
commit f896b4a01e
144 changed files with 63406 additions and 26925 deletions

View File

@ -8,7 +8,7 @@ bin_link = { \
], ],
} }
MarcReleases =[2010,2011,2012] MarcReleases =[2010,2011,2012,2013]
damaskEnv = damask.Environment('../../') # script location relative to root damaskEnv = damask.Environment('../../') # script location relative to root
baseDir = damaskEnv.relPath('code/') baseDir = damaskEnv.relPath('code/')

View File

@ -11,12 +11,16 @@ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include . $DIR/tools/include
DIRJOB=$2 DIRJOB=$2
cd $DIRJOB cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`" echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program" echo "program: $program"
$FORTRAN $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -38,6 +42,7 @@ echo "program: $program"
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for $usernoext.o on host `hostname`" echo "$0: link failed for $usernoext.o on host `hostname`"

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -11,12 +11,16 @@ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include . $DIR/tools/include
DIRJOB=$2 DIRJOB=$2
cd $DIRJOB cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`" echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program" echo "program: $program"
$FORTHIGH $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -38,6 +42,7 @@ echo "program: $program"
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for $usernoext.o on host `hostname`" echo "$0: link failed for $usernoext.o on host `hostname`"

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -25,13 +25,11 @@
# To check the mpi version, type: # To check the mpi version, type:
# mpirun -version # mpirun -version
# 2) Intel MPI 4.0.1.007 # 2) Intel MPI 4.0.1.007
# To check the mpi version, type: # To check the mpi version, type:
# mpirun -version # mpirun -version
# #
# MKL Libraries: # MKL Libraries:
# Intel(R) MKL 10.3.0.084 # Intel(R) MKL 10.3.0.084
# #
# To check the Compiler level, type using the compiler # To check the Compiler level, type using the compiler
# installation path: # installation path:
@ -148,8 +146,6 @@ then
export MPI_EPATH=$MARC_BIN export MPI_EPATH=$MARC_BIN
export LD_LIBRARY_PATH=$MPI_ROOT/lib/$ARCHITECTURE:$MARC_LIB:$MARC_LIB_SHARED:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=$MPI_ROOT/lib/$ARCHITECTURE:$MARC_LIB:$MARC_LIB_SHARED:$LD_LIBRARY_PATH
export MPIHPSPECIAL="-e MPI_FLAGS=E,T" export MPIHPSPECIAL="-e MPI_FLAGS=E,T"
export MPIHPSPECIAL="$MPIHPSPECIAL -e LD_LIBRARY_PATH=$LD_LIBRARY_PATH" export MPIHPSPECIAL="$MPIHPSPECIAL -e LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
export MPIHPSPECIAL="$MPIHPSPECIAL -e BINDIR=$MARC_BIN" export MPIHPSPECIAL="$MPIHPSPECIAL -e BINDIR=$MARC_BIN"
if test -n "$MSC_LICENSE_FILE" if test -n "$MSC_LICENSE_FILE"
@ -392,43 +388,66 @@ CCTHIGH_CASI="$CCHIGH -c99 $I8CASIDEFS"
#PROFILE="-Mprof=func,mpi" #PROFILE="-Mprof=func,mpi"
PROFILE= PROFILE=
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
if test "$MARCDEBUG" = "ON" if test "$MARCDEBUG" = "ON"
then then
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
fi fi
FORTLOWT="$FORTLOW" FORTLOWT="$FORTLOW"
@ -456,7 +475,6 @@ then
BCSFORT90HIGH=$BCSFORTLOW BCSFORT90HIGH=$BCSFORTLOW
fi fi
if test $MPITYPE != none if test $MPITYPE != none
then then
if test $MPITYPE = hpmpi if test $MPITYPE = hpmpi
@ -500,13 +518,6 @@ then
fi fi
XLIBS="-L/usr/X11/lib -lX11 " XLIBS="-L/usr/X11/lib -lX11 "
# #
@ -608,7 +619,6 @@ fi
SECLIBS="-L$MARC_LIB -llapi" SECLIBS="-L$MARC_LIB -llapi"
SOLVERLIBS="${BCSSOLVERLIBS} \ SOLVERLIBS="${BCSSOLVERLIBS} \
${INTELSOLVERLIBS} ${MUMPSSOLVERLIBS2} ${MF2SOLVERLIBS} \ ${INTELSOLVERLIBS} ${MUMPSSOLVERLIBS2} ${MF2SOLVERLIBS} \
-Wl,--start-group $MKLLIB $MARC_MKL/libmkl_intel_thread.a $MARC_MKL/libmkl_core.a -Wl,--end-group \ -Wl,--start-group $MKLLIB $MARC_MKL/libmkl_intel_thread.a $MARC_MKL/libmkl_core.a -Wl,--end-group \
$MARC_MKL/libguide.a \ $MARC_MKL/libguide.a \

View File

@ -2803,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3064,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3093,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3101,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3358,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3386,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

View File

@ -2803,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3064,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3093,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3101,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3358,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3386,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2803,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3064,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3093,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3101,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3358,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3386,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2803,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3064,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3093,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3101,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3358,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3386,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_h_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_hmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_mp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_l_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_lmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_hmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_h" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_mp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_lmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_l" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -1030,83 +1030,9 @@ popmenu damask {
border_color black border_color black
} }
label {
position -29 +6
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 4 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 4 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 5 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 5 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label { label {
position -32 +6 position -32 +6
size 12 6 size 12 6
text ""
border_width 1
border_color black
}
label {
position = +6
size 12 6
text "O2 / OpenMP" text "O2 / OpenMP"
border_width 1 border_width 1
border_color black border_color black
@ -1116,14 +1042,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 7 *monitor_job" command "*submit_job 4 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 7 *monitor_job" command "*execute_job 4 *monitor_job"
} }
label { label {
@ -1138,14 +1064,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 8 *monitor_job" command "*submit_job 5 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 8 *monitor_job" command "*execute_job 5 *monitor_job"
} }
label { label {
@ -1160,6 +1086,72 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label {
position -29 +8
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 7 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 7 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 8 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 8 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 9 *monitor_job" command "*submit_job 9 *monitor_job"
} }
@ -1170,14 +1162,6 @@ popmenu damask {
command "*execute_job 9 *monitor_job" command "*execute_job 9 *monitor_job"
} }
label {
position -32 +6
size 12 6
text ""
border_width 1
border_color black
}
popdown { popdown {
position 19 +8 position 19 +8
size 12 8 size 12 8
@ -1186,6 +1170,7 @@ popmenu damask {
} }
window { window {
parent mentat parent mentat
origin 38 8 origin 38 8

View File

@ -11,12 +11,16 @@ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include . $DIR/tools/include
DIRJOB=$2 DIRJOB=$2
cd $DIRJOB cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`" echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program" echo "program: $program"
$FORTHIGHMP $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -38,6 +42,7 @@ echo "program: $program"
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for $usernoext.o on host `hostname`" echo "$0: link failed for $usernoext.o on host `hostname`"

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -11,12 +11,16 @@ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90` usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include . $DIR/tools/include
DIRJOB=$2 DIRJOB=$2
cd $DIRJOB cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`" echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program" echo "program: $program"
$FORTLOW $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -38,6 +42,7 @@ echo "program: $program"
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for $usernoext.o on host `hostname`" echo "$0: link failed for $usernoext.o on host `hostname`"

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRAN $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -363,43 +363,66 @@ CCTHIGH_CASI="$CCHIGH -c99 $I8CASIDEFS"
#PROFILE="-Mprof=func,mpi" #PROFILE="-Mprof=func,mpi"
PROFILE= PROFILE=
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
if test "$MARCDEBUG" = "ON" if test "$MARCDEBUG" = "ON"
then then
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2010 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
fi fi
FORTLOWT="$FORTLOW" FORTLOWT="$FORTLOW"

View File

@ -2739,14 +2739,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -2999,7 +2999,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3028,7 +3028,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3036,7 +3036,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3292,7 +3292,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3320,14 +3320,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

View File

@ -1820,7 +1820,6 @@ fi
# add BLAS options for linking # add BLAS options for linking
BLAS="%BLAS%" BLAS="%BLAS%"
if test "$user" if test "$user"
then then
program=$usernoext.marc program=$usernoext.marc
@ -2739,14 +2738,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -2999,7 +2998,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3028,7 +3027,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3036,7 +3035,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3292,7 +3291,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3320,14 +3319,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2739,14 +2739,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -2999,7 +2999,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3028,7 +3028,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3036,7 +3036,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3292,7 +3292,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3320,14 +3320,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -1820,7 +1820,6 @@ fi
# add BLAS options for linking # add BLAS options for linking
BLAS="%BLAS%" BLAS="%BLAS%"
if test "$user" if test "$user"
then then
program=$usernoext.marc program=$usernoext.marc
@ -2739,14 +2738,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTRAN $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTRAN $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -2999,7 +2998,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3028,7 +3027,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTRAN $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3036,7 +3035,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTRAN $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3292,7 +3291,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3320,14 +3319,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTRAN $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTRAN $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_h_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_hmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_mp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_l_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_lmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_hmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_h" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_mp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_lmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_l" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -1028,83 +1028,9 @@ popmenu damask {
border_color black border_color black
} }
label {
position -29 +6
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 4 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 4 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 5 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 5 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label { label {
position -32 +6 position -32 +6
size 12 6 size 12 6
text ""
border_width 1
border_color black
}
label {
position = +6
size 12 6
text "O2 / OpenMP" text "O2 / OpenMP"
border_width 1 border_width 1
border_color black border_color black
@ -1114,14 +1040,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 7 *monitor_job" command "*submit_job 4 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 7 *monitor_job" command "*execute_job 4 *monitor_job"
} }
label { label {
@ -1136,14 +1062,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 8 *monitor_job" command "*submit_job 5 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 8 *monitor_job" command "*execute_job 5 *monitor_job"
} }
label { label {
@ -1158,6 +1084,72 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label {
position -29 +8
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 7 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 7 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 8 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 8 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 9 *monitor_job" command "*submit_job 9 *monitor_job"
} }
@ -1168,14 +1160,6 @@ popmenu damask {
command "*execute_job 9 *monitor_job" command "*execute_job 9 *monitor_job"
} }
label {
position -32 +6
size 12 6
text ""
border_width 1
border_color black
}
popdown { popdown {
position 19 +8 position 19 +8
size 12 8 size 12 8
@ -1184,6 +1168,7 @@ popmenu damask {
} }
window { window {
parent mentat parent mentat
origin 38 8 origin 38 8

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRAN $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTLOW $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRAN $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTLOW $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -388,43 +388,66 @@ CCTHIGH_CASI="$CCHIGH -c99 $I8CASIDEFS"
#PROFILE="-Mprof=func,mpi" #PROFILE="-Mprof=func,mpi"
PROFILE= PROFILE=
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
if test "$MARCDEBUG" = "ON" if test "$MARCDEBUG" = "ON"
then then
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2011 -openmp -openmp_report2 \
-I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
fi fi
FORTLOWT="$FORTLOW" FORTLOWT="$FORTLOW"

View File

@ -2802,14 +2802,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3063,7 +3063,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3092,7 +3092,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3100,7 +3100,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3357,7 +3357,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3385,14 +3385,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

View File

@ -1859,6 +1859,7 @@ fi
# add BLAS options for linking # add BLAS options for linking
BLAS="%BLAS%" BLAS="%BLAS%"
if test "$user" if test "$user"
then then
program=$usernoext.marc program=$usernoext.marc
@ -2802,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3063,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3092,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3100,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3357,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3385,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2802,14 +2802,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3063,7 +3063,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3092,7 +3092,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3100,7 +3100,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3357,7 +3357,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3385,14 +3385,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2803,14 +2803,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3064,7 +3064,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3093,7 +3093,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3101,7 +3101,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3358,7 +3358,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3386,14 +3386,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_h_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_hmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_l_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_lmp" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_hmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_h" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_mp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -149,7 +149,7 @@ rm -f $job.log
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
"${DIR}/tools/run_lmp_marc" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \ "${DIR}/tools/run_damask_l" $slv -j $job -v n -b y $nprocds $nprocd -autorst $autorst \
$srcfile $restart $postfile $viewfactorsfile $hostfile \ $srcfile $restart $postfile $viewfactorsfile $hostfile \
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \ $compat $copy_datfile $copy_postfile $scr_dir $dcoup \
$nthread $nsolver $mode > /dev/null 2>&1 $nthread $nsolver $mode > /dev/null 2>&1

View File

@ -1107,83 +1107,9 @@ popmenu damask {
border_color black border_color black
} }
label {
position -29 +6
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 4 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 4 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 5 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 5 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label { label {
position -32 +6 position -32 +6
size 12 6 size 12 6
text ""
border_width 1
border_color black
}
label {
position = +6
size 12 6
text "O2 / OpenMP" text "O2 / OpenMP"
border_width 1 border_width 1
border_color black border_color black
@ -1193,14 +1119,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 7 *monitor_job" command "*submit_job 4 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 7 *monitor_job" command "*execute_job 4 *monitor_job"
} }
label { label {
@ -1215,14 +1141,14 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 8 *monitor_job" command "*submit_job 5 *monitor_job"
} }
popdown { popdown {
position +20 = position +20 =
size 20 6 size 20 6
text "Execute" text "Execute"
command "*execute_job 8 *monitor_job" command "*execute_job 5 *monitor_job"
} }
label { label {
@ -1237,6 +1163,72 @@ popmenu damask {
position +12 = position +12 =
size 20 6 size 20 6
text "Submit" text "Submit"
command "*submit_job 6 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 6 *monitor_job"
}
label {
position -29 +8
size 9 6
text "O2"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 7 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 7 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O1"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 8 *monitor_job"
}
popdown {
position +20 =
size 20 6
text "Execute"
command "*execute_job 8 *monitor_job"
}
label {
position -29 +6
size 9 6
text "O0"
border_width 1
border_color black
}
popdown {
position +9 =
size 20 6
text "Submit"
command "*submit_job 9 *monitor_job" command "*submit_job 9 *monitor_job"
} }
@ -1247,14 +1239,6 @@ popmenu damask {
command "*execute_job 9 *monitor_job" command "*execute_job 9 *monitor_job"
} }
label {
position -32 +6
size 12 6
text ""
border_width 1
border_color black
}
popdown { popdown {
position 19 +8 position 19 +8
size 12 8 size 12 8
@ -1263,6 +1247,7 @@ popmenu damask {
} }
window { window {
parent mentat parent mentat
origin 38 8 origin 38 8

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRAN $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTLOW $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRANLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -0,0 +1,52 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
# add BLAS options for linking
BLAS="%BLAS%"
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$DFORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$BLAS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRAN $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGH $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTHIGHMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTLOW $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRANLOWMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -1,47 +0,0 @@
#!/bin/ksh
# 1st arg: $DIR
# 2nd arg: $DIRJOB
# 3rd arg: $user
# 4th arg: $program
DIR=$1
user=$3
program=$4
usernoext=$user
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .for`
usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f90`
. $DIR/tools/include
DIRJOB=$2
cd $DIRJOB
echo "Compiling and linking user subroutine $user on host `hostname`"
echo "program: $program"
$FORTRANMP $user || \
{
echo "$0: compile failed for $user"
exit 1
}
/bin/rm $program 2>/dev/null
userobj=$usernoext.o
$LOAD ${program} $DIR/lib/main.o\
$DIR/lib/blkdta.o $DIR/lib/comm?.o \
${userobj-} \
$DIR/lib/srclib.a \
$MNFLIBS \
$MDUSER \
../lib/mdsrc.a \
../lib/mcvfit.a \
$STUBS \
${SOLVERLIBS} \
$TKLIBS \
$MRCLIBS \
$METISLIBS \
$SYSLIBS || \
{
echo "$0: link failed for $usernoext.o on host `hostname`"
exit 1
}
/bin/rm $userobj
/bin/rm $DIRJOB/*.mod

View File

@ -382,43 +382,65 @@ CCTHIGH_CASI="$CCHIGH -c99 $I8CASIDEFS"
#PROFILE="-Mprof=func,mpi" #PROFILE="-Mprof=func,mpi"
PROFILE= PROFILE=
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
if test "$MARCDEBUG" = "ON" if test "$MARCDEBUG" = "ON"
then then
FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-openmp -openmp_report2 \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
-openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" # DAMASK compiler calls: additional flags are in line 2; removed -save for calls with openMP
FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-openmp -openmp_report2 \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" DFORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2012 -openmp -openmp_report2 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
fi fi
FORTLOWT="$FORTLOW" FORTLOWT="$FORTLOW"

View File

@ -2865,14 +2865,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3127,7 +3127,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3156,7 +3156,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3164,7 +3164,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3422,7 +3422,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_l $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3450,14 +3450,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOW $user || \ $DFORTRAN $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOW $user -o $userobj || \ $DFORTRAN $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

View File

@ -2865,14 +2865,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3127,7 +3127,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3156,7 +3156,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3164,7 +3164,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3422,7 +3422,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_lmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_h $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3450,14 +3450,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTLOWMP $user || \ $DFORTHIGH $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTLOWMP $user -o $userobj || \ $DFORTHIGH $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2865,14 +2865,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3127,7 +3127,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3156,7 +3156,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3164,7 +3164,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3422,7 +3422,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_hmp $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_l $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3450,14 +3450,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGHMP $user || \ $DFORTLOW $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGHMP $user -o $userobj || \ $DFORTLOW $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

View File

@ -2865,14 +2865,14 @@ then
then then
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
@ -3127,7 +3127,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3156,7 +3156,7 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3164,7 +3164,7 @@ then
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
echo " $PRODUCT Exit number 3" echo " $PRODUCT Exit number 3"
@ -3422,7 +3422,7 @@ then
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
$RSH $i $DIR2/tools/comp_user_h $DIR2 $DIR1 $remoteuser $remoteprog $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -3450,14 +3450,14 @@ then
userobj=$usernoext.o userobj=$usernoext.o
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
$FORTHIGH $user || \ $DFORTRANMP $user || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1
} }
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
$FORTHIGH $user -o $userobj || \ $DFORTRANMP $user -o $userobj || \
{ {
echo "$0: compile failed for $user" echo "$0: compile failed for $user"
exit 1 exit 1

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More