Changeset 505

Timestamp:

Jul 26, 2012, 11:04:43 PM (12 years ago)

Author:

sommeria

Message:

bugs correctied in civ. test for compilation need introduced in check_files

Location:

trunk/src

Files:

• check_files.m (modified) (1 diff)
• civ.m (modified) (9 diffs)

trunk/src/check_files.m

@@ -184 +184 @@
 checkmsg=checkmsg';
 
+%% check dates of compilation
+currentdir=pwd;
+cd(pathuvmat)
+list_compile=dir('*.sh');
+for ilist=1:numel(list_compile)
+    mfile=regexprep(list_compile(ilist).name,'.sh$','.m');
+    datfile=dir(mfile);
+    if isfield(datfile,'datenum') && datfile.datenum>list_compile(ilist).datenum
+        checkmsg=[checkmsg;{[list_compile(ilist).name ' needs to be updated by compile_functions']}];
+    end
+end
+

trunk/src/civ.m

@@ -63 +63 @@
 sparam=[];
 if ~exist(xmlfile,'file')
-    [success,message]=copyfile(fullfile(path_civ,'PARAM.xml.default'),xmlfile)
+    [success,message]=copyfile(fullfile(path_civ,'PARAM.xml.default'),xmlfile);
 end
 if exist(xmlfile,'file')
@@ -106 +106 @@
 else
     set(handles.RunMode,'String',{'local';'background';'cluster'})
-%     set(handles.BATCH,'Enable','off')% put the BATCH button in grey (unactivated)
-%     set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])% put the BATCH button in grey (unactivated)
 end
 % if isfield(sparam.RunParam,'CivBin')
@@ -323 +321 @@
 set(handles.RUN, 'Enable','On')
 set(handles.RUN,'BackgroundColor',[1 0 0])%set RUN button to red color
-% set(handles.BATCH,'Enable','On')
-% set(handles.BATCH,'BackgroundColor',[1 0 0])%set BATCH button to red color
 if isfield(handles,'status')
     set(handles.status,'Value',0);       %suppress the 'status' display
@@ -618 +614 @@
 %% set the civ options depending on the input file content when a nc file has been opened
 ListOptions={'CheckCiv1', 'CheckFix1' 'CheckPatch1', 'CheckCiv2', 'CheckFix2', 'CheckPatch2'};
-if ind_opening==0
+checkbox=zeros(size(ListOptions));%default
+if ind_opening==0%case of image opening, start with Civ1
     for index=1:numel(ListOptions)
         checkbox(index)=get(handles.(ListOptions{index}),'Value');
     end
-    for index=1:max(1,max(find(checkbox)))
+    index_max=find(checkbox, 1, 'last' );
+    if isempty(index_max),index_max=1;end        
+    for index=1:index_max
         set(handles.(ListOptions{index}),'Value',1)% select all operations starting from CIV1
     end
@@ -848 +847 @@
     status_Callback(hObject, eventdata, handles)
 end
-% 
-% %------------------------------------------------------------------------
-% % --- Executes on button press in BATCH: remote processing
-% function BATCH_Callback(hObject, eventdata, handles)
-% % -----------------------------------------------------------------------
-% set(handles.BATCH, 'Enable','Off')
-% set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])
-% batch=1;
-% errormsg=launch_jobs(hObject, eventdata, handles, batch);
-% set(handles.BATCH, 'Enable','On')
-% set(handles.BATCH,'BackgroundColor',[1 0 0])
-% 
-% % display errors or start status callback to visualise results
-% if ~isempty(errormsg)
-%     display(errormsg)
-%     msgbox_uvmat('ERROR',errormsg)
-% elseif isfield(handles,'status')
-%     set(handles.status,'Value',1);%suppress status display
-%     status_Callback(hObject, eventdata, handles)
-% end
 
 %-------------------------------------------------------------------
@@ -1186 +1165 @@
     if ~exist(fullfile(path_civ,'civ_matlab.sh'),'file')
         errormsg=[{'no file civ_matlab.sh found'}; {'run compile_functions.m to create it by compiling civ_matlab.m'}];
-    end
-    return
+            return
+    end
 end
 
@@ -1361 +1340 @@
         switch Param.Program
             case {'civ_matlab'}
-                filename_bat=regexprep(Param.OutputFile,'(.+)([/\\])(.+$)','$1$20_BAT$2$3.m');
-                filename_bat=regexprep(filename_bat,'-','__');
+                filename_bat=regexprep(Param.OutputFile,'(.+)([/\\])(.+$)','$1$20_BAT$2$3.m');           
+                [BatRoot,BatFile]=fileparts(filename_bat);
+                 BatFile=regexprep(BatFile,'-','__');%transform name to suppress'-' (not valid for .m files)
+                 filename_bat=[fullfile(BatRoot,BatFile) '.m'];
             case {'CivX','CivAll','civ_matlab.sh'}
                 switch computer
@@ -4413 +4394 @@
         
     case 'civ_matlab.sh'
+        CivmBin=fullfile(fileparts(which('civ')),'civ_matlab.sh'); %path to the source directory of uvmat
         switch computer
             case {'PCWIN','PCWIN64'}
@@ -4422 +4404 @@
                     'hostname && date \n '...
                     'umask 002 \n'...
-                    Param.xml.CivmBin ' ' Param.xml.RunTime ' ' regexprep(filename,'(.+)([/\\])(.+$)','$1$20_XML$2$3.xml') ' ' Param.OutputFile '.nc'];%allow writting access to created files for user group
+                    CivmBin ' ' Param.xml.RunTime ' ' regexprep(filename,'(.+)([/\\])(.+$)','$1$20_XML$2$3.xml') ' ' Param.OutputFile '.nc'];%allow writting access to created files for user group
         end
 end