Changeset 581 for trunk/src/calc_field_tps.m

Timestamp:

Mar 12, 2013, 12:52:13 PM (11 years ago)

Author:

sommeria

Message:

clean the transform field functions

File:

• trunk/src/calc_field_tps.m (modified) (5 diffs)

trunk/src/calc_field_tps.m

@@ -2 +2 @@
 %'calc_field_tps': defines fields (velocity, vort, div...) from civ data and calculate them with tps interpolation
 %---------------------------------------------------------------------
-% [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord_tps,NbSites,SubRange,FieldVar,Operation,Coord_interp)
+% [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord_tps,NbSites,SubRange,FieldVar,FieldName,Coord_interp)
 %
 % OUTPUT:
@@ -12 +12 @@
 % SubRange
 % FieldVar
-% Operation: cell array representing the list of operations (eg div, rot..)
+% FieldName: cell array representing the list of operations (eg div, rot..)
 % Coord_interp: coordiantes of sites on which the fields need to be calculated
 
-function [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord_tps,NbSites,SubRange,FieldVar,Operation,Coord_interp)
+function [DataOut,VarAttribute,errormsg]=calc_field_tps(Coord_tps,NbSites,SubRange,FieldVar,FieldName,Coord_interp)
 
 %list of defined scalars to display in menus (in addition to 'ima_cor').
@@ -44 +44 @@
 check_grid=0;
 check_der=0;
-for ilist=1:length(Operation)
-    OperationType=regexprep(Operation{ilist},'(.+','');
-    switch OperationType
+for ilist=1:length(FieldName)
+    FieldNameType=regexprep(FieldName{ilist},'(.+','');
+    switch FieldNameType
         case 'vec'
             check_grid=1;
@@ -55 +55 @@
         case {'U','V','norm'}
             check_grid=1;
-            DataOut.(OperationType)=zeros(nb_sites,1);
+            DataOut.(FieldNameType)=zeros(nb_sites,1);
             VarAttribute{1}.Role='scalar';
         case {'curl','div','strain'}
             check_der=1;
-            DataOut.(OperationType)=zeros(nb_sites,1);
+            DataOut.(FieldNameType)=zeros(nb_sites,1);
             VarAttribute{1}.Role='scalar';
     end
@@ -79 +79 @@
     end
     ListVar={};
-    for ilist=1:length(Operation)
+    for ilist=1:length(FieldName)
         var_count=numel(ListVar);
-        switch Operation{ilist}
+        switch FieldName{ilist}
             case 'vec(U,V)'
                 ListVar=[ListVar {'U', 'V'}];