Changeset 406 for trunk/src/read_civdata.m

Timestamp:

May 3, 2012, 7:30:05 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected in civ_matlab and object projection

File:

• trunk/src/read_civdata.m (modified) (6 diffs)

trunk/src/read_civdata.m

@@ -48 +48 @@
 
 function [Field,VelTypeOut,errormsg]=read_civdata(filename,FieldNames,VelType,CivStage)
-errormsg='';
+
 %% default input
 if ~exist('VelType','var')
@@ -62 +62 @@
     FieldNames=[]; %default
 end
+errormsg='';
 
 %% reading data
 [varlist,role,units,VelTypeOut]=varcivx_generator(FieldNames,VelType,CivStage);
-[Field,vardetect]=nc2struct(filename,varlist);%read the variables in the netcdf file
+if isempty(varlist)
+    erromsg=['error in read_civdata: unknow velocity type ' VelType];
+    return
+else
+    [Field,vardetect]=nc2struct(filename,varlist);%read the variables in the netcdf file
+end
 if isfield(Field,'Txt')
     errormsg=Field.Txt;
@@ -106 +112 @@
 %            if vel_type=[] or'*', a  priority choice is done, civ2 considered better than civ1 )
 
-function [var,role,units,vel_type_out]=varcivx_generator(FieldNames,vel_type,CivStage) 
+function [var,role,units,vel_type_out,errormsg]=varcivx_generator(FieldNames,vel_type,CivStage) 
 
 %% default input values
@@ -113 +119 @@
 if ~exist('FieldNames','var'),FieldNames={'ima_cor'};end;%default scalar 
 if ischar(FieldNames), FieldNames={FieldNames}; end;
+errormsg='';
 
 %% select the priority order for automatic vel_type selection
@@ -127 +134 @@
     end
 end
-if isempty(vel_type)
+if isempty(vel_type)||strcmp(vel_type,'*')
     switch CivStage
         case {6} %filter2 available
@@ -146 +153 @@
     vel_type='filter1';
 end
-
+var={};
 switch vel_type
     case 'civ1'