Index: /trunk/src/find_field_bounds.m =================================================================== --- /trunk/src/find_field_bounds.m (revision 892) +++ /trunk/src/find_field_bounds.m (revision 893) @@ -41,7 +41,12 @@ NbDim=max(NbDimArray);% spatial dimension of the input field imax=find(NbDimArray==NbDim);% indices of field cells to consider +Check4D=0; +if NbDim>3 + NbDim=3; + Check4D=1; +end FieldOut.NbDim=NbDim; if NbDim<=1; return; end% stop here for 1D fields - + %% get bounds and mesh (needed to propose default options for projection objects) % if NbDim>1 @@ -57,4 +62,7 @@ CoordMin(ind,NbDim-1)=min(min(Field.(CoordName)(1:end-3,2,:),[],1),[],3);% min of y component (2D case) else + if Check4D + CellInfo{imax(ind)}.CoordIndex(4:end)=[]; + end XName=Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(end)}; YName=Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(end-1)}; @@ -66,6 +74,6 @@ if NbDim==3 ZName=Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(1)}; - CoordMax(ind,1)=max(max(Field.(ZName))); - CoordMin(ind,1)=min(min(Field.(ZName))); + CoordMax(ind,NbDim-2)=max(max(Field.(ZName))); + CoordMin(ind,NbDim-2)=min(min(Field.(ZName))); end end @@ -77,4 +85,7 @@ case 'grid'%structured coordinate NbPoints=CellInfo{imax(ind)}.CoordSize;% nbre of points in each direction + if Check4D + NbPoints=NbPoints(1:3); + end Mesh(ind)=min((CoordMax(ind,:)-CoordMin(ind,:))./(NbPoints-1)); end Index: /trunk/src/script_readlvm.m =================================================================== --- /trunk/src/script_readlvm.m (revision 893) +++ /trunk/src/script_readlvm.m (revision 893) @@ -0,0 +1,179 @@ +%% get the input file +fileinput=uigetfile_uvmat('pick an input file','/fsnet/project/coriolis/2015/15STRATJET/Probes'); +[Path,Name,Ext]=fileparts(fileinput); + +%% read the input file +FileType=''; +if strcmp(Ext,'.lvm') + disp(['reading ' fileinput '...']) +Data=read_lvm(fileinput) +elseif strcmp(Ext,'.nc') + disp(['reading ' fileinput '...']) + Data=nc2struct(fileinput) +else + disp('invalid input file extension') +end + +%% save as netcdf file if it has been opened as .lvm +if strcmp(Ext,'.lvm') + OutputFile=fullfile(Path,[Name '.nc']); + errormsg=struct2nc(OutputFile,Data);% copy the data in a netcdf file + if isempty(errormsg) + disp([OutputFile ' written']) + else + disp(errormsg) + end + [success,msg] = fileattrib(OutputFile,'+w','g')% allow writing access for the group of users +end + +%% use calibration data stored in an xml file +ProbeDoc=[]; +XmlFile=fullfile(Path,[Name '.xml']); +if exist(XmlFile,'file') + ProbeDoc=xml2struct(XmlFile); +end +% if isfield(Data,'Position'), C2,C4,C6 +% Min=1; +% Data.Position=Data.Position+PositionMin; +% end +% a5=-2.134088,b5=1010.1611, +% Data.C2=Data.C2; +% Data.C5=a5*Data.C5+b5; +% Data.C6=Data.C2; +% ylabelstring='density drho (kg/m3)'; + +%% treqnsform conductivity probe signals: calibration + filter at 10 Hz +ylabelstring='conductivity signal (volts)'; +clist=0;% counter of conductivity probes +for ilist=1:numel(Data.ListVarName) + if isequal(Data.ListVarName{ilist}(1),'C');% if the var name begins by 'C' + clist=clist+1; + CName{clist}=Data.ListVarName{ilist}; + if isfield(ProbeDoc,CName{clist})&& ~isempty(ProbeDoc.(CName{clist})) + a=ProbeDoc.(CName{clist}).a; + b=ProbeDoc.(CName{clist}).b; + Data.(CName{clist})=a*Data.(CName{clist})+b;% transform volt signal into density + Data.(CName{clist})=filter(ones(1,20)/20,1,Data.(CName{clist})); % filter the signal to 10 Hz + ylabelstring='density drho (g/cm3)'; + end + end +end + +%% plot conductivity probe signals +figure(1) +set(1,'name','conductivity') +plot_string='plot('; +for clist=1:numel(CName) + plot_string=[plot_string 'Data.Time,Data.' CName{clist} ',']; +end +plot_string(end)=')'; +eval(plot_string) +legend(CName') +htitle=title([Data.Experiment ', ' Data.FileName ', Time=' Data.DateTime ', conductivity probes']); +set(htitle,'Interpreter','none')% desable tex interpreter +xlabel('Time(s)') +ylabel(ylabelstring) +grid on + +if isfield(Data,'Position') + %% plot motor position + figure(2) + set(2,'name','position') + plot(Data.Time,Data.Position) + htitle=title([Data.Experiment ', ' Data.FileName ', Time=' Data.DateTime ', probe position ']); + set(htitle,'Interpreter','none')% desable tex interpreter + xlabel('Time(s)') + ylabel('Z (cm)') + grid on + hold on + plot(Data.Time,Data.Speed) + + %%plot first profile + figure(4) + index1=find(Data.Speed<0,1); %start of descent + Speed=Data.Speed(index1:end); + index2=index1-1+find(Speed>0,1); %end of descent + plot(Data.Position(index1:index2),Data.C1(index1:index2)) + + %% plot conductivity probe profiles (limited to downward motion, Data.Speed<0) + if ~isempty(ProbeDoc) + figure(3) + set(3,'name','profiles') + Zmotor=Data.Position(Data.Speed<0); + Z=Zmotor*ones(1,numel(CName));%motor position transformed in a matrix with a columnfor each probe + Zmax=max(Zmotor); + plot_string='plot('; + for clist=1:numel(CName) + if isfield(ProbeDoc,CName{clist})&& ~isempty(ProbeDoc.(CName{clist})) && size(ProbeDoc.(CName{clist}).Position,2)>=2 % if at least two positions are defined to indicate that the probe moves + Zprobe=Zmotor-Zmax+ProbeDoc.(CName{clist}).Position(2,3);%upper position of the probe + Zprobe(Zprobe