Changeset 108 for palm/trunk/SCRIPTS

Timestamp:

Aug 24, 2007 3:10:38 PM (17 years ago)

Author:

letzel

Message:

• Improved coupler: evaporation - salinity-flux coupling for humidity = .T.,

avoid MPI hangs when coupled runs terminate, add DOC/app/chapter_3.8;

• Optional calculation of km and kh from initial TKE e_init;
• Default initialization of km,kh = 0.00001 for ocean = .T.;
• Allow data_output_pr= q, wq, w"q", w*q* for humidity = .T.;
• Bugfix: Rayleigh damping for ocean fixed.

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (4 diffs)
• subjob (modified) (5 diffs)

palm/trunk/SCRIPTS/mrun

@@ -124 +124 @@
      #                     output of executables to aout_output removed,
      #                     messages are immediately written to stdout instead
-
-
+     # 03/08/07 - Marcus - add XOPT="-X $numprocs" for lcfimm
+     # 09/08/07 - Marcus - workaround on lcfimm to propagate environment 
+     #                     variables out to the nodes in coupled mode -disabled-
+     # 13/08/07 - Marcus - start local restart jobs per ssh on lcfimm
 
  
@@ -1796 +1798 @@
  lopts="$lopts $netcdf_lib $dvrp_lib"
  ROPTS="$ropts"
- if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lctit )  &&  -n $numprocs ]]
+ if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lctit  ||  $host = lcfimm )  &&  -n $numprocs ]]
  then
     XOPT="-X $numprocs"
@@ -2741 +2743 @@
              then
                 printf "\n\n"
-                mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
+#               if [[ $host = lcfimm ]]
+#               then
+#                  /usr/bin/mpiexec  -comm pmi  -n $ii  a.out  $ROPTS
+#               else
+                   mpiexec  -machinefile hostfile  -n $ii  a.out  $ROPTS
+#               fi
              else
                 ((  iii = ii / 2 ))
                 printf "\n      coupled run ($iii atmosphere, $iii ocean)"
                 printf "\n\n"
-                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
-                mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
+#               if [[ $host = lcfimm ]]
+#               then
+#                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_atmosphere  a.out  $ROPTS  &
+#                   /usr/bin/mpiexec  -comm pmi  -n $iii  run_ocean       a.out  $ROPTS  &
+#               else
+                   mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode atmosphere_to_ocean  a.out  $ROPTS  &
+                   mpiexec  -machinefile hostfile  -n $iii  -env coupling_mode ocean_to_atmosphere  a.out  $ROPTS  &
+#               fi
                 wait
              fi
@@ -3475 +3488 @@
 
                 # BEI RECHNUNGEN AUF LOKALER MASCHINE KANN MRUN DIREKT AUFGE-
-                # RUFEN WERDEN
+                # RUFEN WERDEN, AUSSER AUF lcfimm
              cd $LOCAL_PWD
-             eval  $mc                # ' MUESSEN AUSGEWERTET WERDEN
+             if [[ $localhost = lcfimm ]]
+             then
+                ssh $return_addres -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc " 
+             else
+                eval  $mc                # ' MUESSEN AUSGEWERTET WERDEN
+             fi
              cd -  > /dev/null
           fi

palm/trunk/SCRIPTS/subjob

@@ -83 +83 @@
      # 12/04/07 - Siggi - option -f (filetransfer protocol) removed, scp only
      # 27/07/07 - Siggi - autan admitted
+     # 03/08/07 - Marcus- lcfimm admitted
 
 
@@ -149 +150 @@
      (breg*-en0|berni*-en0)  local_addres=130.73.230.10;  local_host=ibmb;;
      (breva)                 local_addres=130.75.105.98;  local_host=lcmuk;;
+     (compute-*.local)       local_addres=172.20.4.2;     local_host=lcfimm;;
      (cs*)                   local_addres=136.172.44.131; local_host=nech;;
      (elephanta)             local_addres=130.75.105.6;   local_host=lcmuk;;
+     (fimm.bccs.uib.no)      local_addres=172.20.4.2;     local_host=lcfimm;;
      (gallego)               local_addres=130.75.105.10;  local_host=lcmuk;;
      (gate|n-sx)             local_addres=133.5.178.11;   local_host=neck;;
@@ -290 +293 @@
         (ibms)   queue=p_normal; remote_addres=150.183.5.101; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
         (ibmy)   queue=parallel; remote_addres=165.132.26.58; submcom=/usr/lpp/LoadL/full/bin/llsubmit;;
+        (lcfimm) remote_addres=172.20.4.2; submcom=/opt/torque/bin/qsub;;
         (lctit)  queue=default; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;
         (nech)   qsubmem=memsz_job; qsubtime=cputim_job; remote_addres=136.172.44.147; submcom="/usr/local/bin/qsub";;
@@ -607 +611 @@
 %%END%%
 
+ elif [[ $remote_host = lcfimm ]]
+ then
+
+    if [[ $numprocs != 0 ]]
+    then
+       cat > $job_to_send << %%END%%
+#!/bin/ksh
+#PBS -N $job_name
+#PBS -A nersc
+#PBS -l walltime=$timestring
+#PBS -l nodes=${nodes}:ppn=$tasks_per_node
+#PBS -l pmem=${memory}mb
+#PBS -m abe
+#PBS -M igore@nersc.no
+#PBS -o $remote_dayfile
+#PBS -j oe
+mpd &
+
+%%END%%
+
+    else
+       cat > $job_to_send << %%END%%
+#!/bin/ksh
+#PBS -N $job_name
+#PBS -A nersc
+#PBS -l walltime=$timestring
+#PBS -l ncpus=1
+#PBS -l pmem=${memory}mb
+#PBS -m abe
+#PBS -M igore@nersc.no
+#PBS -o $remote_dayfile
+#PBS -j oe
+
+%%END%%
+
+    fi
+
  elif [[ $remote_host = nech ]]
  then
@@ -972 +1013 @@
        then
           eval  $submcom  $job_on_remhost
+       elif [[ $local_host = lcfimm ]]
+       then
+          eval  $submcom  $job_on_remhost
+          echo "$submcom  $job_on_remhost"
+          chmod  u+x  $job_on_remhost
        elif [[ $local_host = lctit ]]
        then