Changeset 36
- Timestamp:
- 09/15/09 11:54:02 (15 years ago)
- Location:
- trunk/private
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/private/script_correc.m
r34 r36 129 129 % $Id$ 130 130 % 131 % - fplod 2009-09-14T12:22:05Z aedon.locean-ipsl.upmc.fr (Darwin) 132 % 133 % * as octave save default format is ASCII 134 % while matlab save default format is MAT v5 mat-file (little endian) and 135 % default extension is ``.mat``, write more precise save instruction 131 136 % 132 137 % - fplod 2009-09-08T14:32:16Z aedon.locean-ipsl.upmc.fr (Darwin) … … 399 404 400 405 %save pour part2 401 save('base_mix.mat','base_mix'); 406 if (run_octave == 0) 407 save('base_mix.mat','base_mix','-v7'); 408 else 409 save('-v7','base_mix.mat','base_mix'); 410 end 402 411 403 412 %definition du NN optimal : … … 405 414 406 415 %sauvegarde du NN optimal : 407 save('net_opti.mat','net_opti'); 416 if (run_octave == 0) 417 save('net_opti.mat','net_opti','-v7'); 418 else 419 save('-v7','net_opti.mat','net_opti'); 420 end 408 421 409 422 %sauvegarde des moy et et pour la normalisation : 410 save('norm_param.mat','moy','et'); 423 if (run_octave == 0) 424 save('norm_param.mat','moy','et','-v7'); 425 else 426 save('-v7','norm_param.mat','moy','et'); 427 end -
trunk/private/script_correc.sh
r30 r36 13 13 # 14 14 # At the end of ``script_correc.m`` execution, output files are renamed from 15 # \*.eps and \*.dat to *application*\ _*hostname*\ _*YYYYMMDDTHHMMSSZ*.eps and 16 # *application*\ _*hostname*\ _*YYYYMMDDTHHMMSSZ*.dat. 15 # \*.ps, \*.dat and \*.mat to 16 # *application*\ _*hostname*\ _*YYYYMMDDTHHMMSSZ*.ps, 17 # *application*\ _*hostname*\ _*YYYYMMDDTHHMMSSZ*.dat and 18 # *application*\ _*hostname*\ _*YYYYMMDDTHHMMSSZ*.mat. 17 19 # The are moved to ${TP_MLP_AEROSOLS_LOG}. 18 20 # … … 58 60 # ==== 59 61 # 62 # 60 63 # if matlab running, test if licence ok 61 64 # … … 75 78 # 76 79 # $Id$ 80 # 81 # - fplod 2009-09-14T12:26:45Z aedon.locean-ipsl.upmc.fr (Darwin) 82 # 83 # * rename and move ``.mat` files 84 # * on mac, time (if time is a shell keyword) output is neither on stdout or 85 # stderr. One must use /usr/bin/time ! 86 # 87 # - fplod 2009-09-11T07:06:28Z aedon.locean-ipsl.upmc.fr (Darwin) 88 # 89 # * handle ``.ps`` files instead of ``.eps` files 77 90 # 78 91 # - fplod 2009-08-20T15:03:22Z aedon.locean-ipsl.upmc.fr (Darwin) … … 93 106 *) 94 107 set -o posix 108 ;; 109 esac 110 111 case "${system}" in 112 Darwin) 113 timecmd=/usr/bin/time 114 ;; 115 *) 116 timecmd=time 95 117 ;; 96 118 esac … … 166 188 case ${application} in 167 189 matlab) 168 timematlab -nojvm -nosplash -nodisplay < ${script} 1>> ${log} 2>&1190 ${timecmd} matlab -nojvm -nosplash -nodisplay < ${script} 1>> ${log} 2>&1 169 191 ;; 170 192 octave) 171 timeoctave --silent ${script} 1>> ${log} 2>&1193 ${timecmd} octave --silent ${script} 1>> ${log} 2>&1 172 194 ;; 173 195 esac 174 196 # 175 for file in ./*. eps176 do 177 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} . eps).${application}_$(hostname)_${log_date}.eps197 for file in ./*.ps 198 do 199 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .ps).${application}_$(hostname)_${log_date}.ps 178 200 done 179 201 # … … 181 203 do 182 204 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .dat).${application}_$(hostname)_${log_date}.dat 205 done 206 for file in ./norm_param.mat ./net_opti.mat ./base_mix.mat 207 do 208 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .mat).${application}_$(hostname)_${log_date}.mat 183 209 done 184 210 #
Note: See TracChangeset
for help on using the changeset viewer.