Ignore:
Timestamp:
Mar 25, 2026, 11:19:02 AM (11 days ago)
Author:
jbclement
Message:

PEM:

  • Fix outputs "diagevo.nc" for 3D data.
  • Fix sign in computing exchanges due to adsorption/ice table and in balancing H2O flux from/into atmosphere.
  • Few cleanings.

JBC

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/LMDZ.COMMON/libf/evolution/deftank/pem_workflow_lib.sh

    r4117 r4152  
    498498    cleanup diags/diagfi .nc $i_resume
    499499    cleanup diags/diagsoil .nc $i_resume
    500     cleanup diags/Xoutdaily4pem .nc $i_resume
    501     cleanup diags/Xoutyearly4pem .nc $i_resume
     500    cleanup diags/xoutdaily4pem .nc $i_resume
     501    cleanup diags/xoutyearly4pem .nc $i_resume
    502502    cleanup logs/run_pcm .log $i_resume
    503503    cleanup starts/restart1D .txt $i_resume
     
    527527        fi
    528528        if [ $i_resume -eq $(($n_pcm_runs_ini - 1)) ]; then
    529             cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y1.nc
    530             cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y1.nc
     529            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y1.nc
     530            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y1.nc
    531531            submit_cycle $1 $n_pcm_runs_ini $i_pcm_run
    532532        elif [ $i_resume -eq $n_pcm_runs_ini ]; then
    533             cp diags/Xoutdaily4pem$(($i_resume - 1)).nc Xoutdaily4pem_Y1.nc
    534             cp diags/Xoutyearly4pem$(($i_resume - 1)).nc Xoutyearly4pem_Y1.nc
    535             cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y2.nc
    536             cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y2.nc
     533            cp diags/xoutdaily4pem$(($i_resume - 1)).nc xoutdaily4pem_y1.nc
     534            cp diags/xoutyearly4pem$(($i_resume - 1)).nc xoutyearly4pem_y1.nc
     535            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y2.nc
     536            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y2.nc
    537537            submit_pem_phase $1 # The next job is a PEM run
    538538        else
     
    554554        cp starts/restartevo$(($i_pem_run - 1)).nc startevo.nc
    555555        if [ $il -eq $(($n_pcm_runs - 1)) ]; then # Second to last PCM run
    556             cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y1.nc
    557             cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y1.nc
     556            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y1.nc
     557            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y1.nc
    558558            submit_cycle $1 $n_pcm_runs $(($il + 1))
    559559        elif [ $il -eq $n_pcm_runs ]; then # Last PCM run so the next job is a PEM run
    560             cp diags/Xoutdaily4pem$(($i_resume - 1)).nc Xoutdaily4pem_Y1.nc
    561             cp diags/Xoutyearly4pem$(($i_resume - 1)).nc Xoutyearly4pem_Y1.nc
    562             cp diags/Xoutdaily4pem${i_resume}.nc Xoutdaily4pem_Y2.nc
    563             cp diags/Xoutyearly4pem${i_resume}.nc Xoutyearly4pem_Y2.nc
     560            cp diags/xoutdaily4pem$(($i_resume - 1)).nc xoutdaily4pem_y1.nc
     561            cp diags/xoutyearly4pem$(($i_resume - 1)).nc xoutyearly4pem_y1.nc
     562            cp diags/xoutdaily4pem${i_resume}.nc xoutdaily4pem_y2.nc
     563            cp diags/xoutyearly4pem${i_resume}.nc xoutyearly4pem_y2.nc
    564564            submit_pem_phase $1
    565565        else
     
    582582    cleanup starts/restart .nc $(($i_pcm_run - 1))
    583583    cleanup starts/restartfi .nc $(($i_pcm_run - 1))
    584     cleanup diags/Xoutdaily4pem .nc $(($i_pcm_run - 1))
    585     cleanup diags/Xoutyearly4pem .nc $(($i_pcm_run - 1))
     584    cleanup diags/xoutdaily4pem .nc $(($i_pcm_run - 1))
     585    cleanup diags/xoutyearly4pem .nc $(($i_pcm_run - 1))
    586586    cleanup diags/diagevo .nc $i_resume
    587587    cleanup diags/diagevo_soil .nc $i_resume
Note: See TracChangeset for help on using the changeset viewer.