Changeset 100 for trunk

Timestamp:

Jun 8, 2010, 8:19:10 PM (14 years ago)

Author:

sommeria

Message:

nc2struct.m: convert variables to double after reading (civ gives single)
series.m: prob of initialisation solved
civ.m: gestion of button 'experimental' for new patch

Location:

trunk/src

Files:

• . (modified) (1 prop)
• civ.m (modified) (3 diffs)
• nc2struct.m (modified) (1 diff)
• series.m (modified) (2 diffs)

trunk/src

@@ +1 @@
+@xmltree
+PARAM.xml
 PARAM_WIN.xml
+XML_SCHEMAS
+bin
+toolbox_calib
+uvmat_doc

@@ +1 @@
+@xmltree
+PARAM.xml
 PARAM_WIN.xml
+XML_SCHEMAS
+bin
+toolbox_calib
+uvmat_doc

trunk/src/civ.m

@@ -2137 +2137 @@
     end
 end
-test_interp=get(handles.test_interp,'Value');
-if ~test_interp && isfield(sparam,'PatchBin')
+%test_interp=get(handles.test_interp,'Value');
+test_interp=0;
+if  isfield(sparam,'PatchBin')
     if ~exist(sparam.PatchBin,'file')
          sparam.PatchBin=fullfile(path_UVMAT,sparam.PatchBin);
     end
 end
-if test_interp && isfield(sparam,'PatchNewBin')
-    if ~exist(sparam.PatchNewBin,'file')
-         sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
-    end
-end
+% if test_interp && isfield(sparam,'PatchNewBin')
+%     if ~exist(sparam.PatchNewBin,'file')
+%          sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
+%     end
+% end
 if isfield(sparam,'FixBin')
 %     fixBin=sparam.FixBin;
@@ -4503 +4504 @@
 set(handles.nx_patch1_title,'Visible','on')
 set(handles.ny_patch1_title,'Visible','on')
-if ~isempty(patch_newBin) 
-    set(handles.test_interp,'Visible','on');
-end
+% if ~isempty(patch_newBin) 
+%     set(handles.test_interp,'Visible','on');
+% end
 set(handles.get_gridpatch1,'Visible','on')
 set(handles.grid_patch1,'string','none');
@@ -4524 +4525 @@
 set(handles.nx_patch1_title,'Visible','off')
 set(handles.ny_patch1_title,'Visible','off')
-set(handles.test_interp,'Visible','off')
+%set(handles.test_interp,'Visible','off')
 set(handles.get_gridpatch1,'Visible','off')
 set(handles.grid_patch1,'Visible','off')

trunk/src/nc2struct.m

@@ -256 +256 @@
                 VarName(indstr)=[];
             end
-            eval(['Data.' VarName '=netcdf.getVar(nc,var_index(ivar)-1);'])%read the variable data
+            eval(['Data.' VarName '=double(netcdf.getVar(nc,var_index(ivar)-1));'])%read the variable data
             %eval(['siz=size(Data.' VarName ');'])
            % if numel(siz)<=2

trunk/src/series.m

@@ -702 +702 @@
     nb_field2=max(floor((max(num_j1)+max(num_j2))/2));
 end
-if isempty(nb_field)
+if isempty(nb_field)||isnan(nb_field)
     nb_field_str='?';
     nb_field_str2='?';
@@ -1262 +1262 @@
             num1=num1(ind);       
         end
-        set(handles.first_i,'String',num2str(num1(1)));
-        set(handles.last_i,'String',num2str(num1(end)));
+        if ~isempty(num1)
+            set(handles.first_i,'String',num2str(num1(1)));
+            set(handles.last_i,'String',num2str(num1(end)));
+        end
         testupdate=1;
         elseif isequal(mode,'series(Dj)')

@@ +1 @@
+@xmltree
+PARAM.xml
 PARAM_WIN.xml
+XML_SCHEMAS
+bin
+toolbox_calib
+uvmat_doc