Changeset 486 for trunk

Timestamp:

Jun 28, 2012, 11:26:31 AM (12 years ago)

Author:

sommeria

Message:

cmd modified for Windows \ + record time

File:

• trunk/src/civ.m (modified) (4 diffs)

trunk/src/civ.m

@@ -800 +800 @@
 set(handles.RUN, 'Enable','Off')
 set(handles.RUN,'BackgroundColor',[0.831 0.816 0.784])
-%batch=get(handles.RunMode,'Value');
-% batch=0;
+set(handles.RUN,'UserData',now)% record the time of launch
 errormsg=launch_jobs(hObject, eventdata, handles);
 set(handles.RUN, 'Enable','On')
@@ -895 +894 @@
     drawnow 
 end
-StatusData.time_ref=now;% store the current time
+StatusData.time_ref=get(handles.RUN,'UserData');% get the time of launch
 StatusData.option_civ=option_civ;
 set(hrefresh,'UserData',StatusData)
@@ -1319 +1318 @@
         end
         
-        % print the command in the file
+        % print the command in the bat file
         [fid,message]=fopen(filename_bat,'w');
         if isequal(fid,-1)
             errormsg=['creation of .bat file: ' message];
             return
-        end
-        if ~isunix
-            cmd=regexprep(cmd,'\\','\\\\');
         end
         fprintf(fid,cmd);
@@ -4375 +4371 @@
         cmd=[cmd sparam.CivBin ' -f ' Param.OutputFile '.xml '  CivAllCmd ' >' Param.OutputFile '.log' '\n'];
     case 'civ_matlab'
+                    switch computer
+                        case {'PCWIN','PCWIN64'}                     
+                            filename=regexprep(filename,'\\','\\\\');% add '\' so that '\' are left as characters
+                        case {'GLNX86','GLNXA64','MACI64'}
+                    end
         cmd=['civ_matlab(''' regexprep(filename,'(\w+)([/\\])(\w+$)','$1$20_XML$2$3.xml') ''','''...
             filename '.nc'');'];
     case 'civ_matlab.sh'
-        cmd=['#!/bin/bash \n '...
-            '#$ -cwd \n '...
-            'hostname && date \n '...
-            'umask 002 \n'...
-            Param.xml.CivmBin ' ' Param.xml.RunTime ' ' regexprep(filename,'(\w+)([/\\])(\w+$)','$1$20_XML$2$3.xml') ' ' Param.OutputFile '.nc'];%allow writting access to created files for user group
+        switch computer
+            case {'PCWIN','PCWIN64'}
+                filename=regexprep(filename,'\\','\\\\');% add '\' so that '\' are left as characters
+                % TODO launch command in DOS
+            case {'GLNX86','GLNXA64','MACI64'}
+                cmd=['#!/bin/bash \n '...
+                    '#$ -cwd \n '...
+                    'hostname && date \n '...
+                    'umask 002 \n'...
+                    Param.xml.CivmBin ' ' Param.xml.RunTime ' ' regexprep(filename,'(\w+)([/\\])(\w+$)','$1$20_XML$2$3.xml') ' ' Param.OutputFile '.nc'];%allow writting access to created files for user group
+        end
 end