Changeset 210 for palm/trunk/SCRIPTS/mrun

Timestamp:

Nov 6, 2008 8:54:02 AM (16 years ago)

Author:

raasch

Message:

updates in dvr routines for new dvr version

File:

• palm/trunk/SCRIPTS/mrun (modified) (5 diffs)

palm/trunk/SCRIPTS/mrun

@@ -154 +154 @@
      # 08/08/08 - Marcus - typo removed in lcxt4 branch
      # 17/09/08 - Siggi  - restart mechanism adjusted for lcsgi
-     # 02/10/09 - BjornM - argument "-Y" modified, adjustments for coupled runs
+     # 02/10/08 - BjornM - argument "-Y" modified, adjustments for coupled runs
+     # 21/10/08 - Siggi  - bugfix for the case that -K has more than one
+     #                     argument
  
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -396 +398 @@
        (C)   restart_run=true; mc="$mc -C";;
        (d)   fname=$OPTARG; mc="$mc -d$OPTARG";;
-       (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D$OPTARG";;
+       (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D'$OPTARG'";;
        (F)   job_on_file="-D"; mc="$mc -F";;
        (g)   group_number=$OPTARG; mc="$mc -g$OPTARG";;
@@ -405 +407 @@
        (I)   ignore_archive_error=true; mc="$mc -I";;
        (k)   keep_data_from_previous_run=true; mc="$mc -k";;
-       (K)   additional_conditions="$OPTARG"; mc="$mc -K$OPTARG";;
+       (K)   additional_conditions="$OPTARG"; mc="$mc -K'$OPTARG'";;
        (m)   memory=$OPTARG; mc="$mc -m$OPTARG";;
        (M)   makefile=$OPTARG; mc="$mc -M$OPTARG";;
@@ -2320 +2322 @@
        then
           printf "      compiler is called via ssh on \"hicegate\" \n"
-          ssh  130.75.4.102  -l $usern  ". /usr/share/modules/init/bash; module load mpt; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" 2>&1 "
+          ssh  130.75.4.103  -l $usern  ". /usr/share/modules/init/bash; module load mpt; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" 2>&1 "
 #          ssh  130.75.4.102  -l $usern  ". /usr/share/modules/init/bash; module load mvapich2; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" 2>&1 "
 #          print  ". /usr/share/modules/init/bash; module load mpt; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" " | ssh  ${usern}@130.75.4.102  2>&1
@@ -2919 +2921 @@
 #                   export MV2_CPU_MAPPING=0:1:2:3
 #                   mpiexec    ./a.out  $ROPTS
+#                   export MPI_LAUNCH_TIMEOUT=360
                    mpiexec_mpt -np $ii   ./a.out  $ROPTS
                 elif [[ $host = lcxt4 ]]