Changeset 5615

Timestamp:

08/27/10 13:17:34 (15 years ago)

Author:

Mathieu Morlighem

Message:

Do not verbose compressed and uncompressed files while taring

Location:

issm/trunk/src/m/classes/public/queue

Files:

• BuildQueueingScript.m (modified) (1 diff)
• ClusterLaunchCommand.m (modified) (1 diff)
• LaunchQueueJob.m (modified) (1 diff)

issm/trunk/src/m/classes/public/queue/BuildQueueingScript.m

@@ -13 +13 @@
 fid=fopen([md.name '.queue'],'w');
 if fid==-1,
-        error(['BuildQueueingScripterror message: could not open ' [md.name '.queue'] ' file for ascii writing']);
+        error(['BuildQueueingScript error message: could not open ' [md.name '.queue'] ' file for ascii writing']);
 end
 

issm/trunk/src/m/classes/public/queue/ClusterLaunchCommand.m

@@ -7 +7 @@
 %if cluster is current hostname, just source queue file
 if strcmpi(oshostname(),cluster),
-        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && source  ' name '.queue '];
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && source  ' name '.queue '];
+elseif strcmpi(cluster,'cosmos'),
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && qsub -S/bin/sh ' name '.queue '];
+elseif strcmpi(cluster,'gemini'),
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && qsub ' name '.queue '];
+elseif strcmpi(cluster,'pollux'),
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && qsub ' name '.queue '];
+elseif strcmpi(cluster,'castor'),
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && qsub ' name '.queue '];
+elseif strcmpi(cluster,'pfe'),
+        command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxf ' runtimename '.tar.gz  && qsub ' name '.queue '];
 else
-        if strcmpi(cluster,'cosmos'),
-                command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && qsub -S/bin/sh ' name '.queue '];
-        elseif strcmpi(cluster,'gemini'),
-                command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && qsub ' name '.queue '];
-        elseif strcmpi(cluster,'pollux'),
-                command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && qsub ' name '.queue '];
-        elseif strcmpi(cluster,'castor'),
-                command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && qsub ' name '.queue '];
-        elseif strcmpi(cluster,'pfe'),
-                command=['cd ' executionpath ' && rm -rf ./' runtimename ' && mkdir ' runtimename ' && cd ' runtimename ' && mv ../' runtimename '.tar.gz ./ && tar -zxvf ' runtimename '.tar.gz  && qsub ' name '.queue '];
-        else
-                error('ClusterLaunchCommand error message: unknown cluster command');
-        end
+        error('ClusterLaunchCommand error message: unknown cluster command');
 end

issm/trunk/src/m/classes/public/queue/LaunchQueueJob.m

@@ -22 +22 @@
         
         %compress the files into one zip.
-        compressstring=['tar -zcvf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '];
+        compressstring=['tar -zcf ' md.runtimename '.tar.gz ' md.name '.bin ' md.name '.queue '];
         if md.qmu_analysis,
                 compressstring=[compressstring md.name '.qmu.in'];