Changeset 136 for trunk/src

Timestamp:

Nov 25, 2010, 5:41:04 PM (14 years ago)

Author:

gostiaux

Message:

.fsnet automatically replaced by fsnet in filenames (useful at Coriolis only);
filebase variable replaced by filecell.filebase for clarity

File:

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

trunk/src/civ.m

@@ -1596 +1596 @@
 end
 
-%% get the root names
-filebase=get(handles.RootName,'String');
-if isempty(filebase)||isequal(filebase,'')
-    msgbox_uvmat('ERROR','no input files')
-    return
-end
+
 
 %check mask if selecetd
@@ -1644 +1639 @@
     return
 end
+filecell
+
 nbfield=numel(num1_civ1);
 nbslice=numel(num_a_civ1);
@@ -1889 +1886 @@
                     par_civ1.maskflag='y';
                 else
-                    maskbase=[filebase '_' maskdispl]; %
+                    maskbase=[filecell.filebase '_' maskdispl]; %
                     nbslice_mask=str2num(maskdispl(1:end-4)); %
                     num1_mask=mod(num1_civ1(ifile)-1,nbslice_mask)+1;
@@ -1910 +1907 @@
                     if ~isempty(nbslice_grid)
                         num1_grid=mod(num1_civ1(ifile)-1,nbslice_grid)+1;
-                        par_civ1.gridname=[filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
+                        par_civ1.gridname=[filecell.filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
                         if ~exist(par_civ1.gridname,'file')
                             msgbox_uvmat('ERROR','grid file absent for civ1')
@@ -1952 +1949 @@
                 nbslice_mask=str2num(maskdispl(1:end-4)); %
                 num1_mask=mod(num1_civ1(ifile)-1,nbslice_mask)+1;
-                maskbase=[filebase '_' maskdispl];
+                maskbase=[filecell.filebase '_' maskdispl];
                 maskname=name_generator(maskbase,num1_mask,1,'.png','_i');
             end
@@ -2000 +1997 @@
                         if ~isempty(nbslice_grid)
                             num1_grid=mod(num1_civ1(ifile)-1,nbslice_grid)+1;
-                            patch1.gridPatch=[filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
+                            patch1.gridPatch=[filecell.filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
                             if ~exist(patch1.gridPatch,'file')
                                 msgbox_uvmat('ERROR','grid file absent for patch1')
@@ -2058 +2055 @@
                     par_civ2.maskflag='y';
                 else
-                    maskbase=[filebase '_' maskdispl]; %
+                    maskbase=[filecell.filebase '_' maskdispl]; %
                     nbslice_mask=str2num(maskdispl(1:end-4)); %
                     num1_mask=mod(num1_civ2(ifile)-1,nbslice_mask)+1;
@@ -2079 +2076 @@
                     par_civ2.gridflag='y';
                     num1_grid=mod(num1_civ2(ifile)-1,nbslice_grid)+1;
-                    par_civ2.gridname=[filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
+                    par_civ2.gridname=[filecell.filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
                     if exist(par_civ2.gridname,'file')
                         par_civ2.gridflag='y';
@@ -2125 +2122 @@
             else
                 maskdispl=get(handles.mask_fix2,'String');
-                maskbase=[filebase '_' maskdispl]; %
+                maskbase=[filecell.filebase '_' maskdispl]; %
                 nbslice_mask=str2num(maskdispl(1:end-4)); %
                 num1_mask=mod(num1_civ2(ifile)-1,nbslice_mask)+1;
@@ -2175 +2172 @@
                         if ~isempty(nbslice_grid)
                             num1_grid=mod(num1_civ2(ifile)-1,nbslice_grid)+1;
-                            patch2.gridPatch=[filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
+                            patch2.gridPatch=[filecell.filebase '_' name_generator(gridname,num1_grid,1,'.grid','_i')];
                             if ~exist(patch2.gridPatch,'file')
                                 msgbox_uvmat('ERROR','grid file absent for patch2')
@@ -2213 +2210 @@
             [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
             filename_bat=fullfile(Rootbat,['job_' Filebat extbat]);
-        else
+         else
             filename_bat=filename_cmx;
         end
@@ -2288 +2285 @@
 %------------------------------------------------------------------------
 filecell=[];%default
-%get the filename root, nomenclature and numbers
+
+%% get the root names nomenclature and numbers
 filebase=get(handles.RootName,'String');
+
+if isempty(filebase)||isequal(filebase,'')
+    msgbox_uvmat('ERROR','no input files')
+    return
+end
+
+filebase=regexprep(filebase,'\.fsnet','fsnet');% temporary fix for cluster Coriolis
+filecell.filebase=filebase;
+
 browse=get(handles.browse_root,'UserData');
 compare_list=get(handles.compare,'String');