Changeset 1599

Timestamp:

08/06/09 08:11:17 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed nightly run parallel

Location:

issm/trunk/src/m/utils

Files:

• Nightly/testsgetpackage.m (modified) (1 diff)
• OS/scpin.m (modified) (2 diffs)

issm/trunk/src/m/utils/Nightly/testsgetpackage.m

@@ -24 +24 @@
 
 elseif strcmpi(string,'cielo_parallel'),
-
-        %get hostname (and remove spaces with strtrim)
-        [ret,name]=system('hostname');
-        if ret,
-                if ispc
-                        name=getenv('COMPUTERNAME');
-                else
-                        name=getenv('HOSTNAME');
-                end
-        end
-        md.cluster=strtrim(lower(name));
-
-        %assign package
         package='cielo';
+        md.cluster=oshostname;
 
 else

issm/trunk/src/m/utils/OS/scpin.m

@@ -10 +10 @@
 
 %first be sure packages are not in the current directory, this could conflict with pscp on windows. 
+%get initial warning mode
+state=warning('query', 'all');
+%remove warnings in case the files do not exist
+warning off
 for i=1:numel(packages),
         delete(packages{i});
 end
+%back to initial warning state
+warning(state);
 
 %if hostname and host are the same, do a simple copy
@@ -18 +24 @@
 
     for i=1:numel(packages),
-                copyfile(packages{i});
+                copyfile([path '/' packages{i}]);
         end