Changeset 93 for trunk/src/series

Timestamp:

May 27, 2010, 7:25:58 PM (14 years ago)

Author:

sommeria

Message:

FFT: improved to deal with NaN data
merge_proj: corrected to reproduce dt if unique
uvmat.fig: tooltip corrected
plot_field: bug for isocontour corrected,
im_filter: cleaning
phys_polar: spatial derivative included (still to check)
set_obeject.fig: minor correction
struct2nc: comments improved
uvmat: button NB implemented
read_civxdata: error message improved

File:

• trunk/src/series/merge_proj.m (modified) (6 diffs)

trunk/src/series/merge_proj.m

@@ -267 +267 @@
                     Field{iview}.VarAttribute=SubField.VarAttribute;
                 end
+                if isfield(Field{iview},'Txt')
+                    msgbox_uvmat('ERROR',Field{iview}.Txt)
+                    return
+                end
                 if isfield(Field{iview},'Time')
                     timeread(iview)=Field{iview}.Time;
@@ -280 +284 @@
                 Field{iview}=transform_fct(Field{iview},XmlData{iview});%transform to phys if requested
             end
-            min(Field{iview}.X)
             if testcivx
                     Field{iview}=calc_field(FieldName,Field{iview});
             end
-            min(Field{iview}.X)
 
             %projection on object (gridded plane)
@@ -350 +352 @@
             MergeData.nb_coord=2;
             MergeData.nb_dim=2;
-            MergeData.dt=1;
+            dt=[];
+            if isfield(Field{1},'dt')&& isnumeric(Field{1}.dt)
+                dt=Field{1}.dt;
+            end
+            for iview =2:numel(Field)
+                if ~(isfield(Field{iview},'dt')&& isequal(Field{iview}.dt,dt))
+                    dt=[];%dt not the same for all fields
+                end
+            end
+            if isempty(dt)
+                MergeData.ListGlobalAttribute(6)=[];
+            else
+               MergeData.dt=dt;
+            end
+            %MergeData.dt=1;
             MergeData.Time=time_i;
             error=struct2nc(mergename,MergeData); %save result file
@@ -387 +403 @@
     return
 end
+
+
+
 
 %group the variables (fields of 'FieldData') in cells of variables with the same dimensions
@@ -412 +431 @@
         test_grid=0;
     end
-%    DimIndices=Data{1}.VarDimIndex{VarIndex(1)};%indices of the dimensions of the first variable (common to all variables in the cell)
     %case of input fields with unstructured coordinates
     if ~test_grid
@@ -423 +441 @@
     %case of fields defined on a structured  grid 
     else  
-%        DimValue=MergeData.DimValue(DimIndices);%set of dimension values
         testFF=0;
         for iview=2:nbview
-%             if ~isequal(DimValue,Data{iview}.DimValue(DimIndices))
-%                 MergeData.Txt='ERROR: attempt at merging structured fields with different sizes';
-%                 return
-%             end
             for ivar=VarIndex
                 VarName=MergeData.ListVarName{ivar};