Changeset 11582

Timestamp:

02/29/12 17:37:57 (13 years ago)

Author:

cborstad

Message:

updated cron config files after merging trunk into branch

Location:

issm/branches/trunk-jpl-damage/cron/configs

Files:

• linux64_cborstad_daily_branches (modified) (3 diffs)
• linux64_cborstad_nightly_branches (modified) (4 diffs)
• linux64_cborstad_validation_branches (modified) (4 diffs)

issm/branches/trunk-jpl-damage/cron/configs/linux64_cborstad_daily_branches

@@ -18 +18 @@
 #COMPILATION CONFIGURATION FILE
 COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
-
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
 
 #----------------------#
@@ -56 +53 @@
 #List of external pakages to be installed
 EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco"
+
+#Corresponding list of installation files to use
+EXTERNALPACKAGES_CONFIGS=" install.sh install.sh install.sh install-1.0.2-linux64.sh install-3.2-linux64.sh install-4.0-linux64.sh install-linux64.sh install-linux64-astrid.sh install.sh"
+EXTERNALPACKAGES_NUMCPUS=" 8 8 8 8 8 8"
 
 #---------------------#
@@ -94 +95 @@
 
 NROPTIONS=""
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"

issm/branches/trunk-jpl-damage/cron/configs/linux64_cborstad_nightly_branches

@@ -16 +16 @@
 MACHINE="astrid"
 
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+#COMPILATION CONFIGURATION FILE
+COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
 
 #----------------------#
@@ -37 +37 @@
 
 #execution path used for parallel runs
-#EXECUTION_PATH="/u/astrid-r1b/seroussi/ExecutionNightlyRun"
+EXECUTION_PATH="/u/astrid-r1b/cborstad/ExecutionNightlyRun"
 
 #-----------------------------------#
@@ -53 +53 @@
 #List of external pakages to be installed
 EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco"
+
+#Corresponding list of installation files to use
+EXTERNALPACKAGES_CONFIGS=" install.sh install.sh install.sh install-1.0.2-linux64.sh install-3.2-linux64.sh install-4.0-linux64.sh install-linux64.sh install-linux64-astrid.sh install.sh"
+EXTERNALPACKAGES_NUMCPUS=" 1 1 1 1 1 1"
 
 #---------------------#
@@ -91 +95 @@
 
 NROPTIONS=""
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"

issm/branches/trunk-jpl-damage/cron/configs/linux64_cborstad_validation_branches

@@ -15 +15 @@
 MACHINE="astrid"
 
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+#COMPILATION CONFIGURATION FILE
+COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
 
 #----------------------#
@@ -29 +29 @@
 # - "none"     leave ISSM as is in its directory
 #              ->skip to section 3
-ISSM_INSTALLATION="update"
+ISSM_INSTALLATION="install"
 
 #SVN repository
-#REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/trunk-jpl"
+REPOSITORY="https://issm.ess.uci.edu/svn/issm/issm/branches/trunk-jpl-damage"
 #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2"
 
 #execution path used for parallel runs
-#EXECUTION_PATH="/u/astrid-r1b/seroussi/ExecutionNightlyRun"
+EXECUTION_PATH="/u/astrid-r1b/cborstad/ExecutionNightlyRun"
 
 #-----------------------------------#
@@ -47 +47 @@
 # - "none"    leave external packages as is
 #             ->skip to section 4
-ISSM_EXTERNALPACKAGES="none"
-#EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk-jpl/externalpackages"
+ISSM_EXTERNALPACKAGES="install"
+EXTERNALPACKAGESDIR="/u/astrid-r1b/cborstad/issmuci/branches/trunk-jpl-damage/externalpackages"
 
 #List of external pakages to be installed
-#EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco yams"
+EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco yams"
+
+#Corresponding list of installation files to use
+EXTERNALPACKAGES_CONFIGS=" install.sh install.sh install.sh install-1.0.2-linux64.sh install-3.2-linux64.sh install-4.0-linux64.sh install-linux64.sh install-linux64-astrid.sh install.sh"
+EXTERNALPACKAGES_NUMCPUS=" 1 1 1 1 1 1"
 
 #---------------------#
@@ -90 +94 @@
 
 NROPTIONS="'benchmark','all'"
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"