Changeset 11561

Timestamp:

02/28/12 09:54:59 (13 years ago)

Author:

schlegel

Message:

New config files that match new cron sh

Location:

issm/trunk-jpl/cron/configs

Files:

• linux64_schlegel_daily (modified) (3 diffs)
• linux64_schlegel_nightly (modified) (3 diffs)
• linux64_schlegel_validation (modified) (3 diffs)

issm/trunk-jpl/cron/configs/linux64_schlegel_daily

@@ -17 +17 @@
 MACHINE="astrid"
 
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+#COMPILATION CONFIGURATION FILE
+COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
 
 #----------------------#
@@ -54 +54 @@
 #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"
 
 #---------------------#
@@ -92 +96 @@
 
 NROPTIONS=""
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"

issm/trunk-jpl/cron/configs/linux64_schlegel_nightly

@@ -17 +17 @@
 MACHINE="astrid"
 
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+#COMPILATION CONFIGURATION FILE
+COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
 
 #----------------------#
@@ -54 +54 @@
 #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"
 
 #---------------------#
@@ -92 +96 @@
 
 NROPTIONS=""
+
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"

issm/trunk-jpl/cron/configs/linux64_schlegel_validation

@@ -16 +16 @@
 MACHINE="astrid"
 
-#MATLAB path
-MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+#COMPILATION CONFIGURATION FILE
+COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
 
 #----------------------#
@@ -53 +53 @@
 #List of external pakages to be installed
 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"
 
 #---------------------#
@@ -91 +95 @@
 
 NROPTIONS="'benchmark','all'"
+
+#------------------------#
+# 7: Matlab#
+#------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
+
+MATLABBIN="/usr/local/pkgs/matlab-7.6/bin/matlab"