Changeset 938 for trunk/src/series

Timestamp:

Apr 1, 2016, 7:22:25 PM (8 years ago)

Author:

sommeria

Message:

group writing access set for result files

Location:

trunk/src/series

Files:

• civ_series.m (modified) (1 diff)
• merge_proj.m (modified) (4 diffs)
• merge_proj_polar.m (added)

trunk/src/series/civ_series.m

@@ -890 +890 @@
         if isempty(errormsg)
             disp([ncfile_out ' written'])
-            [success,msg] = fileattrib(ncfile_out ,'+w','g');% allow writing access for the group of users, recursively in the folder
+            %[success,msg] = fileattrib(ncfile_out ,'+w','g');% done in struct2nc
         else
             disp(errormsg)

trunk/src/series/merge_proj.m

@@ -252 +252 @@
     %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%%
 tstart=tic; %used to record the computing time
+CheckOverwrite=1;%default
+if isfield(Param,'CheckOverwrite')
+    CheckOverwrite=Param.CheckOverwrite;
+end
 for index=1:NbField
         update_waitbar(WaitbarHandle,index/NbField)
@@ -258 +262 @@
         return
     end
+    
+     %% generating the name of the merged field
+    i1=i1_series{1}(index);
+    if ~isempty(i2_series{end})
+        i2=i2_series{end}(index);
+    else
+        i2=i1;
+    end
+    j1=1;
+    j2=1;
+    if ~isempty(j1_series{1})
+        j1=j1_series{1}(index);
+        if ~isempty(j2_series{end})
+            j2=j2_series{end}(index);
+        else
+            j2=j1;
+        end
+    end
+    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFileOut,FileExtOut,NomTypeOut,i1,i2,j1,j2);
+    if ~CheckOverwrite && exist(OutputFile,'file')
+            disp(['existing output file ' OutputFile ' already exists, skip to next field'])
+            continue% skip iteration if the mode overwrite is desactivated and the result file already exists
+    end
+        
     %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%%
     Data=cell(1,NbView);%initiate the set Data
@@ -268 +296 @@
             return
         end
+        
         ListVar=Data{iview}.ListVarName;
         for ilist=1:numel(ListVar)
@@ -325 +354 @@
     end
 
-    %% generating the name of the merged field
-    i1=i1_series{1}(index);
-    if ~isempty(i2_series{end})
-        i2=i2_series{end}(index);
-    else
-        i2=i1;
-    end
-    j1=1;
-    j2=1;
-    if ~isempty(j1_series{1})
-        j1=j1_series{1}(index);
-        if ~isempty(j2_series{end})
-            j2=j2_series{end}(index);
-        else
-            j2=j1;
-        end
-    end
-    OutputFile=fullfile_uvmat(RootPath{1},OutputDir,RootFileOut,FileExtOut,NomTypeOut,i1,i2,j1,j2);
-
+  
     %% recording the merged field
     if strcmp(FileExtOut,'.png')    %output as image