Changeset 5068


Ignore:
Timestamp:
08/09/10 11:25:08 (15 years ago)
Author:
Mathieu Morlighem
Message:

moved new nightlyrun as official version

Location:
issm/trunk/cron
Files:
8 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk/cron/configs/linux64_larour

    r4681 r5068  
    22########### Configuration file for Eric Larour's nightly run on Linux ############
    33
    4 #1: ISSM general configuration
    5 #-----------------------------
     4#-------------------------------#
     5# 1: ISSM general configuration #
     6#-------------------------------#
    67
    78#ISSM main directory (full pathto ISSM trunk)
    89ISSM_DIR="/u/astrid-r1b/larour/issm/trunk/cron/trunk"
     10#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    911
    1012#ISSM Architecture
     
    1719MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
    1820
    19 #2: ISSM Installation
    20 #--------------------
     21#----------------------#
     22# 2: ISSM Installation #
     23#----------------------#
    2124
    22 #ISSM installation. If SKIPINSTALLATION="no" the existing version of the
    23 #code will be erased. The new version will be checked out and fully
    24 #installed. If SKIPINSTALLATION="yes", the following options won't be
    25 #used. Go to section 3
    26 
    27 SKIPINSTALLATION="no"
     25#ISSM_INSTALLATION can have 3 values:
     26# - "checkout" the existing version of the code will be erased and
     27#              the latest version will be checked out
     28# - "update"   the directory won't be erased but ISSM will be updated
     29#              ->skip to section 3
     30# - "none"     leave ISSM as is in its directory
     31#              ->skip to section 3
     32ISSM_INSTALLATION="update"
    2833
    2934#SVN repository
    3035REPOSITORY="http://s383-rhat/issm/svn/issm/trunk"
     36#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
    3137
    3238#execution path used for parallel runs
    3339EXECUTION_PATH="/u/astrid-r1b/larour/issm/execution"
    3440
    35 #External packages installation. If SKIPPACKAGESCOMPILATION="no" the
    36 #packages mentionned in EXTERNALPACKAGES will be fully installed which
    37 #requires a long time. If SKIPPACKAGESCOMPILATION="yes", the external
    38 #packages directory will be removed and the directories
    39 #EXTERNALPACKAGESDIR and DEVPACKAGESDIR will be copied.
     41#-----------------------------------#
     42# 3: External packages installation #
     43#-----------------------------------#
    4044
    41 SKIPPACKAGESCOMPILATION="no"
     45#ISSM_EXTERNALPACKAGES can have 3 values:
     46# - "install" install all external packages listed below
     47# - "copy"    copy existing directories (EXTERNALPACKAGESDIR
     48#             and DEVPACKAGESDIR)
     49# - "none"    leave external packages as is
     50#             ->skip to section 4
     51ISSM_EXTERNALPACKAGES="none"
    4252EXTERNALPACKAGESDIR="/u/astrid-r1b/larour/issm/trunk/externalpackages"
    4353DEVPACKAGESDIR="/u/astrid-r1b/larour/issm/trunk/devpackages"
     
    4656EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota chaco"
    4757
    48 #3: ISSM Compilation
    49 #-------------------
     58#---------------------#
     59# 4: ISSM Compilation #
     60#---------------------#
    5061
    51 #ISSM compilation. If SKIPCOMPILATION="no" ISSM will be reconfigured
    52 #and compiled.
    53 SKIPCOMPILATION="no"
     62#ISSM_COMPILATION can have 2 values:
     63# - "yes" compile ISSM
     64# - "no"  do not compile ISSM
     65ISSM_COMPILATION="no"
    5466
    55 #4: Mail notification
    56 #--------------------
     67#----------------------#
     68# 5: Mail notification #
     69#----------------------#
    5770
    5871#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
     
    6174
    6275#Sender email address
    63 EMAIL_ADRESS="eric.larourm@jpl.nasa.gov"
     76EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
    6477
    65 #5: Nightly run options
    66 #----------------------
     78#------------------------#
     79# 6: Nightly run options #
     80#------------------------#
    6781
    6882#number of cpus used in ISSM installation and compilation (one is usually
    6983#safer as some packages are very sensitive to parallel compilation)
    70 NUMCPUS_INSTALL=1
     84NUMCPUS_INSTALL=8
    7185
    7286#number of cpus used in the nightly runs.
    73 NUMCPUS_RUN=14
     87NUMCPUS_RUN=8
    7488
    7589#Nightly run options. The matlab routine nightlyrun.m will be called
    7690#as follows: nightlyrun($NROPTIONS). The options must be understandable
    77 #by Matlab and nightlyrun.m. Example: NROPTIONS="'parallel',0"
     91#by Matlab and nightlyrun.m
     92#ex: "'id',[101 102 103]"
    7893
    7994NROPTIONS=""
  • TabularUnified issm/trunk/cron/configs/linux64_morlighem

    r3610 r5068  
    22########### Configuration file for Mathieu Morlighem's nightly run on Linux ############
    33
    4 #1: ISSM general configuration
    5 #-----------------------------
     4#-------------------------------#
     5# 1: ISSM general configuration #
     6#-------------------------------#
    67
    78#ISSM main directory (full pathto ISSM trunk)
    89ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/trunk"
     10#ISSM_DIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2"
    911
    1012#ISSM Architecture
     
    1719MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
    1820
    19 #2: ISSM Installation
    20 #--------------------
     21#----------------------#
     22# 2: ISSM Installation #
     23#----------------------#
    2124
    22 #ISSM installation. If SKIPINSTALLATION="no" the existing version of the
    23 #code will be erased. The new version will be checked out and fully
    24 #installed. If SKIPINSTALLATION="yes", the following options won't be
    25 #used. Go to section 3
    26 
    27 SKIPINSTALLATION="no"
     25#ISSM_INSTALLATION can have 3 values:
     26# - "checkout" the existing version of the code will be erased and
     27#              the latest version will be checked out
     28# - "update"   the directory won't be erased but ISSM will be updated
     29#              ->skip to section 3
     30# - "none"     leave ISSM as is in its directory
     31#              ->skip to section 3
     32ISSM_INSTALLATION="update"
    2833
    2934#SVN repository
    3035REPOSITORY="http://s383-rhat/issm/svn/issm/trunk"
     36#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
    3137
    3238#execution path used for parallel runs
    3339EXECUTION_PATH="/u/wilkes-r1b/morlighe/ExecutionNightlyRun"
    3440
    35 #External packages installation. If SKIPPACKAGESCOMPILATION="no" the
    36 #packages mentionned in EXTERNALPACKAGES will be fully installed which
    37 #requires a long time. If SKIPPACKAGESCOMPILATION="yes", the external
    38 #packages directory will be removed and the directories
    39 #EXTERNALPACKAGESDIR and DEVPACKAGESDIR will be copied.
     41#-----------------------------------#
     42# 3: External packages installation #
     43#-----------------------------------#
    4044
    41 SKIPPACKAGESCOMPILATION="no"
     45#ISSM_EXTERNALPACKAGES can have 3 values:
     46# - "install" install all external packages listed below
     47# - "copy"    copy existing directories (EXTERNALPACKAGESDIR
     48#             and DEVPACKAGESDIR)
     49# - "none"    leave external packages as is
     50#             ->skip to section 4
     51ISSM_EXTERNALPACKAGES="none"
    4252EXTERNALPACKAGESDIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/externalpackages"
    4353DEVPACKAGESDIR="/u/wilkes-r1b/morlighe/svn/issm/trunk/devpackages"
    4454
    4555#List of external pakages to be installed
    46 EXTERNALPACKAGES="matlab mpich2 petsc metis triangle"
     56EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota chaco"
    4757
    48 #3: ISSM Compilation
    49 #-------------------
     58#---------------------#
     59# 4: ISSM Compilation #
     60#---------------------#
    5061
    51 #ISSM compilation. If SKIPCOMPILATION="no" ISSM will be reconfigured
    52 #and compiled.
    53 SKIPCOMPILATION="no"
     62#ISSM_COMPILATION can have 2 values:
     63# - "yes" compile ISSM
     64# - "no"  do not compile ISSM
     65ISSM_COMPILATION="yes"
    5466
    55 #4: Mail notification
    56 #--------------------
     67#----------------------#
     68# 5: Mail notification #
     69#----------------------#
    5770
    5871#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
     
    6376EMAIL_ADRESS="mathieu.morlighem@jpl.nasa.gov"
    6477
    65 #5: Nightly run options
    66 #----------------------
     78#------------------------#
     79# 6: Nightly run options #
     80#------------------------#
    6781
    6882#number of cpus used in ISSM installation and compilation (one is usually
    6983#safer as some packages are very sensitive to parallel compilation)
    70 NUMCPUS_INSTALL=1
     84NUMCPUS_INSTALL=8
    7185
    7286#number of cpus used in the nightly runs.
    73 NUMCPUS_RUN=6
     87NUMCPUS_RUN=7
    7488
    7589#Nightly run options. The matlab routine nightlyrun.m will be called
    7690#as follows: nightlyrun($NROPTIONS). The options must be understandable
    7791#by Matlab and nightlyrun.m
     92#ex: "'id',[101 102 103]"
    7893
    7994NROPTIONS=""
  • TabularUnified issm/trunk/cron/configs/linux64_seroussi

    r3610 r5068  
    22########### Configuration file for Helene Seroussi's nightly run on Linux ############
    33
    4 #1: ISSM general configuration
    5 #-----------------------------
     4#-------------------------------#
     5# 1: ISSM general configuration #
     6#-------------------------------#
    67
    78#ISSM main directory (full pathto ISSM trunk)
     
    1718MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
    1819
    19 #2: ISSM Installation
    20 #--------------------
     20#----------------------#
     21# 2: ISSM Installation #
     22#----------------------#
    2123
    22 #ISSM installation. If SKIPINSTALLATION="no" the existing version of the
    23 #code will be erased. The new version will be checked out and fully
    24 #installed. If SKIPINSTALLATION="yes", the following options won't be
    25 #used. Go to section 3
    26 
    27 SKIPINSTALLATION="no"
     24#ISSM_INSTALLATION can have 3 values:
     25# - "checkout" the existing version of the code will be erased and
     26#              the latest version will be checked out
     27# - "update"   the directory won't be erased but ISSM will be updated
     28#              ->skip to section 3
     29# - "none"     leave ISSM as is in its directory
     30#              ->skip to section 3
     31ISSM_INSTALLATION="update"
    2832
    2933#SVN repository
    3034REPOSITORY="http://s383-rhat/issm/svn/issm/trunk"
     35#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
    3136
    3237#execution path used for parallel runs
    3338EXECUTION_PATH="/u/wilkes-r1b/seroussi/ExecutionNightlyRun"
    3439
    35 #External packages installation. If SKIPPACKAGESCOMPILATION="no" the
    36 #packages mentionned in EXTERNALPACKAGES will be fully installed which
    37 #requires a long time. If SKIPPACKAGESCOMPILATION="yes", the external
    38 #packages directory will be removed and the directories
    39 #EXTERNALPACKAGESDIR and DEVPACKAGESDIR will be copied.
     40#-----------------------------------#
     41# 3: External packages installation #
     42#-----------------------------------#
    4043
    41 SKIPPACKAGESCOMPILATION="no"
     44#ISSM_EXTERNALPACKAGES can have 3 values:
     45# - "install" install all external packages listed below
     46# - "copy"    copy existing directories (EXTERNALPACKAGESDIR
     47#             and DEVPACKAGESDIR)
     48# - "none"    leave external packages as is
     49#             ->skip to section 4
     50ISSM_EXTERNALPACKAGES="none"
    4251EXTERNALPACKAGESDIR="/u/wilkes-r1b/seroussi/svn/issm/trunk/externalpackages"
    4352DEVPACKAGESDIR="/u/wilkes-r1b/seroussi/svn/issm/trunk/devpackages"
    4453
    4554#List of external pakages to be installed
    46 EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota"
     55EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota chaco"
    4756
    48 #3: ISSM Compilation
    49 #-------------------
     57#---------------------#
     58# 4: ISSM Compilation #
     59#---------------------#
    5060
    51 #ISSM compilation. If SKIPCOMPILATION="no" ISSM will be reconfigured
    52 #and compiled.
    53 SKIPCOMPILATION="no"
     61#ISSM_COMPILATION can have 2 values:
     62# - "yes" compile ISSM
     63# - "no"  do not compile ISSM
     64ISSM_COMPILATION="yes"
    5465
    55 #4: Mail notification
    56 #--------------------
     66#----------------------#
     67# 5: Mail notification #
     68#----------------------#
    5769
    5870#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
     
    6375EMAIL_ADRESS="helene.seroussi@jpl.nasa.gov"
    6476
    65 #5: Nightly run options
    66 #----------------------
     77#------------------------#
     78# 6: Nightly run options #
     79#------------------------#
    6780
    6881#number of cpus used in ISSM installation and compilation (one is usually
    6982#safer as some packages are very sensitive to parallel compilation)
    70 NUMCPUS_INSTALL=1
     83NUMCPUS_INSTALL=8
    7184
    7285#number of cpus used in the nightly runs.
    73 NUMCPUS_RUN=8
     86NUMCPUS_RUN=7
    7487
    7588#Nightly run options. The matlab routine nightlyrun.m will be called
    7689#as follows: nightlyrun($NROPTIONS). The options must be understandable
    7790#by Matlab and nightlyrun.m
     91#ex: "'id',[101 102 103]"
    7892
    7993NROPTIONS=""
  • TabularUnified issm/trunk/cron/configs/macosx32_seroussi

    r2191 r5068  
    11#
    2 ########### Configuration file for Helene Seroussi's nightly run on MAC ############
     2########### Configuration file for Helene Seroussi's nightly run on Linux ############
    33
    4 #1: ISSM general configuration
    5 #-----------------------------
     4#-------------------------------#
     5# 1: ISSM general configuration #
     6#-------------------------------#
    67
    78#ISSM main directory (full pathto ISSM trunk)
     
    1718MATLAB_PATH="/Applications/MATLAB_R2009a.app/"
    1819
    19 #2: ISSM Installation
    20 #--------------------
     20#----------------------#
     21# 2: ISSM Installation #
     22#----------------------#
    2123
    22 #ISSM installation. If SKIPINSTALLATION="no" the existing version of the
    23 #code will be erased. The new version will be checked out and fully
    24 #installed. If SKIPINSTALLATION="yes", the following options won't be
    25 #used. Go to section 3
    26 
    27 SKIPINSTALLATION="no"
     24#ISSM_INSTALLATION can have 3 values:
     25# - "checkout" the existing version of the code will be erased and
     26#              the latest version will be checked out
     27# - "update"   the directory won't be erased but ISSM will be updated
     28#              ->skip to section 3
     29# - "none"     leave ISSM as is in its directory
     30#              ->skip to section 3
     31ISSM_INSTALLATION="update"
    2832
    2933#SVN repository
    3034REPOSITORY="http://s383-rhat/issm/svn/issm/trunk"
     35#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
    3136
    3237#execution path used for parallel runs
    3338EXECUTION_PATH=""
    3439
    35 #External packages installation. If SKIPPACKAGESCOMPILATION="no" the
    36 #packages mentionned in EXTERNALPACKAGES will be fully installed which
    37 #requires a long time. If SKIPPACKAGESCOMPILATION="yes", the external
    38 #packages directory will be removed and the directories
    39 #EXTERNALPACKAGESDIR and DEVPACKAGESDIR will be copied.
     40#-----------------------------------#
     41# 3: External packages installation #
     42#-----------------------------------#
    4043
    41 SKIPPACKAGESCOMPILATION="no"
     44#ISSM_EXTERNALPACKAGES can have 3 values:
     45# - "install" install all external packages listed below
     46# - "copy"    copy existing directories (EXTERNALPACKAGESDIR
     47#             and DEVPACKAGESDIR)
     48# - "none"    leave external packages as is
     49#             ->skip to section 4
     50ISSM_EXTERNALPACKAGES="none"
    4251EXTERNALPACKAGESDIR=""
    4352DEVPACKAGESDIR=""
    4453
    4554#List of external pakages to be installed
    46 EXTERNALPACKAGES=""
     55EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota chaco"
    4756
    48 #3: ISSM Compilation
    49 #-------------------
     57#---------------------#
     58# 4: ISSM Compilation #
     59#---------------------#
    5060
    51 #ISSM compilation. If SKIPCOMPILATION="no" ISSM will be reconfigured
    52 #and compiled.
    53 SKIPCOMPILATION="no"
     61#ISSM_COMPILATION can have 2 values:
     62# - "yes" compile ISSM
     63# - "no"  do not compile ISSM
     64ISSM_COMPILATION="yes"
    5465
    55 #4: Mail notification
    56 #--------------------
     66#----------------------#
     67# 5: Mail notification #
     68#----------------------#
    5769
    5870#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
     
    6375EMAIL_ADRESS="helene.seroussi@jpl.nasa.gov"
    6476
    65 #5: Nightly run options
    66 #----------------------
     77#------------------------#
     78# 6: Nightly run options #
     79#------------------------#
    6780
    6881#number of cpus used in ISSM installation and compilation (one is usually
     
    7689#as follows: nightlyrun($NROPTIONS). The options must be understandable
    7790#by Matlab and nightlyrun.m
     91#ex: "'id',[101 102 103]"
    7892
    79 NROPTIONS="'parallel',0"
     93NROPTIONS=""
  • TabularUnified issm/trunk/cron/configs/winxp32_larour

    r3610 r5068  
    11#
    2 ########### Configuration file for Eric Larour's nightly run on Windows ############
     2########### Configuration file for Eric Larour's nightly run on Linux ############
    33
    4 #1: ISSM general configuration
    5 #-----------------------------
     4#-------------------------------#
     5# 1: ISSM general configuration #
     6#-------------------------------#
    67
    78#ISSM main directory (full pathto ISSM trunk)
     
    1718MATLAB_PATH="C:/MATLAB/R2009a/"
    1819
    19 #2: ISSM Installation
    20 #--------------------
     20#----------------------#
     21# 2: ISSM Installation #
     22#----------------------#
    2123
    22 #ISSM installation. If SKIPINSTALLATION="no" the existing version of the
    23 #code will be erased. The new version will be checked out and fully
    24 #installed. If SKIPINSTALLATION="yes", the following options won't be
    25 #used. Go to section 3
    26 
    27 SKIPINSTALLATION="no"
     24#ISSM_INSTALLATION can have 3 values:
     25# - "checkout" the existing version of the code will be erased and
     26#              the latest version will be checked out
     27# - "update"   the directory won't be erased but ISSM will be updated
     28#              ->skip to section 3
     29# - "none"     leave ISSM as is in its directory
     30#              ->skip to section 3
     31ISSM_INSTALLATION="update"
    2832
    2933#SVN repository
    3034REPOSITORY="http://s383-rhat/issm/svn/issm/trunk"
     35#REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
    3136
    3237#execution path used for parallel runs
    33 EXECUTION_PATH=""
     38EXECUTION_PATH="/u/astrid-r1b/larour/issm/execution"
    3439
    35 #External packages installation. If SKIPPACKAGESCOMPILATION="no" the
    36 #packages mentionned in EXTERNALPACKAGES will be fully installed which
    37 #requires a long time. If SKIPPACKAGESCOMPILATION="yes", the external
    38 #packages directory will be removed and the directories
    39 #EXTERNALPACKAGESDIR and DEVPACKAGESDIR will be copied.
     40#-----------------------------------#
     41# 3: External packages installation #
     42#-----------------------------------#
    4043
    41 SKIPPACKAGESCOMPILATION="yes"
     44#ISSM_EXTERNALPACKAGES can have 3 values:
     45# - "install" install all external packages listed below
     46# - "copy"    copy existing directories (EXTERNALPACKAGESDIR
     47#             and DEVPACKAGESDIR)
     48# - "none"    leave external packages as is
     49#             ->skip to section 4
     50ISSM_EXTERNALPACKAGES="none"
    4251EXTERNALPACKAGESDIR="/cygdrive/c/home/externalpackages"
    4352DEVPACKAGESDIR="/cygdrive/c/home/devpackages"
    4453
    4554#List of external pakages to be installed
    46 EXTERNALPACKAGES="matlab petsc metis triangle dakota"
     55EXTERNALPACKAGES="matlab mpich2 petsc metis triangle dakota chaco"
    4756
    48 #3: ISSM Compilation
    49 #-------------------
     57#---------------------#
     58# 4: ISSM Compilation #
     59#---------------------#
    5060
    51 #ISSM compilation. If SKIPCOMPILATION="no" ISSM will be reconfigured
    52 #and compiled.
    53 SKIPCOMPILATION="no"
     61#ISSM_COMPILATION can have 2 values:
     62# - "yes" compile ISSM
     63# - "no"  do not compile ISSM
     64ISSM_COMPILATION="no"
    5465
    55 #4: Mail notification
    56 #--------------------
     66#----------------------#
     67# 5: Mail notification #
     68#----------------------#
    5769
    5870#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
     
    6375EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
    6476
    65 #5: Nightly run options
    66 #----------------------
     77#------------------------#
     78# 6: Nightly run options #
     79#------------------------#
    6780
    6881#number of cpus used in ISSM installation and compilation (one is usually
     
    7689#as follows: nightlyrun($NROPTIONS). The options must be understandable
    7790#by Matlab and nightlyrun.m
     91#ex: "'id',[101 102 103]"
    7892
    79 NROPTIONS="'parallel',0"
     93NROPTIONS=""
  • TabularUnified issm/trunk/cron/cronfiles/linux_cronfile

    r4790 r5068  
    55MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov
    66
    7 #cronjob: issm sunday-friday 9:00pm
    8 30 12 * * * cd /u/astrid-r1b/larour/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_larour
    9 0 23 * * * cd /u/astrid-r1b/larour/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_larour
     7#cronjob
     800 09 * * 1-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem
     930 12 * * 1-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem
     1000 15 * * 1-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem
     1100 18 * * 1-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem
     1200 23 * * 1-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_morlighem2
  • TabularUnified issm/trunk/cron/nightlyrun.sh

    r4911 r5068  
    7878
    7979#Lauch installation
    80 #Checkout and install ISSM if requested (SKIPINSTALLATION){{{1
    81 if [ "$SKIPINSTALLATION" != "yes" ]
     80#Checkout/update/none ISSM if requested (ISSM_INSTALLATION){{{1
     81if [ "$ISSM_INSTALLATION" == "checkout" ]
    8282then
    8383
     
    8686        svn checkout $REPOSITORY
    8787
    88         #source environment variables with new matlab path
    89         cd $ISSM_DIR/etc
    90         source environment.sh MATLAB_DIR=$MATLAB_PATH
    91 
    92         #create simpler  cluster.rc file, with only the cluster we are interested in.
    93         cat << END > cluster.rc
     88elif [ "$ISSM_INSTALLATION" == "update" ]
     89then
     90
     91        #only update ISSM
     92        cd $ISSM_DIR
     93        svn update
     94
     95elif [ "$ISSM_INSTALLATION" == "none" ]
     96then
     97
     98        #do nothing
     99        echo "Skipping ISSM installation"
     100
     101else
     102
     103        #Error message
     104        echo "ISSM_INSTALLATION supported values are: checkout, update and none. Exiting..." >&2 # Error message to stderr.
     105        exit 1
     106
     107fi
     108#}}}
     109#Create cluster.rc {{{1
     110#create simpler  cluster.rc file, with only the cluster we are interested in.
     111cd $ISSM_DIR/etc
     112cat << END > cluster.rc
    94113begin
    95114cluster_name=$HOST_NAME
     
    101120end
    102121END
    103 
    104         #Compile external packages if requested    (SKIPPACKAGESCOMPILATION){{{2
    105         if [ "$SKIPPACKAGESCOMPILATION"  = "yes" ]
    106         then
    107 
    108                 #erase externapackages, and link with externalpackages_dir
    109                 cd $ISSM_DIR
    110                 rm -rf externalpackages
    111                 cp -Rf $EXTERNALPACKAGESDIR ./
    112 
    113                 rm -rf devpackages
    114                 cp -Rf $DEVPACKAGESDIR ./
    115         else
    116                
    117                 cd $ISSM_DIR/externalpackages
    118                 for ep in $EXTERNALPACKAGES
    119                 do
    120                         cd $ep
    121                         if [ "$ep" == "petsc" ]
    122                         then
    123                                 #For Petsc (2.3 for now)
    124                                 cp configs/2.3.2-p3/$OS/* .
    125                                 #cp configs/3.0.0-p11/$OS/* .
    126                                 #cat install.sh | sed -e "s/version='2.3.2-p3'/version='3.0.0-p11'/g" > temp.sh
    127                                 #mv temp.sh install.sh
    128                         else
    129                                 cp configs/$OS/* .
    130                         fi
    131                         ./install.sh $NUMCPUS_INSTALL
    132                         cd ..
    133                 done
    134 
    135                 #3: install automake and autoconf
    136                 cd $ISSM_DIR/devpackages
    137                 make
     122#}}}
     123#Source environment variables with new matlab path {{{1
     124cd $ISSM_DIR/etc
     125source environment.sh MATLAB_DIR=$MATLAB_PATH
     126#}}}
     127#install/copy/none external packages    (ISSM_EXTERNALPACKAGES){{{1
     128if [ "$ISSM_EXTERNALPACKAGES" == "install" ]
     129then
     130        cd $ISSM_DIR/externalpackages
     131        for ep in $EXTERNALPACKAGES
     132        do
     133                cd $ep
     134                if [ "$ep" == "petsc" ]
     135                then
     136                        #For Petsc (2.3 for now)
     137                        cp configs/2.3.2-p3/$OS/* .
     138                        #cp configs/3.0.0-p11/$OS/* .
     139                        #cat install.sh | sed -e "s/version='2.3.2-p3'/version='3.0.0-p11'/g" > temp.sh
     140                        #mv temp.sh install.sh
     141                else
     142                        cp configs/$OS/* .
     143                fi
     144                ./install.sh $NUMCPUS_INSTALL
    138145                cd ..
    139         fi
    140         #}}}
     146        done
     147
     148        #3: install automake and autoconf
     149        cd $ISSM_DIR/devpackages
     150        make
     151        cd ..
     152
     153elif [ "$ISSM_EXTERNALPACKAGES" == "copy" ]
     154then
     155
     156        #erase externapackages, and link with externalpackages_dir
     157        cd $ISSM_DIR
     158        rm -rf externalpackages
     159        cp -Rf $EXTERNALPACKAGESDIR ./
     160
     161        rm -rf devpackages
     162        cp -Rf $DEVPACKAGESDIR ./
     163
     164elif [ "$ISSM_EXTERNALPACKAGES" == "none" ]
     165then
     166
     167        #Do nothing
     168        echo "Skipping external packages installation"
     169
    141170else
    142171
    143         #source environment variables with new matlab path
    144         cd $ISSM_DIR/etc
    145         source environment.sh MATLAB_DIR=$MATLAB_PATH
    146 
    147 fi
    148 #}}}
    149 #Compile ISSM if requested              (SKIPCOMPILATION) {{{1
    150 if [ "$SKIPCOMPILATION" != "yes" ]
    151 then
     172        #Error message
     173        echo "ISSM_EXTERNALPACKAGES supported values are: install, copy and none. Exiting..." >&2 # Error message to stderr.
     174        exit 1
     175
     176fi
     177#}}}
     178#ISSM compilation yes/no                (ISSM_COMPILATION) {{{1
     179if [ "$ISSM_COMPILATION" == "yes" ]
     180then
     181
    152182        cd $ISSM_DIR
    153         svn update
     183        make distclean
    154184        sh scripts/automakererun.sh
    155185        sh configs/$OS/$OS.sh.petsc2 #use petsc2 for now
     
    168198                make -j $NUMCPUS_INSTALL install
    169199        fi
     200
     201elif [ "$ISSM_COMPILATION" == "no" ]
     202then
     203
     204        #do nothing
     205        echo "Skipping ISSM compilation"
     206
     207else
     208
     209        #Error message
     210        echo "ISSM_COMPILATION supported values are: yes and no. Exiting..." >&2 # Error message to stderr.
     211        exit 1
     212
    170213fi
    171214#}}}
     
    181224fi
    182225#}}}
    183 #Create NightlyRun directory and nightly.log {{{1
     226#Create TEMP directory and nightly.log {{{1
    184227#put installation elapsed time in nightly.log
    185228INSTALL_TIME=$(timer)
    186229ELAPSED_INSTALL=$(timer $START_TIME)
    187 rm -rf $ISSM_DIR/test/Verification/NightlyRun
    188 mkdir  $ISSM_DIR/test/Verification/NightlyRun
    189 cat << END > $ISSM_DIR/test/Verification/NightlyRun/nightly.log
     230rm -rf $ISSM_DIR/TEMP
     231mkdir  $ISSM_DIR/TEMP
     232cat << END > $ISSM_DIR/TEMP/nightly.log
    190233today:     $(echo $TODAY)
    191234user:      $(echo $USER)
     
    199242
    200243#Run tests
    201 #Call run.sh script{{{1
     244#Call run2.sh script{{{1
    202245cd $ISSM_DIR/cron/
    203 ./run.sh $1
     246./run2.sh $1
    204247#}}}
    205248#Complete nightly.log {{{1
    206249ELAPSED_RUN=$(timer $INSTALL_TIME)
    207250ELAPSED_TOTAL=$(timer $START_TIME)
    208 cat << END >>  $ISSM_DIR/test/Verification/NightlyRun/nightly.log
     251cat << END >>  $ISSM_DIR/TEMP/nightly.log
    209252elapsed_run:   $(echo $ELAPSED_RUN)
    210253elapsed_total: $(echo $ELAPSED_TOTAL)
     
    215258#Build html report {{{1
    216259cd $ISSM_DIR/cron/
    217 ./report.sh
    218 echo "html report located in $ISSM_DIR/test/Verification/NightlyRun/report.html"
     260./report2.sh
     261echo "html report located in $ISSM_DIR/TEMP/report.html"
    219262#}}}
    220263#send mail if requested                  (SKIPMAIL) {{{1
     
    231274                        if [ "$OS" = "linux64" ]
    232275                        then
    233                                 cat - $ISSM_DIR/test/Verification/NightlyRun/report.html <<HERE | /usr/lib/sendmail  -oi -t
     276cat - $ISSM_DIR/TEMP/report.html <<HERE | /usr/lib/sendmail  -oi -t
    234277From: "ISSM Nightly run" <$EMAIL_ADRESS>
    235278To: $i
     
    239282HERE
    240283                else
    241 cat - $ISSM_DIR/test/Verification/NightlyRun/report.html <<HERE | /usr/sbin/sendmail  -oi -t
     284cat - $ISSM_DIR/TEMP/report.html <<HERE | /usr/sbin/sendmail  -oi -t
    242285From: "ISSM Nightly run" <$EMAIL_ADRESS>
    243286To: $i
  • TabularUnified issm/trunk/cron/report.sh

    r4679 r5068  
    33
    44#First go to the nightly run directory (created by nightlyrun.sh)
    5 cd $ISSM_DIR/test/Verification/NightlyRun/
     5cd $ISSM_DIR/nightlylog/
    66
    77#----------------------------#
     
    3939MATLAB_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px; font-weight: normal;" align="left"'
    4040
    41 BODY_STYLE='width="1050px"'
    42 BODY_FONT="style=\"color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px;\""
     41BODY_STYLE='width="800px"'
     42BODY_FONT='style="color:#404040; font-family:Arial, Verdana, Tahoma; font-size:14px;"'
    4343
    4444FOOTER_STYLE='width="800px"  cellpadding="10"'
     
    128128<th $(echo $BODY_FONT)>Result</th>
    129129<th $(echo $BODY_FONT)>Tolerance</th>
    130 <th $(echo $BODY_FONT)>Test name</th> 
    131 <th $(echo $BODY_FONT)>Analysis</th>
    132 <th $(echo $BODY_FONT)>Subanalysis </th>
    133 <th $(echo $BODY_FONT)>Qmu</th>
    134 <th $(echo $BODY_FONT)>Control</th>
    135 <th $(echo $BODY_FONT)>Control fit</th>
    136 <th $(echo $BODY_FONT)>Parallel</th>
     130<th $(echo $BODY_FONT)>Test id</th> 
     131<th $(echo $BODY_FONT)>Test name</th>
    137132<th $(echo $BODY_FONT)>Field checked</th>
    138133</tr>
     
    151146                  FONTL=$(echo "$BODY_FONTL bgcolor=#ffff00");
    152147                  echo $line | awk -v FONTC="$FONTC" -v FONTL="$FONTL" '
    153                   { printf("<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n",FONTL,$1,FONTC,"N/A",FONTL,$3,FONTL,$5,FONTL,$7,FONTC,$9,FONTC,$11,FONTC,$13,FONTC,$15,FONTC,"N/A");}
     148                  { printf("<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n\n",FONTL,$1,FONTC,$3,FONTC,$6,FONTL,$9,FONTL,$11);}
    154149                          ';
    155150
     
    169164                  FONTL=$(echo "$BODY_FONTL $color")
    170165                  echo $line | awk -v FONTC="$FONTC" -v FONTL="$FONTL" '
    171                   { printf("<td %s>%s</td>\n<td %s>%s%s%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n",FONTL,$1,FONTL,$3,$4,$5,FONTL,$7,FONTL,$9,FONTL,$11,FONTC,$13,FONTC,$15,FONTC,$17,FONTC,$19,FONTL,$21);}
     166                  { printf("<td %s>%s</td>\n<td %s>%s%s%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n<td %s>%s</td>\n\n",FONTL,$1,FONTL,$3,$4,$5,FONTC,$8,FONTL,$11,FONTL,$13);}
    172167                          ';
    173168          fi
  • TabularUnified issm/trunk/cron/run.sh

    r3528 r5068  
    11#!/bin/bash
    22
    3 #get configs
     3#prepare runs
     4#get configs {{{1
    45if [ $# -ne 1 ];
    56then
     
    89        exit 1
    910fi
    10 INIT_PATH=`cat $ISSM_DIR/test/Verification/NightlyRun/nightly.log | grep "init_path" | awk '{print $2}'`
     11
     12#Go to init_Path and source config
     13INIT_PATH=$(cat $ISSM_DIR/nightlylog/nightly.log | grep "init_path" | awk '{print $2}')
    1114cd $INIT_PATH
    1215source $1;
    13 
    14 #check NUMCPUS_RUN options
     16#}}}
     17#check NUMCPUS_RUN options {{{1
    1518if [ "$NUMCPUS_RUN" = "" ]
    1619then
     
    1821        NUMCPUS_RUN=1
    1922fi
    20 
    21 #create softlink to startup
    22 cd $ISSM_DIR/test/Verification/NightlyRun/
     23#}}}
     24#create softlink to startup {{{1
     25cd $ISSM_DIR/test/NightlyRun/
    2326ln -s $ISSM_DIR/startup.m .
     27#}}}
    2428
    2529#Launch all tests on different cpus
     
    2731do
    2832        #Launch matlab and the nightly run script
    29         cat > $ISSM_DIR/test/Verification/NightlyRun/matlab_run$i.m << EOF
    30         warning off %necessary to avoid a nightly.log of several Go for cielo_parallel
     33        cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
     34        warning off %necessary to avoid a nightly.log of several Go for parallel runs
    3135        try,
    32         $(if [ "$NROPTIONS" = ""  ]
     36                cd $ISSM_DIR/test/NightlyRun
     37                startup;
     38                $(if [ "$NROPTIONS" = ""  ]
    3339        then
    34                 echo "nightlyrun('rank',$i,'numprocs',$NUMCPUS_RUN);"
     40                echo "runme('rank',$i,'numprocs',$NUMCPUS_RUN);"
    3541        else
    36                 echo "nightlyrun($NROPTIONS,'rank',$i,'numprocs',$NUMCPUS_RUN);"
     42                echo "runme($NROPTIONS,'rank',$i,'numprocs',$NUMCPUS_RUN);"
    3743        fi
    38                 )
     44        )
    3945        catch me,
    4046                %An error occured, get report and exit
    4147                directory=strsplit(pwd,'/');
    4248                message=getReport(me)
    43                 fid=fopen([ISSM_DIR '/test/Verification/NightlyRun/matlaberror.log'], 'at');
     49                fid=fopen([ISSM_DIR '/nightlylog/matlaberror.log'], 'at');
    4450                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
    4551                fprintf(fid,'%s',message);
     
    4854        exit
    4955EOF
    50 MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
    51 /usr/local/pkgs/matlab-$MATLAB_VERSION/bin/matlab  -nojvm -nosplash  -r matlab_run$i -logfile matlab_log$i.log &
     56
     57        #Start run from nightlylog directory
     58        cd $ISSM_DIR/nightlylog/
     59
     60        #Start test
     61        MATLAB_VERSION="7.6" #7.2,7.4,7.6 and 7.8
     62        /usr/local/pkgs/matlab-$MATLAB_VERSION/bin/matlab  -nojvm -nosplash  -r matlab_run$i -logfile matlab_log$i.log &
     63
    5264done
    5365
     66#wait until matlab closes
    5467wait
    55 
    56 #remove matlab_run scripts.
    57 rm -rf matlab_run*.m
    5868
    5969#concatenate all reports
Note: See TracChangeset for help on using the changeset viewer.