Changeset 385 for trunk/src

Timestamp:

Mar 29, 2012, 4:50:42 PM (13 years ago)

Author:

sommeria

Message:

bug corrected in find_file_series

Location:

trunk/src

Files:

• check_field_structure.m (modified) (1 diff)
• find_file_series.m (modified) (4 diffs)

trunk/src/check_field_structure.m

@@ -115 +115 @@
         else % DimName is detected in the current list of dimension names
             if ~isequal(Data.DimValue(iprev),sizvar(idim))
-                Data.DimValue(iprev)
-                sizvar(idim)
                 if isequal(Data.DimValue(iprev),2)&& RangeTest(iprev)  % the dimension has been already detected as a range [min max]
                     Data.DimValue(iprev)=sizvar(idim); %update with actual value

trunk/src/find_file_series.m

@@ -67 +67 @@
     NomTypePref='';
     RootFileNew=RootFile;
-    if ~isempty(regexp(NomType,['^_']))
-        NomTypePref='_';
-        RootFileNew=[RootFileNew '_'];
-    end
-    r=regexp(NomType,['^' NomTypePref '(?<num1>\d+)'],'names');%look for a number at the beginning of NomTypeSt
+%     if ~isempty(regexp(NomType,['^_']))
+%         NomTypePref='_';
+%         RootFileNew=[RootFileNew '_'];
+%     end       RootPath='';
+    r=regexp(NomType,'^(?<tiretnum>_?\d+)','names');%look for a number or _1 at the beginning of NomType
+%     r=regexp(NomType,['^' NomTypePref '(?<num1>\d+)'],'names');%look for a number at the beginning of NomTypeSt
     if ~isempty(r)
-        NomTypePref=[NomTypePref r.num1];
+        NomTypePref=r.tiretnum;
         fileinput_end=regexprep(fileinput,['^' RootFileNew],'');
         r=regexp(fileinput_end,'^(?<num1>\d+)','names');
@@ -85 +86 @@
             j1_input=[];
             j2_input=[];
+        else
+            NomTypePref='';
         end
     end
@@ -154 +157 @@
     ref_j_list=zeros(1,nbpair);
     if nbpair==0% no detected file
-        RootPath='';
+%         RootPath='';
         RootFile='';
     end
@@ -223 +226 @@
     [tild,ifile_min]=min(ref_ij(ref_ij>0));
     if isempty(ifile_min)
-        RootPath='';
+%         RootPath='';
         RootFile='';
         NomType='';