Changeset 108 for palm/trunk/SCRIPTS/mrun

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.

File:

• palm/trunk/SCRIPTS/mrun (modified) (4 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