Changeset 446 for trunk/src/civ.m

Timestamp:

Jun 11, 2012, 9:33:54 AM (13 years ago)

Author:

sommeria

Message:

series rationalized. TO BE TESTED.

File:

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

trunk/src/civ.m

@@ -1021 +1021 @@
 
 
-%--------------orm----------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Main lauch command, called by RUN and BATCH
 function errormsg=launch_jobs(hObject, eventdata, handles, batch)
-%-----------------------------------------------------------------------
+%------------------------------------------------------------------------
 errormsg='';%default
 
@@ -1076 +1076 @@
 if isfield(handles,'status')
     set(handles.status,'Value',0);%suppress status display
-    status_Callback(hObject, eventdata, handles)
+    status_Callback([], [], handles)
 end
 
@@ -2100 +2100 @@
                 detect=exist(filename,'file')==2;
                 if detect% if a netcdf file already exists
-                    r=regexp(subdir_civ1_new,'(?<root>.*\D)(?<num1>\d+)$','names');%detect whether name ends by a number
-                    if isempty(r)
-                        r(1).root=[subdir_civ1_new '_'];
-                        r(1).num1='0';
+                    answer=msgbox_uvmat('INPUT_Y-N',['delete files in ' subdir_civ1_new]);
+                    if ~strcmp(answer,'Yes')
+                        r=regexp(subdir_civ1_new,'(?<root>.*\D)(?<num1>\d+)$','names');%detect whether name ends by a number
+                        if isempty(r)
+                            r(1).root=[subdir_civ1_new '_'];
+                            r(1).num1='0';
+                        end
+                        subdir_civ1_new=[r(1).root num2str(str2num(r(1).num1)+1)];%increment the index by 1 or put 1
+                        subdir_civ2=subdir_civ1_new;
                     end
-                    subdir_civ1_new=[r(1).root num2str(str2num(r(1).num1)+1)];%increment the index by 1 or put 1
-%                     indstr=regexp(subdir_civ1_new,'\D');
-%                     if indstr(end)<length(subdir_civ1_new) %subdir_civ1 ends by a number
-%                         vers=str2double(subdir_civ1_new(indstr(end)+1:end))+1;
-%                         subdir_civ1_new=[subdir_civ1_new(1:indstr(end)) num2str(vers)];
-%                     else
-%                         vers=vers+1;
-%                         subdir_civ1_new=[subdir_civ1_new(1:indstr(end)) '_' num2str(vers)];       
-%                     end
-                    subdir_civ2=subdir_civ1_new;
                     break
                 end