Changeset 492 for palm/trunk

Timestamp:

Feb 26, 2010 1:28:22 PM (14 years ago)

Author:

maronga

Message:

bugfix in the UTIL Makefile

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (3 diffs)
• SCRIPTS/subjob (modified) (7 diffs)
• UTIL/Makefile (modified) (2 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -112 +112 @@
      #                    implemented, remoted mode option -r completely
      #                    removed, t3e related parts removed
-     # 26/02/10 - BjornM- re-adjustments for lcxt4
+     # 26/02/10 - BjornM- re-adjustments for lcxt4 (new modules)
 
 
@@ -1056 +1056 @@
           then
 
-             print ". /opt/modules/default/init/ksh; module load Base-opts/2.1.56HDA; module load modules/3.1.6; module load pmi; module load pgi/9.0.4; module load PrgEnv-pgi/2.1.56HDA; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
+             print ". /opt/modules/default/init/ksh; module load Base-opts; module load modules; module load pmi; module load pgi; module load PrgEnv-pgi; cd ${remote_md}; echo $make_call_string > LAST_MAKE_CALL; chmod u+x LAST_MAKE_CALL; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
 
           else
@@ -1193 +1193 @@
           then
 
-             print ". /opt/modules/default/init/ksh; module load Base-opts/2.1.56HDA; module load modules/3.1.6; module load pmi; module load pgi/9.0.4; module load PrgEnv-pgi/2.1.56HDA; cd ${remote_ud}; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
+             print ". /opt/modules/default/init/ksh; module load Base-opts; module load modules; module load pmi; module load pgi; module load PrgEnv-pgi; cd ${remote_ud}; $make_call_string; [[ \$? != 0 ]] && echo MAKE_ERROR" | ssh  ${remote_username}@${remote_addres} 2>&1 | tee ${remote_host}_last_make_protokoll
 
           else

palm/trunk/SCRIPTS/subjob

@@ -113 +113 @@
      # 01/02/10 - Siggi - adapted for lcxt5m and lckyoto (Fujitsu HX600)
      # 03/02/10 - Siggi - bug in serial jobs removed
-     # 26/02/10 - BjornM- re-adjustments for lcxt4
+     # 26/02/10 - BjornM- re-adjustments for lcxt4 (new modules, email
+     #                    notification)
 
 
@@ -716 +717 @@
 #PBS -l pmem=${memory}mb
 #PBS -m abe
-#PBS -M maronga@muk.uni-hannover.de
 #PBS -o $remote_dayfile
 #PBS -j oe
@@ -732 +732 @@
 #PBS -l pmem=${memory}mb
 #PBS -m abe
-#PBS -M maronga@muk.uni-hannover.de
 #PBS -o $remote_dayfile
 #PBS -j oe
@@ -858 +857 @@
 #PBS -l mppnppn=${tasks_per_node}
 #PBS -m abe
-#PBS -M maronga@muk.uni-hannover.de
-#PBS -o $remote_dayfile
+#PBS -o $remote_dayfile
+$email_directive
 
 . /opt/modules/default/init/ksh
@@ -867 +866 @@
 module load moab
 module load torque
-
+module load pmi
 
 %%END%%
@@ -882 +881 @@
 #PBS -l pmem=${memory}mb
 #PBS -m abe
-#PBS -M maronga@muk.uni-hannover.de
+$email_directive
 #PBS -o $remote_dayfile
 
@@ -891 +890 @@
 module load moab
 module load torque
+module load pmi
 
 %%END%%

palm/trunk/UTIL/Makefile

@@ -4 +4 @@
 # -----------------
 # compare_palm_logs added
-# 
+# added PROG3 in 'all:' statement (line 39, bugfix)
 #
 # Former revisions:
@@ -37 +37 @@
 
 
-all: $(PROG1) $(PROG2)
+all: $(PROG1) $(PROG2) $(PROG3)
 
 $(PROG1): $(OBJS1)