Changeset 11621

Timestamp:

03/05/12 09:53:43 (13 years ago)

Author:

schlegel

Message:

move MATLABBIN to nightlyrun.sh

Location:

issm/trunk-jpl/cron/configs

Files:

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

issm/trunk-jpl/cron/configs/linux64_schlegel_daily

@@ -19 +19 @@
 #COMPILATION CONFIGURATION FILE
 COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
 
 #----------------------#
@@ -57 +60 @@
 #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"
 
 #---------------------#
@@ -83 +85 @@
 #------------------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=8
-
 #number of cpus used in the nightly runs.
 NUMCPUS_RUN=7
@@ -97 +95 @@
 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

@@ -19 +19 @@
 #COMPILATION CONFIGURATION FILE
 COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
 
 #----------------------#
@@ -57 +60 @@
 #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"
 
 #---------------------#
@@ -83 +85 @@
 #------------------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=1
-
 #number of cpus used in the nightly runs.
 NUMCPUS_RUN=7
@@ -97 +95 @@
 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

@@ -18 +18 @@
 #COMPILATION CONFIGURATION FILE
 COMPILE_CONFIG_FILE="config-linux64-astrid.sh"
+
+#MATLAB path
+MATLAB_PATH="/usr/local/pkgs/matlab-7.6/"
 
 #----------------------#
@@ -56 +59 @@
 #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"
 
 #---------------------#
@@ -82 +84 @@
 #------------------------#
 
-#number of cpus used in ISSM installation and compilation (one is usually
-#safer as some packages are very sensitive to parallel compilation)
-NUMCPUS_INSTALL=1
-
 #number of cpus used in the nightly runs.
 NUMCPUS_RUN=7
@@ -96 +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"