Changeset 380 for trunk/src/calc_field.m

Timestamp:

Jan 29, 2012, 2:31:56 PM (12 years ago)

Author:

sommeria

Message:

reading of civ data, new format, improved: bugs for reading u and v repairedd

File:

• trunk/src/calc_field.m (modified) (4 diffs)

trunk/src/calc_field.m

@@ -64 +64 @@
     RoleList={};
     units_cell={};
-    % new civ data
+    
+    %% interpolation with new civ data 
     if isfield(DataIn,'X_SubRange')
         XMax=max(max(DataIn.X_SubRange));
@@ -88 +89 @@
         DataOut.V=zeros(size(XI));
         DataOut.vort=zeros(size(XI));
+        
         DataOut.div=zeros(size(XI));
         nbval=zeros(size(XI));
@@ -126 +128 @@
                         ListFields={'vort'};
                         VarAttributes{1}.Role='scalar';
-%                         EMX = [DMXY(:,:,1) PM];
-%                         EMY = [DMXY(:,:,2) PM];
-%                         DataIn.U_tps(nbvec_sub+1,isub)=0;%constant value suppressed by spatial derivatives
-%                         DataIn.V_tps(nbvec_sub+1,isub)=0;%constant value suppressed by spatial derivatives
-%                         DataIn.V_tps(nbvec_sub+2,isub)=0;% X coefficient suppressed for x wise derivatives
-%                         DataIn.U_tps(nbvec_sub+3,isub)=0;% Y coefficient suppressed for x wise derivatives
                         DataOut.vort(ind_sel)=DataOut.vort(ind_sel)+EMDY *DataIn.U_tps(1:nbvec_sub+3,isub)-EMDX *DataIn.V_tps(1:nbvec_sub+3,isub);
                     case 'div'
                         ListFields={'div'};
                         VarAttributes{1}.Role='scalar';
-%                         EMX = [DMXY(:,:,1) PM];
-%                         EMY = [DMXY(:,:,2) PM];
-%                         DataIn.U_tps(nbvec_sub+1,isub)=0;%constant value suppressed by spatial derivatives
-%                         DataIn.V_tps(nbvec_sub+1,isub)=0;%constant value suppressed by spatial derivatives
-%                         DataIn.V_tps(nbvec_sub+2,isub)=0;% X coefficient suppressed for x wise derivatives
-%                         DataIn.U_tps(nbvec_sub+3,isub)=0;% Y coefficient suppressed for x wise derivatives
                         DataOut.div(ind_sel)=DataOut.div(ind_sel)+EMDX*DataIn.U_tps(1:nbvec_sub+3,isub)+EMDY *DataIn.V_tps(1:nbvec_sub+3,isub);
                 end
@@ -161 +151 @@
         DataOut.VarAttribute={[],[]};
         DataOut.VarAttribute{3}.Role='errorflag';
-        DataOut.VarAttribute=[DataOut.VarAttribute VarAttributes];      
+        DataOut.VarAttribute=[DataOut.VarAttribute VarAttributes];   
     else   
+        
+    %% civx data    
         DataOut=DataIn;
         for ilist=1:length(FieldName)