Ignore:
Timestamp:
Jul 21, 2025, 1:55:12 PM (13 days ago)
Author:
jbclement
Message:

PEM:

  • Big update of "README" file in the "deftank" folder.
  • Renaming the log files "out_run*" into "run.log".
  • Merging the folders "out_PCM" and "out_PEM" into "logs" where the log files are gathered with convenient renaming.
  • Update of job files.
  • More robust tests in "lib_launchPEM.sh".

JBC

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/evolution/deftank/lib_launchPEM.sh

    r3859 r3861  
    4040    else
    4141        echo "Error: neither SLURM nor TORQUE/PBS is installed on $machine!"
    42         echo "You need to adapt the script to your job scheduler."
     42        echo "You need to adapt the script to your job scheduler or set 'mode' to 0."
    4343        errlaunch
    4444    fi
    … …  
    125125
    126126    if [ -v n_mars_years ] && [ ! -z "$n_mars_years" ]; then
    127         if [ $(echo "$n_mars_years < 0." | bc -l) -eq 1 ]; then
    128             echo "Error: the value of 'n_mars_years' must be >0!"
     127        if [ $(echo "$n_mars_years <= 0." | bc -l) -eq 1 ]; then
     128            echo "Error: 'n_mars_years' must be > 0!"
    129129            errlaunch
    130130        fi
    131131    elif [ -v n_earth_years ] && [ ! -z "$n_earth_years" ]; then
    132         if [ $(echo "$n_earth_years < 0." | bc -l) -eq 1 ]; then
    133             echo "Error: the value of 'n_earth_years' must be >0!"
     132        if [ $(echo "$n_earth_years <= 0." | bc -l) -eq 1 ]; then
     133            echo "Error: 'n_earth_years' must be > 0!"
    134134            errlaunch
    135135        fi
    136136    else
    137         echo "Error: no number of years to be simulated has been set!"
     137        echo "Error: the number of years to be simulated is not set!"
    138138        errlaunch
    139139    fi
    140140    if [ $nPCM_ini -lt 2 ] || [ -z "$nPCM_ini" ]; then
    141         echo "Error: the value of 'nPCM_ini' must be >1!"
     141        echo "Error: 'nPCM_ini' must be >= 2!"
    142142        errlaunch
    143143    fi
    144144    if [ $nPCM -lt 2 ] || [ -z "$nPCM" ]; then
    145         echo "Error: the value of 'nPCM' must be >1!"
     145        echo "Error: 'nPCM' must be >= 2!"
    146146        errlaunch
    147147    fi
    … …  
    178178        errlaunch
    179179    fi
    180     if [ ! -d "out_PCM" ]; then
    181         mkdir out_PCM
    182     fi
    183     if [ ! -d "out_PEM" ]; then
    184         mkdir out_PEM
     180    if [ ! -d "logs" ]; then
     181        mkdir logs
    185182    fi
    186183    if [ ! -d "starts" ]; then
    … …  
    382379    cleanfiles diags/diagsoil .nc $irelaunch
    383380    cleanfiles diags/data2reshape .nc $irelaunch
    384     cleanfiles "out_PCM/run" "" $irelaunch
     381    cleanfiles logs/runPCM .log $irelaunch
    385382    cleanfiles starts/restart1D .txt $irelaunch
    386383    cleanfiles starts/restart .nc $irelaunch
    … …  
    403400        cleanfiles diags/diagpem .nc $(($iPEM - 1))
    404401        cleanfiles diags/diagsoilpem .nc $(($iPEM - 1))
    405         cleanfiles "out_PEM/run" "" $(($iPEM - 1))
     402        cleanfiles logs/runPEM .log $(($iPEM - 1))
    406403        cleanfiles starts/restart1D_postPEM .txt $(($iPEM - 1))
    407404        cleanfiles starts/restart_postPEM .nc $(($iPEM - 1))
    … …  
    434431        cleanfiles diags/diagpem .nc $(($iPEM - 1))
    435432        cleanfiles diags/diagsoilpem .nc $(($iPEM - 1))
    436         cleanfiles "out_PEM/run" "" $(($iPEM - 1))
     433        cleanfiles logs/runPEM .log $(($iPEM - 1))
    437434        cleanfiles starts/restart1D_postPEM .txt $(($iPEM - 1))
    438435        cleanfiles starts/restart_postPEM .nc $(($iPEM - 1))
    … …  
    463460    cleanfiles diags/diagfi .nc $(($iPCM - 1))
    464461    cleanfiles diags/diagsoil .nc $(($iPCM - 1))
    465     cleanfiles "out_PCM/run" "" $(($iPCM - 1))
     462    cleanfiles logs/runPCM .log $(($iPCM - 1))
    466463    cleanfiles starts/restart1D .txt $(($iPCM - 1))
    467464    cleanfiles starts/restart .nc $(($iPCM - 1))
    … …  
    470467    cleanfiles diags/diagpem .nc $irelaunch
    471468    cleanfiles diags/diagsoilpem .nc $irelaunch
    472     cleanfiles "out_PEM/run" "" $irelaunch
     469    cleanfiles logs/runPEM .log $irelaunch
    473470    cleanfiles starts/restart1D_postPEM .txt $irelaunch
    474471    cleanfiles starts/restart_postPEM .nc $irelaunch
Note: See TracChangeset for help on using the changeset viewer.