Changeset 876 for trunk/src/transform_field

Timestamp:

Feb 22, 2015, 11:07:07 PM (10 years ago)

Author:

sommeria

Message:

deformation modified in civ_series and bug corrections

Location:

trunk/src/transform_field

Files:

• diff_vel.m (modified) (2 diffs)
• signal_spectrum.m (modified) (1 diff)
• sub_field.m (modified) (1 diff)

trunk/src/transform_field/diff_vel.m

@@ -1 @@
-%'sub_field': combines two input fields
+%'diff_vel': calculate the difference of two input velocity fields. 
 %
-% the two fields are subtstracted when of the same nature (scalar or
-% vector), if the coordinates do not coincide, the second field is
-% interpolated on the cooridintes of the first one
-%
-% when scalar and vectors are combined, the fields are just merged in a single matlab structure for common visualisation
+% the second velocity field is linearly interpolated 
+% (after elimination of the vectors marked with an error flag) to the positions of
+% the first one before subtraction. The ancilary data of the first field
+% are preserved while those of the second one are lost. 
+
 %-----------------------------------------------------------------------
-% function SubData=sub_field(Field,XmlData,Field_1)
+% function SubData=diff_vel(Field,XmlData,Field_1)
 %
 % OUPUT: 
@@ -14 +14 @@
 % INPUT: 
 % Field: matlab structure representing the first field
+% XmlData: not used, needed for consistency with the call of transform fct.
 % Field_1:matlab structure representing the second field
 

trunk/src/transform_field/signal_spectrum.m

@@ -1 @@
-% 'signal_spectrum': calculate and display spectrum of the current field 
+% 'signal_spectrum': calculate and display power spectrum of the current field 
 %  operate on a 1D signal or the first dimension of a higher dimensional matrix (then average over other dimensions)
 %  this function aplies the Welch method and call the function of the matlab signal processing toolbox

trunk/src/transform_field/sub_field.m

@@ -1 @@
-%'sub_field': combines two input fields
+%'sub_field': combines two input fields, taking the difference if of the same nature
 %
-% the two fields are subtstracted when of the same nature (scalar or
-% vector), if the coordinates do not coincide, the second field is
-% interpolated on the cooridintes of the first one
+% the two fields are subtracted when of the same nature (scalar or
+% vector),and defined at the same points
 %
 % when scalar and vectors are combined, the fields are just merged in a single matlab structure for common visualisation