Changeset 472 for trunk/src/read_field.m

Timestamp:

Jun 25, 2012, 12:12:24 AM (12 years ago)

Author:

sommeria

Message:

many bugs repaired. series set to work in mode background

File:

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

trunk/src/read_field.m

@@ -57 +57 @@
                 FieldList=calc_field;%list of possible fields for Civx data
                 ParamOut.ColorVar='';%default
-                field_index=strcmp(ParamIn.FieldName,FieldList);%look for ParamIn.FieldName in the list of possible fields for Civx data
+                if ischar(ParamIn.FieldName)
+                    FieldName=ParamIn.FieldName;
+                else
+                    FieldName=ParamIn.FieldName{1};
+                end
+                field_index=strcmp(FieldName,FieldList);%look for ParamIn.FieldName in the list of possible fields for Civx data
                 if isempty(find(field_index,1))% ParamIn.FieldName is not in the list, check whether Civx data exist
                     Data=nc2struct(FileName,'ListGlobalAttribute','Conventions','absolut_time_T0','civ','CivStage');
@@ -66 +71 @@
                         InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
                         [Field,ParamOut.VelType,errormsg]=read_civdata(FileName,InputField,ParamIn.VelType,Data.CivStage);
+                        if ~isempty(errormsg),errormsg=['read_civdata:' errormsg];return,end
                         CivStage=Field.CivStage;
                         ParamOut.CivStage=Field.CivStage;
@@ -74 +80 @@
                         InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
                         [Field,ParamOut.VelType]=read_civxdata(FileName,InputField,ParamIn.VelType);
+                        if ~isempty(errormsg),errormsg=['read_civxdata:' errormsg];return,end
                         CivStage=Field.CivStage;
                         ParamOut.CivStage=Field.CivStage;
@@ -84 +91 @@
                         end
                     end
-                else
-                    InputField={ParamOut.FieldName};
+                else              
+                    InputField=ParamOut.FieldName;
+                    if ischar(InputField)
+                        InputField={InputField};
+                    end
                     if isfield(ParamIn,'ColorVar')
                         ParamOut.ColorVar=ParamIn.ColorVar;
@@ -91 +101 @@
                     end
                     [Field,ParamOut.VelType,errormsg]=read_civxdata(FileName,InputField,ParamIn.VelType);
-                    if ~isempty(errormsg)
-                        return
-                    end
+                    if ~isempty(errormsg),errormsg=['read_civxdata:' errormsg];return,end
                     CivStage=Field.CivStage;
                     ParamOut.CivStage=Field.CivStage;
@@ -123 +131 @@
                         Tabcell{iline,1}=Field.ListGlobalAttribute{iline};
                         if isfield(Field, Field.ListGlobalAttribute{iline})
-                            eval(['val=Field.' Field.ListGlobalAttribute{iline} ';'])
+                            val=Field.(Field.ListGlobalAttribute{iline});
                             if ischar(val);
                                 Tabcell{iline,2}=val;
@@ -160 +168 @@
     end
 catch ME
-    errormsg=ME.message;
+    errormsg=[FileType ' input: ' ME.message];
     return
 end