Changeset 532 for trunk/src/transform_field

Timestamp:

Aug 27, 2012, 4:40:00 PM (12 years ago)

Author:

sommeria

Message:

FFT2_detrends adapted to new conventions for find_field_cells

File:

• trunk/src/transform_field/FFT2_detrend.m (modified) (4 diffs)

trunk/src/transform_field/FFT2_detrend.m

@@ -17 +17 @@
 end
 %%%%%%%%%%%%%%%%%%%%%%%%%
-[CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(DataIn);
+[CellInfo,NbDim,errormsg]=find_field_cells(DataIn);
 if ~isempty(errormsg)
     DataOut.Txt=errormsg;
@@ -24 +24 @@
 DataOut.ListVarName={};
 DataOut.VarDimName={};
-for ilist=1:numel(CellVarIndex)
-    if NbDim(ilist)==2 && numel(CellVarType{ilist}.coord)==2 % field with structured coordinates
+for ilist=1:numel(CellInfo)
+    if NbDim(ilist)==2 && numel(CellInfo{ilist}.CoordIndex)==2 % field with structured coordinates
         %process coordinates
-        CoordName=DataIn.ListVarName(CellVarType{ilist}.coord);
+        CoordName=DataIn.ListVarName(CellInfo{ilist}.CoordIndex);
         x1 = DataIn.(CoordName{2}); y1 = DataIn.(CoordName{1});
         [x y] = meshgrid(x1,y1);
@@ -48 +48 @@
         end
         %process scalar
-        ivar=CellVarType{ilist}.scalar(1);
+        ivar=CellInfo{ilist}.VarIndex_scalar(1);
         VarName=DataIn.ListVarName{ivar};
         z=DataIn.(VarName);
@@ -61 +61 @@
         DataOut.(VarName) = spec2;
         spec_sum=sum(sum(spec2));
-        kx_mean=sum(sum(spec2.*kx))/spec_sum
-        ky_mean=sum(sum(spec2.*ky))/spec_sum
-        theta=atand(ky_mean/kx_mean)
-        lambda=2*pi/(sqrt(kx_mean*kx_mean+ky_mean*ky_mean))
-        %DataOut.ListVarName=[CoordName {VarName} {'kx'} {'ky'}];%list of variables
-        %DataOut.VarDimName=[CoordName {CoordName} {'one'} {'one'}];%list of dimensions for variables
+        kx_mean=sum(sum(spec2.*kx))/spec_sum;
+        ky_mean=sum(sum(spec2.*ky))/spec_sum;
+        theta=atand(ky_mean/kx_mean);
+        lambda=2*pi/(sqrt(kx_mean*kx_mean+ky_mean*ky_mean));
         
         DataOut.ListVarName=[CoordName {VarName}];%list of variables