Changeset 747 for trunk/src/read_field.m

Timestamp:

Apr 22, 2014, 9:44:39 AM (10 years ago)

Author:

sommeria

Message:

adpatations to 3D fields

File:

• trunk/src/read_field.m (modified) (3 diffs)

trunk/src/read_field.m

@@ -36 +36 @@
 errormsg='';
 if ~exist(FileName,'file')
-    erromsg=['input file ' FileName ' does not exist'];
+    errormsg=['input file ' FileName ' does not exist'];
     return
 end
@@ -92 +92 @@
                 end
             else  % an operator 'vec' or 'norm' is used
-                %Operator=r.Operator;
                 if ~check_colorvar(ilist) && strcmp(r.Operator,'norm')
                     ProjModeRequestVar='interp_lin';%scalar field (requires interpolation for plot)
@@ -121 +120 @@
         end
         if isfield(ParamIn,'TimeDimName')% case of reading of a single time index in a multidimensional array
-            [Field,var_detect,ichoice]=nc2struct(FileName,'TimeDimName',ParamIn.TimeDimName,num,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
-        else
-            [Field,var_detect,ichoice]=nc2struct(FileName,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
-        end
-        if isfield(Field,'Txt')
-            errormsg=Field.Txt;
+            [Field,var_detect,ichoice,errormsg]=nc2struct(FileName,'TimeDimName',ParamIn.TimeDimName,num,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
+        elseif isfield(ParamIn,'TimeVarName')% case of reading of a single time  in a multidimensional array
+            [Field,var_detect,ichoice,errormsg]=nc2struct(FileName,'TimeVarName',ParamIn.TimeVarName,num,[ParamIn.Coord_x (ParamIn.Coord_y) ListVar]);
+        else
+            [Field,var_detect,ichoice,errormsg]=nc2struct(FileName,[ParamIn.Coord_x (ParamIn.Coord_y) (ParamIn.Coord_z) ListVar]);
+        end
+        if ~isempty(errormsg)
             return
         end