Changeset 36


Ignore:
Timestamp:
09/15/09 11:54:02 (15 years ago)
Author:
pinsard
Message:

save mat-files even if octave is running

Location:
trunk/private
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/private/script_correc.m

    r34 r36  
    129129% $Id$ 
    130130% 
     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 
    131136% 
    132137% - fplod 2009-09-08T14:32:16Z aedon.locean-ipsl.upmc.fr (Darwin) 
     
    399404 
    400405  %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 
    402411 
    403412  %definition du NN optimal :  
     
    405414   
    406415  %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 
    408421   
    409422  %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  
    1313# 
    1414# 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. 
    1719# The are moved to ${TP_MLP_AEROSOLS_LOG}. 
    1820# 
     
    5860# ==== 
    5961# 
     62# 
    6063# if matlab running, test if licence ok 
    6164# 
     
    7578# 
    7679# $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 
    7790# 
    7891# - fplod 2009-08-20T15:03:22Z aedon.locean-ipsl.upmc.fr (Darwin) 
     
    93106*) 
    94107  set -o posix 
     108;; 
     109esac 
     110 
     111case "${system}" in 
     112Darwin) 
     113 timecmd=/usr/bin/time 
     114;; 
     115*) 
     116 timecmd=time 
    95117;; 
    96118esac 
     
    166188case ${application} in 
    167189matlab) 
    168  time matlab -nojvm -nosplash -nodisplay <  ${script}  1>> ${log} 2>&1 
     190 ${timecmd} matlab -nojvm -nosplash -nodisplay <  ${script}  1>> ${log} 2>&1 
    169191;; 
    170192octave) 
    171  time octave --silent ${script} 1>> ${log} 2>&1 
     193 ${timecmd} octave --silent ${script} 1>> ${log} 2>&1 
    172194;; 
    173195esac 
    174196# 
    175 for file in ./*.eps 
    176 do 
    177  mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .eps).${application}_$(hostname)_${log_date}.eps 
     197for file in ./*.ps 
     198do 
     199 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .ps).${application}_$(hostname)_${log_date}.ps 
    178200done 
    179201# 
     
    181203do 
    182204 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .dat).${application}_$(hostname)_${log_date}.dat 
     205done 
     206for file in ./norm_param.mat ./net_opti.mat ./base_mix.mat 
     207do 
     208 mv ${file} ${TP_MLP_AEROSOLS_LOG}/$(basename ${file} .mat).${application}_$(hostname)_${log_date}.mat 
    183209done 
    184210# 
Note: See TracChangeset for help on using the changeset viewer.