Changeset 857 for trunk

Timestamp:

Jan 26, 2015, 3:23:10 PM (10 years ago)

Author:

sommeria

Message:

bug_corrections

Location:

trunk/src

Files:

• series.m (modified) (1 diff)
• series/merge_proj.m (modified) (2 diffs)

trunk/src/series.m

@@ -2262 +2262 @@
         if numel(SubDir)>1
             for ilist=2:numel(SubDir)
-                SubDirOut=[SubDirOut '-' SubDir{ilist}];
+                SubDirOut=[SubDirOut '-' regexprep(SubDir{ilist},'^/','')];
             end
         end

trunk/src/series/merge_proj.m

@@ -248 +248 @@
             disp_uvmat('ERROR',['ERROR in merge_proj/read_field/' errormsg],checkrun)
             return
+        end
+        ListVar=Data{iview}.ListVarName;
+        for ilist=1:numel(ListVar)
+            Data{iview}.(ListVar{ilist})=double(Data{iview}.(ListVar{ilist}));% transform all fields in double before all operations
         end
         % get the time defined in the current file if not already defined from the xml file
@@ -444 +448 @@
                             errormsg='sizes of the input matrices do not agree, need to interpolate on a common grid using a projection object';
                             return
-                        else                     
+                        else      
+                         
                             MergeData.(VarName)=MergeData.(VarName) + Data{iview}.(VarName);%add data
                             NbAver=NbAver + ~check_bad;% add 1 for good data, 0 else