Changeset 938 for trunk/src

Timestamp:

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

Author:

sommeria

Message:

group writing access set for result files

Location:

trunk/src

Files:

• calc_field_tps.m (modified) (1 diff)
• series/civ_series.m (modified) (1 diff)
• series/merge_proj.m (modified) (4 diffs)
• series/merge_proj_polar.m (added)
• struct2nc.m (modified) (1 diff)

trunk/src/calc_field_tps.m

@@ -122 +122 @@
     end
     for ilist=1:length(FieldName)
-        %Operator{ilist}='';%default empty operator (vec, norm,...)
-        %r=regexp(FieldName{ilist},'(?<Operator>(^vec|^norm|^curl|^div|^strain))\((?<UName>.+),(?<VName>.+)\)$','names');% TODO, replace U, V
         switch FieldName{ilist}
             case 'vec(U,V)'
-%                 ListVar=[ListVar {'U', 'V'}];
-%                 VarAttribute{var_count+1}.Role='vector_x';
-%                 VarAttribute{var_count+2}.Role='vector_y';
                 DataOut.U(ind_sel)=DataOut.U(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,1);
                 DataOut.V(ind_sel)=DataOut.V(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,2);
             case 'U'
-%                 ListVar=[ListVar {'U'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 DataOut.U(ind_sel)=DataOut.U(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,1);
             case 'V'
-%                 ListVar=[ListVar {'V'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 DataOut.V(ind_sel)=DataOut.V(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,2);
             case 'norm(U,V)'
-%                 ListVar=[ListVar {'norm'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 U=DataOut.U(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,1);
                 V=DataOut.V(ind_sel)+EM *FieldVar(1:nbvec_sub+3,isub,2);
                 DataOut.norm(ind_sel)=sqrt(U.*U+V.*V);
             case 'curl(U,V)'
-%                 ListVar=[ListVar {'curl'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 DataOut.curl(ind_sel)=DataOut.curl(ind_sel)-EMDY *FieldVar(1:nbvec_sub+3,isub,1)+EMDX *FieldVar(1:nbvec_sub+3,isub,2);
             case 'div(U,V)'
-%                 ListVar=[ListVar {'div'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 DataOut.div(ind_sel)=DataOut.div(ind_sel)+EMDX*FieldVar(1:nbvec_sub+3,isub,1)+EMDY *FieldVar(1:nbvec_sub+3,isub,2);
+%             case 'curl_polar(U,V)'
+%                 DataOut.curl(ind_sel)=DataOut.curl(ind_sel)+(-EMDY *FieldVar(1:nbvec_sub+3,isub,1)+EMDX *(Coord_interp(ind_sel,1).*FieldVar(1:nbvec_sub+3,isub,2)))./Coord_interp(ind_sel,1);
             case 'strain(U,V)'
-%                 ListVar=[ListVar {'strain'}];
-%                 VarAttribute{var_count+1}.Role='scalar';
                 DataOut.strain(ind_sel)=DataOut.strain(ind_sel)+EMDY*FieldVar(1:nbvec_sub+3,isub,1)+EMDX *FieldVar(1:nbvec_sub+3,isub,2);
         end
     end
 end
-%DataOut.FF=nbval==0; %put errorflag to 1 for points outside the interpolation rang
 nbval(nbval==0)=NaN;% to avoid division by zero for averaging
 ListFieldOut=fieldnames(DataOut);

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

trunk/src/struct2nc.m

@@ -170 +170 @@
 if strcmp(action,'one_input')
 netcdf.close(nc)
+[success,errormsg] = fileattrib(flname ,'+w');% allow writing access for the group of users
 end