Changeset 1201 for trunk/src/series/civ_series.m

Timestamp:

Mar 23, 2026, 4:49:29 PM (3 hours ago)

Author:

sommeria

Message:

various improvements...

File:

• trunk/src/series/civ_series.m (modified) (7 diffs)

trunk/src/series/civ_series.m

@@ -46 +46 @@
 %=======================================================================
 
-function [Data,errormsg,result_conv]= civ_series(Param)
+function [Data,errormsg]= civ_series(Param)
 errormsg='';
 
@@ -398 +398 @@
             if strcmp(NomTypeNc,'_1-2_1')% case of volume,backgrounds act on different j levels
                 backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',j1_series_Civ1(ifield));
-            elseif isfield(par_civ1,'NbSlice')&& ~isequal(par_civ1.NbSlice,1)
+            elseif isfield(par_civ1,'NbSlice')
                 i1_background=mod(i1-1,par_civ1.NbSlice)+1;
                 backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',i1_background);
@@ -490 +490 @@
             if ~isempty(i2_series_Civ1)&& ~isequal(i1_series_Civ1,i2_series_Civ1)% case of volume,masks act on different j levels
                 maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',j1);
-            elseif isfield(par_civ1,'NbSlice')&& ~isequal(par_civ1.NbSlice,1)
+            elseif isfield(par_civ1,'NbSlice')
                 i1_mask=mod(i1-1,par_civ1.NbSlice)+1;
                 maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',i1_mask);
@@ -530 +530 @@
         
         % caluclate velocity data
-        %   [Data.Civ1_X,Data.Civ1_Y,Data.Civ1_U,Data.Civ1_V,Data.Civ1_C,Data.Civ1_FF, result_conv, errormsg] = civ (par_civ1);
-        [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF, result_conv, errormsg] = civ (par_civ1);
+        if strcmp(Param.RunMode,'cluster')
+            [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF,~, errormsg] = civ (par_civ1);% single processor used in cluster
+        else
+            [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF,errormsg] = parciv (par_civ1);%use parfor loop 
+        end
         Civ_X_shifted=Civ_X-0.5+Civ_U/2;% get the exact positions
         Civ_Y_shifted=Civ_Y-0.5+Civ_V/2;
@@ -680 +683 @@
             if ~isempty(i2_series_Civ2)% case of volume,backgrounds act on different j levels
                 backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',j1);
-            elseif isfield(par_civ2,'NbSlice') && ~isequal(par_civ2.NbSlice,1)
+            elseif isfield(par_civ2,'NbSlice')
                 i1_background=mod(i1-1,par_civ2.NbSlice)+1;
                 backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',i1_background);
@@ -804 +807 @@
                 end
                 maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',j1);
-            elseif isfield(par_civ2,'NbSlice')&& ~isequal(par_civ2.NbSlice,1)
+            elseif isfield(par_civ2,'NbSlice')
                 i1=i1_series_Civ2(ifield);
                 i1_mask=mod(i1-1,par_civ2.NbSlice)+1;
@@ -855 +858 @@
         end
         
-        % calculate velocity data      
-        [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF,~, errormsg] = civ (par_civ2);
+        % calculate velocity data 
+        if strcmp(Param.RunMode,'cluster')
+            [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF,~, errormsg] = civ (par_civ2);% single processor used in cluster
+        else
+            [Civ_X,Civ_Y,Civ_U,Civ_V,Civ_C,Civ_FF,errormsg] = parciv (par_civ2);%use parfor loop
+        end
         Civ_X_shifted=Civ_X-0.5+Civ_U/2;% get the exact positions
         Civ_Y_shifted=Civ_Y-0.5+Civ_V/2;