Index: palm/trunk/SCRIPTS/mrun
===================================================================
--- palm/trunk/SCRIPTS/mrun	(revision 82)
+++ palm/trunk/SCRIPTS/mrun	(revision 83)
@@ -252,5 +252,5 @@
     # FEHLERBEHANDLUNG
     # BEI EXIT:
- trap 'rm -rf  tmp_mrun
+ trap 'rm -rf  $working_directory/tmp_mrun
        if [[ $locat != localhost ]]
        then
@@ -318,5 +318,5 @@
 
     # BEI TERMINAL-BREAK:
- trap 'rm -rf  tmp_mrun
+ trap 'rm -rf  $working_directory/tmp_mrun
        [[ $tmpcreate = true ]]  &&  (cd; rm -rf $TEMPDIR)
        if [[ -f ~/job_queue/JOBINFO.$QSUB_REQID ]]
@@ -472,5 +472,5 @@
        HOSTNAME=`echo $line | cut -d" " -s -f2`
        host_identifier=`echo $line | cut -d" " -s -f3`
-       if [[ "$HOSTNAME" = $localhost_realname ]]
+       if [[ $localhost_realname = $HOSTNAME ]]
        then
           localhost=$host_identifier
@@ -547,6 +547,6 @@
         (ibm|ibmb|ibmh|ibms|ibmy|nech|neck|lctit|unics)  true;;
         (*)  printf "\n"
-             printf "\n  +++ execution host \"$host\" not admitted for MRUN,"
-             printf "\n      or NQS not available on execution host!"
+             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
+             printf "\n      is not available"
              locat=nqs; (( iec = 0 )); exit;;
     esac
@@ -665,5 +665,6 @@
                    case  $host  in
                        (ibm|ibms|ibmy|lctit|nech|neck|unics)  true;;
-                       (*)  printf "\n  +++ no queueing system available on execution host \"$host\""
+                       (*)  printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
+                            printf "\n      is not available"
                             locat=nqs; exit;;
                    esac
@@ -789,11 +790,4 @@
     export  interpreted_config_file=.icf.$RANDOM
 
-#    case  $localhost_realname  in
-#        (caurus|twister)      interpret_config.hp;;
-#        (bora|breva|elephanta|gallego|gregale|hababai|maestro|orkan|ostria)  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/muksoft/packages/intel_ifc/8.1/lib/; interpret_config_9.x;;
-#        (levanto|vorias)      export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/muksoft/packages/intel/ifort/9.1.037/lib/; interpret_config_9.x_levanto;;
-#        (quanero)             export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/intel_fc_80/lib; interpret_config_9.x;;
-#        (*)                   interpret_config.x;;
-#    esac
 
 
@@ -925,6 +919,6 @@
         (ibm|ibmb|ibmh|ibms|ibmy|lctit|nech|neck|unics)  true;;
         (*)  printf "\n"
-             printf "\n  +++ execution host \"$host\" not admitted for MRUN,"
-             printf "\n      or no queueing system available on execution host!"
+             printf "\n  +++ sorry: execution of batch jobs on remote host \"$host\""
+             printf "\n      is not available"
              locat=nqs; (( iec = 0 )); exit;;
     esac
@@ -1079,32 +1073,4 @@
 
 
-    # EVTL. NETCDF-UNTERSTUETZUNG SETZEN
-# case  $host  in
-#     (decalpha)   netcdf_support=true
-#                  netcdf_path=/usr/local/netcdf-3.5.1;;
-#     (ibmb|ibmh)  netcdf_support=true
-#                  netcdf_path=/aws/dataformats/netcdf-3.6.0-p1/64-32;;
-#     (ibms)       netcdf_support=true
-#                  netcdf_path=/applic/lib/NETCDF64;;
-#     (ibmy)       netcdf_support=true
-#                  netcdf_path=/usr1/users/raasch/pub/netcdf-3.6.0-p1;;
-#     (lcmuk)      if [[ $scirocco = true ]]
-#                  then
-#                     netcdf_path=/opt/netcdf/3.6.2-beta4
-#                  elif [[ $fimm = true ]]
-#                  then
-#                     netcdf_path=/local/netcdf
-#                  else
-#                     netcdf_path=/muksoft/packages/netcdf/linux
-#                  fi;;
-#     (lctit)      netcdf_support=true
-#                  netcdf_path=/home2/usr5/mkanda/netcdf-3.6.2;;
-#     (nech)       netcdf_support=true
-#                  netcdf_path=/pool/SX-6/netcdf/netcdf-3.6.0-p1;;
-#     (neck)       netcdf_support=true
-#                  netcdf_path=/home/DSRC/NC/tatuyama/pub/netcdf-3.6.0-p1;;
-# esac
-
-
     # VOLLSTAENDIGE DATEINAMEN DER INPUT-FILES BILDEN,
     # INPUT-DATEIEN AUF VORHANDENSEIN PRUEFEN UND EVTL. HOECHSTE ZYKLUSNUMMER
@@ -1337,4 +1303,22 @@
 
 
+     # DAS DVRP-PAKET ERFORDERT EINE ENTSPRECHENDE BIBLIOTHEK
+ if [[ $(echo $package_list | grep -c dvrp_graphics) != 0 ]]
+ then
+    if [[ "$dvrp_inc" = "" ]]
+    then
+       printf "\n\n  +++ no value for \"dvrp_inc\" given in configuration file"
+       printf "\n      This is required for the dvrp_graphics package.\n"
+       locat=dvrp; exit
+    fi
+    if [[ "$dvrp_lib" = "" ]]
+    then
+       printf "\n\n  +++ no value for \"dvrp_lib\" given in configuration file"
+       printf "\n      This is required for the dvrp_graphics package.\n"
+       locat=dvrp; exit
+    fi
+ fi
+
+
      # PRUEFEN, OB ENTWEDER HAUPTPROGRAMM ODER NUR EIN AUSFUEHRBARES
      # PROGRAMM VEREINBART WURDE (IN DIESEM FALL BRAUCHT IM WEITEREN NICHT
@@ -1652,4 +1636,5 @@
        # PRAEPROZESSOR-DIREKTIVEN ZUM SELEKTIVEN AUSWAEHLEN VON CODETEILEN
        # ZUSAMMENSETZEN
+       # DIREKTIVEN ZUM AKTIVIEREN VON RECHNERSPEZIFISCHEM CODE
     if [[ $(echo $localhost | cut -c1-3) = ibm ]]
     then
@@ -1664,26 +1649,16 @@
        cpp_options="$cpp_options -D__$localhost"
     fi
+
+       # DIREKTIVEN DIE DURCH OPTION -K BESTIMMT WERDEN (Z.B. PARALLEL)
     if [[ $(echo $localhost | cut -c1-3) = ibm ]]
     then
        [[ -n $cond1 ]]  &&  cpp_options="${cpp_options},-D__$cond1=__$cond1"
        [[ -n $cond2 ]]  &&  cpp_options="${cpp_options},-D__$cond2=__$cond2"
-#       if [[ $netcdf_support = true ]]
-#       then
-#          PPOPTS="$PPOPTS -Dnetcdf=netcdf"
-#          [[ $localhost != ibms ]]      &&  PPOPTS="$PPOPTS -Dnetcdf_64bit=netcdf_64bit"
-#       fi
-#       if [[ $localhost = ibmy ]]
-#       then
-#          PPOPTS="$PPOPTS -Dibmy_special=ibmy_special"
-#       fi
     else
        [[ -n $cond1 ]]  &&  cpp_options="$cpp_options -D__$cond1"
        [[ -n $cond2 ]]  &&  cpp_options="$cpp_options -D__$cond2"
-#       if [[ $netcdf_support = true ]]
-#       then
-#          PPOPTS="$PPOPTS -Dnetcdf"
-#          [[ $localhost != decalpha  &&  $localhost != lctit ]]  &&  PPOPTS="$PPOPTS -Dnetcdf_64bit"
-#       fi
-    fi
+    fi
+
+       # DIREKTIVEN DIE SOFTWAREPAKETE AKTIVIEREN (OPTION -p)
     if [[ -n $package_list ]]
     then
@@ -1710,4 +1685,6 @@
        done
     fi
+
+       # DIREKTIVEN DIE DURCH OPTION -D FESTGELEGT SIND
     if [[ -n $cpp_opts ]]
     then
@@ -1723,26 +1700,4 @@
     fi
 
-       # OPTION ZUM EINSCHALTEN DES PRAEPROZESSORS HINZUFUEGEN
-#    if [[ $host = decalpha ]]
-#    then
-#       C_PPOPTS="-cpp  -DMPI_REAL=MPI_DOUBLE_PRECISION -DMPI_2REAL=MPI_2DOUBLE_PRECISION $PPOPTS"
-#    elif [[ $(echo $host | cut -c1-3) = ibm ]]
-#    then
-#          # blanks in PPOPTS muessen durch "," ersetzt werden
-#       PPOPTS=`echo $PPOPTS | sed 's/ -/,-/g'`
-#       C_PPOPTS="-qsuffix=cpp=f90 -WF,-DMPI_REAL=MPI_DOUBLE_PRECISION,$PPOPTS"
-#    elif [[ $host = lcmuk ]]
-#    then
-#       C_PPOPTS="$PPOPTS -DMPI_REAL=MPI_DOUBLE_PRECISION -DMPI_2REAL=MPI_2DOUBLE_PRECISION"
-#    elif [[ $host = lctit ]]
-#    then
-#       C_PPOPTS="$PPOPTS -Mpreprocess -DMPI_REAL=MPI_DOUBLE_PRECISION -DMPI_2REAL=MPI_2DOUBLE_PRECISION"
-#    elif [[ $(echo $host | cut -c1-3) = nec ]]
-#    then
-#       C_PPOPTS="-Ep -DMPI_REAL=MPI_REAL8 -DMPI_2REAL=MPI_2REAL8 -DSCFFT=dzfft -DCSFFT=zdfft $PPOPTS"
-#    else
-#       C_PPOPTS="$PPOPTS"
-#    fi
-
  else
 
@@ -1778,20 +1733,4 @@
     locat=compiler_name; exit
 
-#    case  $localhost  in
-#        (unics)                                 compiler_name=f77;;
-#        (lctit)                                 if [[ "$cond1" = parallel  ||  "$cond2" = parallel ]]
-#                                                then
-#                                                   compiler_name=mpif90
-#                                                   echo ">>> compiler=mpif90"
-#                                                else
-#                                                   compiler_name=pgf95
-#                                                   echo ">>> compiler=pgf95"
-#                                                fi;;
-#        (nech)                                  compiler_name=sxmpif90;;
-#        (decalpha)                              compiler_name=f95;;
-#        (ibm|ibmb|ibmh|ibms|ibmy)               compiler_name=mpxlf95_r;;
-#        (*)      printf "\n  +++ unknown host name: $localhost \n";
-#                 locat=localhost; exit;;
-#    esac
  fi
 
@@ -1800,10 +1739,4 @@
  [[ $localhost = neck ]]  &&  compiler_name=mpif90
 
-
-
-    # PRAEPROZESSOR-PFAD BESTIMMEN
- case  $localhost  in
-     (decalpha|ibm|ibmb|ibmh|ibms|ibmy|unics)  praeproc=cpp;;
- esac
 
 
@@ -1861,65 +1794,4 @@
 
 
-    # BEI VERWENDUNG VON DVRP-SOFTWARE MUSS ENTSPECHENDE GRAFIK-BIBLIOTHEK
-    # MIT EINGEBUNDEN WERDEN
-# if [[ -n $package_list ]]
-# then
-#    if [[ $(echo $package_list | grep -c dvrp_graphics) != 0 ]]
-#    then
-#
-#          # DVRP-GRAFIK GIBT ES NUR AUF DER IBM AM HLRN, AUF NECH/NECK UND
-#          # DEM NOTEBOOK SCIROCCO
-#       if [[ $host != ibmh  &&  $host != nech  &&  $host != neck  &&  $host != lcmuk  &&  "$local_compile" != true ]]
-#       then
-#          printf "\n"
-#          printf "\n  +++ option -p with package \"dvrp_graphics\" only allowed on nech and ibmh"
-#          locat=parameter; exit
-#       fi
-#       if [[ $host = ibmh ]]
-#       then
-#          if [[ $cond1 = debug  ||  $cond2 = debug ]]
-#          then
-#             fopts="-I/home/h/hzazchmi/lib/debug  $fopts"
-#             lopts="$lopts -L/home/h/hzazchmi/lib/debug -lDVRP2 -lftp"
-#          else
-#             fopts="-I/home/h/nikevita/lib_stable/optimize  $fopts"
-#             lopts="$lopts -L/home/h/nikevita/lib_stable/optimize -lDVRP2 -lftp"
-#          fi
-#       elif [[ $host = nech ]]
-#       then
-#          fopts="-I/import/ds9b/ipf2/b/b323014/lib/optimize  $fopts"
-#          lopts="$lopts -L/import/ds9b/ipf2/b/b323014/lib/optimize -lDVRP2 -lftp"
-#       elif [[ $host = neck ]]
-#       then
-#          fopts="-I/home/DSRC/NC/tatuyama/pub/dvrp  $fopts"
-#          lopts="$lopts -L/home/DSRC/NC/tatuyama/pub/dvrp -lDVRP2 -lftp"
-#       elif [[ $host = lcmuk ]]
-#       then
-#          fopts="-I/usr/local/lib/dvrp/optimize  $fopts"
-#          lopts="$lopts -L/usr/local/lib/dvrp/optimize -lDVRP2 -lftp"
-#       fi
-#    fi
-# fi
-
-
-    # EVTL. EINBINDEN DER NETCDF-BIBLIOTHEK
-# if [[ $netcdf_support = true ]]
-# then
-#    case  $host  in
-#       (decalpha)   fopts="-I${netcdf_path}/include  $fopts"
-#                    lopts="$lopts -L${netcdf_path}/lib -lnetcdf";;
-#       (ibmb|ibmh)  fopts="-I ${netcdf_path}/include-64  $fopts"
-#                    lopts="$lopts -L${netcdf_path}/lib -lnetcdf";;
-#       (ibms)       fopts="-I /applic/netcdf64/src/f90  $fopts"
-#                    lopts="$lopts -L${netcdf_path} -lnetcdf";;
-#       (ibmy)       fopts="-I ${netcdf_path}/include  $fopts"
-#                    lopts="$lopts -L${netcdf_path}/lib -lnetcdf";;
-#       (nech|neck)  fopts="-I ${netcdf_path}/include  $fopts"
-#                    lopts="$lopts -L${netcdf_path}/lib -lnetcdf";;
-#       (lctit)      fopts="-I ${netcdf_path}/include  $fopts"
-#                    lopts="$lopts -L${netcdf_path}/lib -lnetcdf";;
-#
-#    esac
-# fi
 
     # PRUEFEN DER CPU-ZEIT. (CPUMAX WIRD ALS ENV-VARIABLE VOM HAUTPRO-
