Changeset 291 for palm/trunk/SCRIPTS

Timestamp:

Apr 16, 2009 12:07:26 PM (15 years ago)

Author:

raasch

Message:

changes for coupling with independent precursor runs; z_i calculation with Sullivan criterion

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (8 diffs)
• subjob (modified) (2 diffs)

palm/trunk/SCRIPTS/mrun

@@ -179 +179 @@
      #                     dvr application more user friendly
      # 20/03/09 - Marcus - update of n1ge command for lctit
+     # 16/04/09 - Siggi  - new option -y for precursor (uncoupled) ocean runs
+     #                     to be followed by a coupled atmosphere-ocean run
 
  
@@ -417 +419 @@
     # SHELLSCRIPT-OPTIONEN EINLESEN UND KOMMANDO NEU ZUSAMMENSETZEN, FALLS ES
     # FUER FOLGEJOBS BENOETIGT WIRD
- while  getopts  :a:AbBc:Cd:D:Fg:G:h:H:i:IkK:m:M:n:o:Op:P:q:r:R:s:St:T:u:U:vxX:Y: option
+ while  getopts  :a:AbBc:Cd:D:Fg:G:h:H:i:IkK:m:M:n:o:Op:P:q:r:R:s:St:T:u:U:vxX:yY: option
  do
    case  $option  in
@@ -456 +458 @@
        (x)   do_trace=true;set -x; mc="$mc -x";;
        (X)   numprocs=$OPTARG; mc="$mc -X$OPTARG";;
+       (y)   ocean_file_appendix=true; mc="$mc -y";;
        (Y)   run_coupled_model=true; coupled_dist=$OPTARG; mc="$mc -Y'$OPTARG'";;
        (\?)  printf "\n  +++ unknown option $OPTARG \n"
@@ -473 +476 @@
  then
    (printf "\n  *** mrun can be called as follows:\n"
-    printf "\n      $mrun_script_name  -b -c.. -d.. -D.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -Y.. <modus>\n"
+    printf "\n      $mrun_script_name  -b -c.. -d.. -D.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -y -Y.. <modus>\n"
     printf "\n      Description of available options:\n"
     printf "\n      Option  Description                              Default-Value"
@@ -511 +514 @@
     printf "\n        -x    tracing of mrun for debug purposes       ---"
     printf "\n        -X    # of processors (on parallel machines)   1"
+    printf "\n        -y    add appendix \"_O\" to all local output"
+    printf "\n              files (ocean precursor runs followed by"
+    printf "\n              coupled atmosphere-ocean runs)           ---"
     printf "\n        -Y    run coupled model, \"#1 #2\" with" 
     printf "\n              #1 atmosphere and #2 ocean processors    \"#/2 #/2\" depending on -X"
@@ -2407 +2413 @@
        then
           printf "      compiler is called via ssh on \"bicegate\" using module \"$mpilib\" \n"
-          ssh  130.73.232.102  -l $usern  ". /usr/share/modules/init/bash; module load $mpilib; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" "
+          ssh  130.73.232.103  -l $usern  ". /usr/share/modules/init/bash; module load $mpilib; cd $TEMPDIR; make -f Makefile PROG=a.out  F90=$compiler_name  COPT=\"$cpp_options\"  F90FLAGS=\"$fopts\"  LDFLAGS=\"$lopts\" "
           [[ ! -f a.out ]]  &&  compile_error=true
           continue   # ANDERENFALLS IST STATUS=1, FALLS A.OUT VORHANDEN
@@ -3097 +3103 @@
              if [[ $run_coupled_model = false ]]
              then
-                echo "no_coupling"  >  runfile_atmos
+                if [[ "$ocean_file_appendix" = true ]]
+                then
+                   echo "precursor_ocean"  >  runfile_atmos
+                else
+                   echo "precursor_atmos"  >  runfile_atmos
+                fi
                 printf "\n\n"
                 if [[ $host = lcsgih  ||  $host = lcsgib ]]
@@ -4098 +4109 @@
     [[ $delete_temporary_catalog = false ]]  &&  mrun_com=${mrun_com}" -B"
     [[ $node_usage != default  &&  "$(echo $node_usage | cut -c1-3)" != "sla"  &&  $node_usage != novice ]]  &&  mrun_com=${mrun_com}" -n $node_usage"
+    [[ "$ocean_file_appendix" = true ]]  &&  mrun_com=${mrun_com}" -y"
     [[ $run_coupled_model = true ]]  &&  mrun_com=${mrun_com}" -Y \"$coupled_dist\""
     if [[ $do_remote = true ]]

palm/trunk/SCRIPTS/subjob

@@ -163 +163 @@
      (bora)                  local_addres=130.75.105.103; local_host=lcmuk;;
      (bicegate1)             local_addres=130.73.232.102; local_host=lcsgib;;
+     (bicegate2)             local_addres=130.73.232.103; local_host=lcsgib;;
      (breg*-en0|berni*-en0)  local_addres=130.73.230.10;  local_host=ibmb;;
      (breva)                 local_addres=130.75.105.98;  local_host=lcmuk;;
@@ -319 +320 @@
         (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;;
-        (lcsgib)  queue=smallq; remote_addres=130.73.232.102; submcom=/opt/moab/bin/msub;;
+        (lcsgib)  queue=smallq; remote_addres=130.73.232.103; submcom=/opt/moab/bin/msub;;
         (lcsgih)  queue=smallq; remote_addres=130.75.4.103; submcom=/opt/moab/bin/msub;;
         (lctit)   queue=lctit; remote_addres=172.17.75.161; submcom=/n1ge/TITECH_GRID/tools/bin/n1ge;;