Changeset 270 for trunk/src/civ.m

Timestamp:

Nov 12, 2011, 4:46:54 PM (12 years ago)

Author:

sommeria

Message:

minor bug repairs

File:

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

trunk/src/civ.m

@@ -1162 +1162 @@
 else
     mode_list=get(handles.mode,'String')
+    if isempty(mode_list)
+        msgbox_uvmat('ERROR','please enter an input image or netcdf file')
+        return
+    end
     mode_value=get(handles.mode,'Value')
     mode=mode_list{mode_value};
@@ -2220 +2224 @@
                         RUN_STLIN(filecell.ncA.civ2{ifile,j},filecell.nc.civ2{ifile,j},'civ2',filecell.st{ifile,j},...
                             str2num(nx_patch2),str2num(ny_patch2),str2num(thresh_patch2),[filebase_A '.xml'],[filebase_B '.xml'])
+                    else
+                        Param.Patch2.Rho=rho_patch2;
+                        Param.Patch2.Threshold=thresh_patch2;
+                        Param.Patch2.SubDomain=subdomain_patch2;
                     end
                 end
@@ -2229 +2237 @@
                         msgbox_uvmat('ERROR',errormsg)
                     end
+
                 end
         end