Index: /issm/trunk/cron/configs/linux64_larour
===================================================================
--- /issm/trunk/cron/configs/linux64_larour	(revision 8180)
+++ /issm/trunk/cron/configs/linux64_larour	(revision 8181)
@@ -14,6 +14,6 @@
 ISSM_ARCH="linux-gnu-amd64"
 
-#Operating System
-OS="linux64"
+#Machine configuration
+MACHINE="astrid"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/linux64_morlighem_daily
===================================================================
--- /issm/trunk/cron/configs/linux64_morlighem_daily	(revision 8180)
+++ /issm/trunk/cron/configs/linux64_morlighem_daily	(revision 8181)
@@ -14,6 +14,6 @@
 ISSM_ARCH="linux-gnu-amd64"
 
-#Operating System
-OS="linux64"
+#Machine configuration
+MACHINE="astrid"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/linux64_morlighem_nightly
===================================================================
--- /issm/trunk/cron/configs/linux64_morlighem_nightly	(revision 8180)
+++ /issm/trunk/cron/configs/linux64_morlighem_nightly	(revision 8181)
@@ -14,6 +14,6 @@
 ISSM_ARCH="linux-gnu-amd64"
 
-#Operating System
-OS="linux64"
+#Machine configuration
+MACHINE="astrid"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/linux64_morlighem_validation
===================================================================
--- /issm/trunk/cron/configs/linux64_morlighem_validation	(revision 8180)
+++ /issm/trunk/cron/configs/linux64_morlighem_validation	(revision 8181)
@@ -13,6 +13,6 @@
 ISSM_ARCH="linux-gnu-amd64"
 
-#Operating System
-OS="linux64"
+#Machine configuration
+MACHINE="astrid"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/linux64_seroussi
===================================================================
--- /issm/trunk/cron/configs/linux64_seroussi	(revision 8180)
+++ /issm/trunk/cron/configs/linux64_seroussi	(revision 8181)
@@ -13,6 +13,6 @@
 ISSM_ARCH="linux-gnu-amd64"
 
-#Operating System
-OS="linux64"
+#Machine configuration
+MACHINE="astrid"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/macosx32_seroussi
===================================================================
--- /issm/trunk/cron/configs/macosx32_seroussi	(revision 8180)
+++ /issm/trunk/cron/configs/macosx32_seroussi	(revision 8181)
@@ -13,6 +13,6 @@
 ISSM_ARCH="macosx-gnu"
 
-#Operating System
-OS="macosx32"
+#Machine configuration
+MACHINE="macmathieu"
 
 #MATLAB path
Index: /issm/trunk/cron/configs/winxp32_larour
===================================================================
--- /issm/trunk/cron/configs/winxp32_larour	(revision 8180)
+++ /issm/trunk/cron/configs/winxp32_larour	(revision 8181)
@@ -13,6 +13,6 @@
 ISSM_ARCH="cygwin-intel"
 
-#Operating System
-OS="winxp32"
+#Machine configuration
+MACHINE="wineric"
 
 #MATLAB path
Index: /issm/trunk/cron/nightlyrun.sh
===================================================================
--- /issm/trunk/cron/nightlyrun.sh	(revision 8180)
+++ /issm/trunk/cron/nightlyrun.sh	(revision 8181)
@@ -29,5 +29,5 @@
 {
 	#return host name depending on the OS
-	if [ "$1" = "winxp32" ] 
+	if [ "$1" = "wineric" ] 
 	then
 		HOST_NAME=`hostname`;
@@ -60,5 +60,5 @@
 #Initialize variables {{{1
 TODAY=$(todaydate);
-HOST_NAME=$(host_name $OS);
+HOST_NAME=$(host_name $MACHINE);
 START_TIME=$(timer);
 ISSM_RELEASE=$(basename $(echo $REPOSITORY));
@@ -119,7 +119,7 @@
 		if [ "$ep" == "petsc" ]
 		then
-			cp configs/3.1-p7/$OS/* . 
+			cp configs/3.1-p7/$MACHINE/* . 
 		else
-			cp configs/$OS/* .
+			cp configs/$MACHINE/* .
 		fi
 		./install.sh $NUMCPUS_INSTALL
@@ -164,9 +164,8 @@
 	make distclean
 	sh scripts/automakererun.sh
-	#sh configs/$OS/$OS.sh.petsc2 #use petsc2 for now
-	sh configs/$OS/$OS.sh #switch to petsc3 to debug
+	sh configs/$MACHINE/configure.sh #switch to petsc3 to debug
 
 	#4: compile and install ISSM
-	if [ "$OS" = "winxp32" ] 
+	if [ "$MACHINE" = "wineric" ] 
 	then
 		cd $ISSM_TIER/src/c
@@ -196,13 +195,4 @@
 
 #Prepare run
-#Windows hack for startup.m {{{1
-#windows environments: ISSM_TIER_WIN variable not correctly picked up when using 
-#the cron job. just get startup to take the ISSM_TIER variable as the pwd:
-if [ "$OS" = "winxp32" ]
-then
-	cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak
-	mv startup.m.bak startup.m
-fi
-#}}}
 #create softlink to startup {{{1
 cd $ISSM_TIER/test/NightlyRun/
@@ -219,5 +209,5 @@
 user:      $(echo $USER)
 host:      $(echo $HOST_NAME)
-OS:        $(echo $OS)
+OS:        $(echo $MACHINE)
 release:   $(echo $ISSM_RELEASE)
 init_path: $(echo $INIT_PATH)
@@ -312,14 +302,14 @@
 	for i in `echo $MAILINGLIST`; do
 
-		if [ "$OS" = "winxp32" ]
+		if [ "$MACHINE" = "wineric" ]
 		then
-			email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
+			email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , configuration: $MACHINE, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
 		else 
-			if [ "$OS" = "linux64" ]
+			if [ "$MACHINE" = "astrid" ]
 			then
 cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
-Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS, host: $HOST_NAME, user: $USER.
+Subject: Nightly runs of $ISSM_RELEASE, configuration: $MACHINE, host: $HOST_NAME, user: $USER.
 Mime-Version: 1.0
 Content-Type: text/html
@@ -329,5 +319,5 @@
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
-Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS, host: $HOST_NAME, user: $USER.
+Subject: Nightly runs of $ISSM_RELEASE, configuration: $MACHINE, host: $HOST_NAME, user: $USER.
 Mime-Version: 1.0
 Content-Type: text/html