Changeset 120 for trunk/src/civ.m

Timestamp:

Nov 9, 2010, 5:27:00 PM (14 years ago)

Author:

gostiaux

Message:

gedit

File:

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

trunk/src/civ.m

@@ -657 +657 @@
     first_i=max(field_i,1);
     
-    if strcmp(nom_type_ima,'_i_j')
+     switch nom_type_ima
+        case {'_i_j','%01dA','%02dA','%03dA','%04dA'}
         field_i=field_count;
         field_j=1;
@@ -671 +672 @@
         end
         nb_field_j=field_j-1;% last detected field number
-    end
+     end
+
     
     
@@ -677 +679 @@
     %   dt=(1/1000)*str2num(get(handles.dt,'String'));
     time=(0:nb_field-1)';% time=file index -1  by default
-    if strcmp(nom_type_ima,'_i_j')
+
+    switch nom_type_ima
+        case {'_i_j','%01dA','%02dA','%03dA','%04dA'}
         % time=[0:nb_field-1]'*ones(1,nb_field_j);% time=file index -1  by default
-        time=[0:nb_field-1]'*[0:nb_field_j-1];% time=file index -1  by default
+        [x,y]=meshgrid([0:2-1],[0:152-1]);
+        time=x+y;
+%         time=[0:nb_field-1]'*[0:nb_field_j-1];% time=file index -1  by default
     end
     
@@ -691 +697 @@
 %   last_j=1;
 % end
+
 if exist('time','var')
     if size(time,1)+size(time,2)>=3 % if there are at least two time values to define dt
@@ -2732 +2739 @@
             %% to lauch the jobs locally :
             if(isunix)
-                eval(['!. ' filename_bat ' &']);
-                display(['!. ' filename_bat ' &'])
+                cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f
+                eval(cmd_str);
+                display(cmd_str);
             else
-                eval(['!' filename_bat ' &']);
-                display(['!' filename_bat ' &'])
+                cmd_str=['!' filename_bat ' &'];
+                eval(cmd_str);
+                display(cmd_str);
             end
         end
@@ -4891 +4900 @@
 fclose(fid);
 
-cmd_CIV1=[sparam.Civ1Bin ' -f ' filename '.cmx' ]; % redirect standard output to the log file
+cmd_CIV1=[sparam.Civ1Bin ' -f ' filename '.cmx >' filename '.log' ]; % redirect standard output to the log file
 cmd_CIV1=regexprep(cmd_CIV1,'\\','\\\\');
 namelog=regexprep(namelog,'\\','\\\\');