Changeset 183 for trunk/src/civ.m

Timestamp:

Jan 26, 2011, 5:03:40 PM (13 years ago)

Author:

sommeria

Message:

small bug repair: reading movies in read_fields, plotting rectangles and ellipes

File:

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

trunk/src/civ.m

@@ -1724 +1724 @@
         end
     end
-    %test_interp=get(handles.test_interp,'Value');
-
     if  isfield(sparam,'PatchBin')
         if ~exist(sparam.PatchBin,'file')
@@ -1731 +1729 @@
         end
     end
-    % if test_interp && isfield(sparam,'PatchNewBin')
-    %     if ~exist(sparam.PatchNewBin,'file')
-    %          sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
-    %     end
-    % end
     if isfield(sparam,'FixBin')
         if ~exist(sparam.FixBin,'file')
@@ -1746 +1739 @@
         batch_mode=sparam.BatchMode;
     end
-else
-%     MaxCivProcesses=50;
-%     if isfield(sparam,'MaxCivProcesses')
-%         MaxCivProcesses=str2double(sparam.MaxCivProcesses);
-%     end
 end
 
@@ -1756 +1744 @@
 %% get civ1 parameters:
 display('files OK, processing...')
-%get civ parameters
 if box_test(1)==1
     par_civ1=read_param_civ1(handles,filecell.ima1.civ1{1,1});
@@ -1863 +1850 @@
         cmd='';
         if isunix % check: necessaire aussi en RUN?
-            %fid=fopen([filename '.cmx'],'w')
             cmd='#!/bin/bash \n';
             cmd=[cmd '#$ -cwd \n'];
@@ -1874 +1860 @@
             civAllxml=set(civAllxml,1,'name','CivDoc');
         end
-        %filename_cur=filecell.nc.civ1{ifile,j};%output netcdf file
         [Rootbat,Filebat]=fileparts(filecell.nc.civ1{ifile,j});%output netcdf file (without extention)
         flname=fullfile(Rootbat,Filebat);
-        %filename_cmx(end-1:end+6)='civ1.cmx';%name of cmx file
         if batch
-%             [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
             filename_bat=fullfile(Rootbat,['job_' Filebat]);
          else
@@ -1890 +1873 @@
             par_civ1.filename_ima_a=filecell.ima1.civ1{ifile,j};
             par_civ1.filename_ima_b=filecell.ima2.civ1{ifile,j};
-            %namelog=[fullfile(Rootbat,Filebat) '.civ1.log'];
             par_civ1.Dt=num2str(time(num2_civ1(ifile),num_b_civ1(j))-time(num1_civ1(ifile),num_a_civ1(j)));
             par_civ1.T0=num2str((time(num2_civ1(ifile),num_b_civ1(j))+time(num1_civ1(ifile),num_a_civ1(j)))/2);
@@ -1943 +1925 @@
             i_cmd=i_cmd+1;
             if isequal(civAll,0)
-                cmd=[cmd CIV1_CMD(fullfile(Rootbat,Filebat),'',par_civ1,handles,sparam) '\n'];
+                if(isunix)
+                     cmd=[cmd 'cp -f ' flname '.civ1.cmx ' flname '.cmx\n'];
+                else
+                    flname=regexprep(flname,'\\','\\\\');
+                    cmd=[cmd 'copy /Y "' flname '.civ1.cmx" "' flname '.cmx"\n'];
+                end
+                cmd=[cmd CIV1_CMD(fullfile(Rootbat,Filebat),'',par_civ1,handles,sparam) '\n']
             else
                 civAllCmd=[civAllCmd ' civ1 '];
@@ -2054 +2042 @@
             filename_cmx=filecell.nc.civ2{ifile,j};%output netcdf file
             filename_cmx([end-1:end+1])=[ 'cmx'];%name of cmx file
-%             filename_cmx=[filename_cmx 'x'];
         end
         
         if box_test(4)==1
             par_civ2.filename_ima_a=filecell.ima1.civ2{ifile,j};
-            %par_civ2.filename_ima_a([end-3:end])=[];%remove .png extension
             par_civ2.filename_ima_b=filecell.ima2.civ2{ifile,j};
-            %par_civ2.filename_ima_b([end-3:end])=[];%remove .png extension
             [Rootbat,Filebat]=fileparts(filecell.nc.civ2{ifile,j});%output netcdf file (without extention)
-            %namelog=[fullfile(Rootbat,Filebat) '.civ2.log'];
             par_civ2.Dt=num2str(time(num2_civ2(ifile),num_b_civ2(j))-time(num1_civ2(ifile),num_a_civ2(j)));
             par_civ2.T0=num2str((time(num2_civ1(ifile),num_b_civ2(j))+time(num1_civ2(ifile),num_a_civ2(j)))/2);
@@ -2115 +2099 @@
                 end
             end
-            %endTESTgrid
             i_cmd=i_cmd+1;
             flname=fullfile(Rootbat,Filebat);
@@ -2234 +2217 @@
         if isequal(civAll,1)
             save(civAllxml,[filename_cmx([1:end-4]) '.xml']);
-            %cmd=char({cmd;[CivBin ' -f ' [filename_cmx([1:end-4]) '.xml'] ' ' civAllCmd]});
             cmd=[cmd CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd  '\n'];
         end
@@ -2245 +2227 @@
         fprintf(fid,cmd);
         fclose(fid);
-        %dlmwrite(filename_bat,cmd,'');%write commands in filename_bat
         if batch
             switch batch_mode
                 case 'sge'
                     pvalue=num2str((1-ind_answer)*500);
-                    %namelog=[filename_bat '.patch.log'];
                     display(['!qsub -p ' pvalue ' -q civ.q -e ' flname '.errors -o ' flname '.log' ' ' filename_bat]);
                     eval(  ['!qsub -p ' pvalue ' -q civ.q -e ' flname '.errors -o ' flname '.log' ' ' filename_bat]);
@@ -2258 +2238 @@
             if(isunix)
                 cmd_str=['. ' filename_bat];
-                % cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f bad idea...
             else %case of Windows
                 cmd_str=['@call "' regexprep(filename_bat,'\\','\\\\') '"'];