Changeset 220 for trunk/src/civ.m

Timestamp:

Mar 11, 2011, 12:03:39 PM (14 years ago)

Author:

sommeria

Message:

correction in civ to reactivate civall. Cleaning of figures civ.fig and view_field

File:

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

trunk/src/civ.m

@@ -22 +22 @@
 function varargout = civ(varargin)
 
-% Last Modified by GUIDE v2.5 05-Jan-2011 16:19:30
+% Last Modified by GUIDE v2.5 11-Mar-2011 08:21:21
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -225 +225 @@
 set(handles.ref_j_civ2,'String',num2str(num_ref_j));
 set(handles.browse_root,'UserData',browse);
-if exist('param','var')%varargin the interface is opened from uvmat
+if exist('param','var') && isfield(param,'RootName') && ~isempty(param.RootName)%varargin the interface is opened from uvmat
     RootName_Callback(hObject, eventdata, handles);
 end
@@ -1711 +1711 @@
     if isfield(sparam,'CivBin')
         if ~exist(sparam.CivBin,'file')
+            CivBin=sparam.CivBin;
             sparam.CivBin=fullfile(path_UVMAT,sparam.CivBin);
+            if ~exist(sparam.CivBin,'file')
+                 msgbox_uvmat('ERROR',['CIVx binary ' CivBin ' defined in PARAM.xm does not exist'])
+                 return
+            end
         end
     end
     if isfield(sparam,'Civ1Bin')
         if ~exist(sparam.Civ1Bin,'file')
+            CivBin=sparam.Civ1Bin;
             sparam.Civ1Bin=fullfile(path_UVMAT,sparam.Civ1Bin);
+            if ~exist(sparam.CivBin,'file')
+                 msgbox_uvmat('ERROR',['civ1 binary ' CivBin ' defined in PARAM.xm does not exist'])
+                 return
+            end
         end
     end
     if isfield(sparam,'Civ2Bin')
+        CivBin=sparam.Civ2Bin;
         if ~exist(sparam.Civ2Bin,'file')
             sparam.Civ2Bin=fullfile(path_UVMAT,sparam.Civ2Bin);
+            if ~exist(sparam.Civ2Bin,'file')
+                 msgbox_uvmat('ERROR',['civ2 binary ' CivBin ' defined in PARAM.xm does not exist'])
+                 return
+            end
         end
     end
@@ -1842 +1857 @@
 %% MAIN LOOP
 time=get(handles.RootName,'UserData'); %get the set of times
-civAll=get(handles.Experimental,'Value'); % Boolean for new civ excution method
+civAll=get(handles.CivAll,'Value'); % Boolean for new civ excution method
 super_cmd=[];
 
@@ -1853 +1868 @@
             cmd=[cmd '#$ -cwd \n'];
             cmd=[cmd 'hostname && date \n'];
-            cmd=[cmd 'umask 002 \n'];%allow writting access for user group for created files
+            cmd=[cmd 'umask 002 \n'];%allow writting access to created files for user group
         end
         if civAll
@@ -2111 +2126 @@
             else
                 civAllCmd=[civAllCmd ' civ2 '];
-                str=CIV2_CMD_Unified(filename_cmx([1:end-4]),namelog,par_civ2);
+                str=CIV2_CMD_Unified(flname,'',par_civ2);
                 fieldnames=fields(str);
                 [civAllxml,uid_civ2]=add(civAllxml,1,'element','civ2');
@@ -2175 +2190 @@
             else
                 patch2.inputFileName=filecell.nc.civ1{ifile,j} ;
-                patch2.nopt=subdomain_patch1;
-                patch2.maxdiff=thresh_patch1;
-                patch2.ro=rho_patch1;
+                patch2.nopt=subdomain_patch2;
+                patch2.maxdiff=thresh_patch2;
+                patch2.ro=rho_patch2;
                 test_grid=get(handles.get_gridpatch2,'Value');
                 if test_grid
@@ -2216 +2231 @@
         end
         if isequal(civAll,1)
-            save(civAllxml,[filename_cmx([1:end-4]) '.xml']);
-            cmd=[cmd CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd  '\n'];
+            save(civAllxml,[flname '.xml']);
+            'TEST'
+            cmd=[cmd sparam.CivBin ' -f ' flname '.xml '  civAllCmd ' >' flname '.log' '\n']
+            'fincmd'
         end
         % create the .bat file:
@@ -4124 +4141 @@
     civ1.mask=par.maskname;
 end
-civ1.dt=par.Dt;
+civ1.dt=1%par.Dt;
 civ1.unit='pixel';
 civ1.absolut_time_T0=par.T0;
@@ -4733 +4750 @@
 %-------------------------------------------------------------------
      delete(gcbf)
+
+
+% --- Executes on button press in CivAll.
+function CivAll_Callback(hObject, eventdata, handles)
+% hObject    handle to CivAll (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of CivAll
+
+