Changeset 1095 for trunk/src/proj_field.m

Timestamp:

Mar 31, 2021, 3:32:03 PM (4 years ago)

Author:

sommeria

Message:

reading mat files added, +-fixed,OpenDAP improved

File:

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

trunk/src/proj_field.m

@@ -1126 +1126 @@
 ProjMode=regexprep(ProjMode,' ',ObjectData.ProjMode);
 icell_grid=[];% field cell index which defines the grid
+icell_scattered=[];% field cell index which defines fields with scattered coordinates
 if strcmp(ObjectData.ProjMode,'projection')
     %% case of a grid requested by the input field
@@ -1131 +1132 @@
         if isfield(CellInfo{icell},'ProjModeRequest')
             switch CellInfo{icell}.ProjModeRequest
-                case 'interp_lin'
-                    ProjMode{icell}='interp_lin';
+%                 case 'interp_lin'
+%                     ProjMode{icell}='interp_lin';
                 case 'interp_tps'
                     ProjMode{icell}='interp_tps';
@@ -1146 +1147 @@
             end
             check_grid(icell)=1;
+        elseif strcmp(CellInfo{icell}.CoordType,'scattered')
+            icell_scattered=icell;
         end
     end
@@ -1201 +1204 @@
     ProjData.VarAttribute{1}.Role='coord_y';
     ProjData.VarAttribute{2}.Role='coord_x';
+    if ~isempty(icell_grid)
             YAttribute=FieldData.VarAttribute{CellInfo{icell_grid}.CoordIndex(NbDim-1)};
         XAttribute=FieldData.VarAttribute{CellInfo{icell_grid}.CoordIndex(NbDim)};
+    elseif ~isempty(icell_scattered)
+        NbDim=NbDimArray(icell_scattered);
+        YAttribute=FieldData.VarAttribute{CellInfo{icell_scattered}.CoordIndex(NbDim-1)};
+        XAttribute=FieldData.VarAttribute{CellInfo{icell_scattered}.CoordIndex(NbDim)};
+    end
     if ~testangle 
         if isfield(YAttribute,'units')