Changeset 515 for trunk/src/find_field_cells.m

Timestamp:

Aug 15, 2012, 11:36:12 PM (12 years ago)

Author:

sommeria

Message:

improvement of calc-field and combination of two fields

File:

• trunk/src/find_field_cells.m (modified) (9 diffs)

trunk/src/find_field_cells.m

@@ -19 +19 @@
 %      .scalar: scalar field (default)
 %      .coord: vector of indices of coordinate variables corresponding to matrix dimensions
+%
+%      .FieldRequest= 'interp', 'derivatives' indicate whether interpolation  or derivatives (tps) is needed to calculate the requested field
+%      .FieldNames = cell of fields to calculate from the fied cell
+%
 % errormsg: error message
 %   
@@ -49 +53 @@
 %     GNU General Public License (file UVMAT/COPYING.txt) for more details.for input in proj_field and plot_field
 %    group the variables  into 'fields' with common dimensions
-%------------------------------------------------------------------------
-% function  [CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(Data)
-%
-% OUTPUT:
-% CellVaxIndex: cell whose elements are arrays of indices in the list data.ListVarName  
-%              CellvarIndex{i} represents a set of variables with the same dimensions
-% NbDim: array with the length of CellVarIndex, giving its  space dimension
-% CellVarType: cell array of structures with fields
-%      .coord_x, y, z: indices (in .ListVarname) of variables representing  unstructured coordinates x, y, z 
-%      .vector_x,_y,_z: indices of variables giving the vector components x, y, z
-%      .warnflag: index of warnflag
-%      .errorflag: index of error flag
-%      .ancillary: indices of ancillary variables
-%      .image   : B/W image, (behaves like scalar)
-%      .color : color image, the last index, which is not a coordinate variable, represent the 3 color components rgb
-%      .discrete: like scalar, but set of data points without continuity, represented as dots in a usual plot, instead of continuous lines otherwise
-%      .scalar: scalar field (default)
-%      .coord: vector of indices of coordinate variables corresponding to matrix dimensions
-% errormsg: error message
-%   
-% INPUT:
-% Data: structure representing fields, output of check_field_structure
-%            .ListVarName: cell array listing the names (cahr strings) of the variables
-%            .VarDimName: cell array of cells containing the set of dimension names for each variable of .ListVarName
-%            .VarAttribute: cell array of structures containing the variable attributes: 
-%                     .VarAttribute{ilist}.key=value, where ilist is the variable
-%                     index, key is the name of the attribute, value its value (char string or number)
-%
-% HELP: 
-% to get the dimensions of arrays common to the field #icell
-%         VarIndex=CellVarIndex{icell}; % list of variable indices
-%         DimIndex=Data.VarDimIndex{VarIndex(1)} % list of dimensions for each variable in the cell #icell
-%
-%AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-%  Copyright Joel Sommeria, 2008, LEGI / CNRS-UJF-INPG, sommeria@coriolis-legi.org.
-%AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-%     This file is part of the toolbox UVMAT.
-% 
-%     UVMAT is free software; you can redistribute it and/or modify
-%     it under the terms of the GNU General Public License as published by
-%     the Free Software Foundation; either version 2 of the License, or
-%     (at your option) any later version.
-% 
-%     UVMAT is distributed in the hope that it will be useful,
-%     but WITHOUT ANY WARRANTY; without even the implied warranty of
-%     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%     GNU General Public License (file UVMAT/COPYING.txt) for more details.
-%AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
 function [CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(Data)
 CellVarIndex={};
 
-NbDim=[];
 CellVarType=[];
 errormsg=[];
@@ -108 +63 @@
 
 NbDim=[];
-ivardim=0;
 VarDimIndex=[];
 VarDimName={};
@@ -116 +70 @@
 end
 
-%% role of variables
+%% role of variables and list of requested operations
 Role=num2cell(blanks(nbvar));%initialize a cell array of nbvar blanks
+FieldRequest=regexprep(Role,' ',''); % fieldRequest set to '' by default
+Operation=cell(size(Role)); % fieldRequest set to {} by default
+CheckSub=zeros(size(Role));% =1 for fields to substract
 Role=regexprep(Role,' ','scalar'); % Role set to 'scalar' by default
 if isfield(Data,'VarAttribute')
@@ -124 +81 @@
             Role{ivar}=Data.VarAttribute{ivar}.Role;
         end
+        if isfield(Data.VarAttribute{ivar},'FieldRequest')
+            FieldRequest{ivar}=Data.VarAttribute{ivar}.FieldRequest;
+        end
+        if isfield(Data.VarAttribute{ivar},'Operation')
+            Operation{ivar}=Data.VarAttribute{ivar}.Operation;
+        end
+        if isfield(Data.VarAttribute{ivar},'CheckSub')
+            CheckSub(ivar)=Data.VarAttribute{ivar}.CheckSub;
+        end
     end
 end
 
 %% loop on the list of variables, group them by common dimensions
+CellVarType=cell(1,length(CellVarIndex));
 for ivar=1:nbvar
     if ischar(Data.VarDimName{ivar})
@@ -146 +113 @@
         icell=icell+1;
         CellVarIndex{icell}=ivar;%put the current variable index in the new cell 
-        NbDim(icell)=numel(DimCell);%default
-    end
-   
-    %look for dimension variables
-%     if numel(DimCell)==1% if the variable has a single dimension 
-%         if strcmp(DimCell{1},Data.ListVarName{ivar}) %|| strcmp(Role{ivar},'dimvar')
-%             ivardim=ivardim+1;
-%             VarDimIndex(ivardim)=ivar;%index of the variable
-%             VarDimName{ivardim}=DimCell{1};%name of the dimension
-%         end
-%     end
+        NbDim(icell)=numel(DimCell);%default   
+        CellVarType{icell}=[];
+    end
+    if ~isempty(FieldRequest{ivar})
+       CellVarType{icell}.FieldRequest=FieldRequest{ivar};
+    end
+    if ~isempty(Operation{ivar})
+       CellVarType{icell}.Operation=Operation{ivar};
+    end
+    if CheckSub(ivar)
+    CellVarType{icell}.CheckSub=1;
+    end
 end
 
@@ -163 +131 @@
 ind_dim_var_cell=find(checksinglecell);
 %CoordType(ind_dim_var_cell)='dim_var';% to be used in output
+%VarDimIndex=cell(size(ind_dim_var_cell));
+VarDimName=cell(size(ind_dim_var_cell));
 for icoord=1:numel(ind_dim_var_cell)
-VarDimIndex(icoord)=CellVarIndex{ind_dim_var_cell(icoord)};
-VarDimName{icoord}=Data.VarDimName{VarDimIndex(icoord)}{1};
+    VarDimIndex(icoord)=CellVarIndex{ind_dim_var_cell(icoord)};
+    VarDimName{icoord}=Data.VarDimName{VarDimIndex(icoord)}{1};
 end
 
@@ -201 +171 @@
 
 index_remove=[];
-CellVarType=cell(1,length(CellVarIndex));
 for icell=1:length(CellVarIndex)
     if checksinglecell(icell)
@@ -262 +231 @@
                     coord(idim)=VarDimIndex(ind_coord);
                 end
-%                 for ivardim=1:numel(VarDimName)
-%                     if strcmp(VarDimName{ivardim},DimCell{idim})
-%                         coord(idim)=VarDimIndex(ivardim);
-%                         break
-%                     end
-%                 end
             end
             NbDim(icell)=numel(find(coord));