Changeset 90

Timestamp:

May 21, 2010, 5:01:40 PM (14 years ago)

Author:

gostiaux

Message:

 

File:

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

trunk/src/civ.m

@@ -2329 +2329 @@
         if isunix % check: necessaire aussi en RUN?
            %fid=fopen([filename '.cmx'],'w')
-           cmd='#!/bin/bash';
-           cmd=[cmd '\n' '#$ -cwd'];
-           cmd=[cmd '\n' 'hostname && date'];
+           cmd='#!/bin/bash \n';
+           cmd=[cmd '#$ -cwd \n'];
+           cmd=[cmd 'hostname && date \n'];
         end
         if civAll
@@ -2399 +2399 @@
             i_cmd=i_cmd+1;
             if isequal(civAll,0)
-                cmd=[cmd '\n' BATCH_CIV1(filename_cmx(1:end-4),namelog,par_civ1,handles,sparam)];
+                cmd=[cmd BATCH_CIV1(filename_cmx(1:end-4),namelog,par_civ1,handles,sparam) '\n'];
             else
                  civAllCmd=[civAllCmd ' civ1 '];
@@ -2431 +2431 @@
                    ' -fi2 ' num2str(flagindex1(2)) ' -fi3 ' num2str(flagindex1(3)) ...
                    ' -threshC ' num2str(thresh_vecC1) ' -threshV ' num2str(thresh_vel1) ' -maskName ' maskname];
-           cmd=[cmd '\n' cmd_FIX];
+           cmd=[cmd cmd_FIX '\n'];
            else
                 fix1.inputFileName=filecell.nc.civ1{ifile,j} ;
@@ -2456 +2456 @@
         if isequal(civAll,0)
             cmd_PATCH=RUN_PATCH(filecell.nc.civ1{ifile,j},nx_patch1,ny_patch1,rho_patch1,subdomain_patch1,thresh_patch1,test_interp,PatchBin);
-            cmd=[cmd '\n' cmd_PATCH];
+            cmd=[cmd cmd_PATCH '\n'];
         else
             patch1.inputFileName=filecell.nc.civ1{ifile,j} ;
@@ -2568 +2568 @@
             if isequal(civAll,0)
                 if(isunix)
-                    cmd=[cmd '\n' 'cp -f ' filename_cmx '2 ' filename_cmx '\n' cmd_CIV2];
+                    cmd=[cmd 'cp -f ' filename_cmx '2 ' filename_cmx '\n' cmd_CIV2 '\n'];
                 else
-                    cmd=[cmd '\n' 'copy /Y ' filename_cmx '2 ' filename_cmx '\n' cmd_CIV2];
+                    cmd=[cmd 'copy /Y ' filename_cmx '2 ' filename_cmx '\n' cmd_CIV2 '\n'];
                 end
             else
@@ -2603 +2603 @@
                    ' -fi2 ' num2str(flagindex2(2)) ' -fi3 ' num2str(flagindex2(3)) ...
                    ' -threshC ' num2str(thresh_vec2C) ' -threshV ' num2str(thresh_vel2) ' -maskName ' maskname];
-                cmd=[cmd '\n' cmd_FIX];
+                cmd=[cmd cmd_FIX '\n'];
            else                      
                 fix2.inputFileName=filecell.nc.civ2{ifile,j} ;
@@ -2628 +2628 @@
             if isequal(civAll,0)
                 cmd_PATCH=RUN_PATCH(filecell.nc.civ2{ifile,j},nx_patch2,ny_patch2,rho_patch2,subdomain_patch2,thresh_patch2,test_interp,PatchBin);
-                cmd=[cmd '\n' cmd_PATCH];
+                cmd=[cmd cmd_PATCH '\n'];
             else
                 patch2.inputFileName=filecell.nc.civ1{ifile,j} ;
@@ -2674 +2674 @@
             save(civAllxml,[filename_cmx([1:end-4]) '.xml']);
             %cmd=char({cmd;[CivBin ' -f ' [filename_cmx([1:end-4]) '.xml'] ' ' civAllCmd]});
-            cmd=[cmd '\n' CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd];
+            cmd=[cmd CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd  '\n'];
         end
       % create the .bat file:
@@ -2685 +2685 @@
         filename_bat(end-2:end)='bat';
         fid=fopen(filename_bat,'w');
-          
         fprintf(fid,cmd);
         fclose(fid);
@@ -4827 +4826 @@
 % 
 %             textout=char(textcmx);
-
+par.filename_ima_a=regexprep(par.filename_ima_a,'.png','');
+par.filename_ima_b=regexprep(par.filename_ima_b,'.png','');
    fid=fopen([filename '.cmx'],'w');
 fprintf(fid,['##############   CMX file' '\n' ]);
- fprintf(fid,   ['FirstImage ' par.filename_ima_a '\n' ]);
- fprintf(fid,   ['LastImage  ' par.filename_ima_b '\n' ]);
+ fprintf(fid,   ['FirstImage ' regexprep(par.filename_ima_a,'\\','\\\\') '\n' ]);
+ fprintf(fid,   ['LastImage  ' regexprep(par.filename_ima_b,'\\','\\\\') '\n' ]);
   fprintf(fid,  ['XX' '\n' ]);
   fprintf(fid,  ['Mask ' par.maskflag '\n' ]);
@@ -4862 +4862 @@
   
 cmd_CIV1=[sparam.Civ1Bin ' -f ' filename '.cmx' ]; % redirect standard output to the log file
+cmd_CIV1=regexprep(cmd_CIV1,'\\','\\\\');
+namelog=regexprep(namelog,'\\','\\\\');
+
 if(isunix)
     [Rootbat,Filebat,extbat]=fileparts(namelog);