Changeset 653


Ignore:
Timestamp:
06/23/09 12:43:32 (15 years ago)
Author:
sdipsl
Message:
  • Some cleanup (mainly tabulation in driver)
  • Updated list of LMDZ variables to get closer to CMIP5 list
Location:
CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/lmdz.card

    r652 r653  
    33 
    44[UserChoices] 
    5 ByPass_hgardfou_teta= n 
    6 ByPass_hgardfou_mats= n 
    7 LMDZ_adjust= n 
     5ByPass_hgardfou_teta=n 
     6ByPass_hgardfou_mats=n 
     7LMDZ_adjust=n 
    88 
    99[InitialStateFiles] 
    … …  
    6666Patches= (Patch_20070220_histcom_time_axis) 
    6767GatherWithInternal = (lon, lat, presnivs, time_counter, aire) 
    68 TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic) 
     68TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic) 
    6969 
    7070[Post_1M_histISCCP] 
    … …  
    8686Patches= (Patch_20070220_histcom_time_axis) 
    8787GatherWithInternal = (lon, lat, presnivs, time_counter) 
    88 TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max) 
     88TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max, u850, v850, w850, phi850, q850, t850, u700, v700, w700, phi700, q700, t700, u500, v500, w500, phi500, q500, t500, u200, v200, w200, phi200, q200, t200) 
    8989 
    9090[Post_HF_histhf] 
    9191Patches= (Patch_20070220_histcom_time_axis) 
    9292GatherWithInternal = (lon, lat, presnivs, time_counter) 
    93 TimeSeriesVars=(cldt, psol, q2m, slp, t2m, rain, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10) 
     93TimeSeriesVars=(cldt, psol, q2m, slp, SWnetOR, SWdownOR, LWdownOR, precip, pluc, plul, prw, t2m, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10) 
    9494 
    9595[Post_HF_histhf3d] 
    9696Patches= () 
    9797GatherWithInternal = (lon, lat, presnivs, time_counter) 
    98 TimeSeriesVars=(temp, ovap, vitu, vitv) 
     98TimeSeriesVars=(temp, theta, ovap, vitu, vitv) 

  • CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/lmdz.driver

    r649 r653  
    77    RESOL_ATM=$( echo $RESOL | awk "-Fx" '{print $2}' ) 
    88 
    9     [ -f $SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D $SUBMIT_DIR}/../.resol) 
    10     [ -f $SUBMIT_DIR}/../.resol ] || export RESOL_ATM_3D=96x95x19 
     9    [ -f $SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D $SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19 
    1110 
    1211    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' ) 

  • CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/oasis.driver

    r648 r653  
    33CPL_Initialize () 
    44{ 
    5  
    65    IGCM_debug_PushStack "CPL_Initialize" 
    76  
    87    echo INITIALIZE CPL !!! 
    98 
    10 #D- MPI context used to launch the coupled model 
    11 LIBMPI=$(cat ${SUBMIT_DIR}/../.libmpi) 
    12 echo LIBMPI=${LIBMPI} 
     9    #D- MPI context used to launch the coupled model 
     10    LIBMPI=$(cat ${SUBMIT_DIR}/../.libmpi) 
     11    echo LIBMPI=${LIBMPI} 
    1312 
    14 #D- MPISUSPEND=ON required for MPMD mode used by oasis 
     13    #D- MPISUSPEND=ON required for MPMD mode used by oasis 
    1514    export MPISUSPEND=ON 
    1615 
    … …  
    1817 
    1918    IGCM_debug_PopStack "CPL_Initialize" 
    20  
    2119} 
    2220 
    … …  
    2624    IGCM_debug_PushStack "CPL_Update" 
    2725 
    28 ############ Update Time and Counters ############## 
    29 ##-- Calcul de la duree du job (en secondes) 
    30 (( D_JOB_SEC = 3600 * 24 * PeriodLengthInDays )) 
     26    ############ Update Time and Counters ############## 
     27    ##-- Calcul de la duree du job (en secondes) 
     28    (( D_JOB_SEC = 3600 * 24 * PeriodLengthInDays )) 
    3129 
    32 ############ Update Other Parameters  ############## 
    33 ## Read Output_mode option in ${compname}.card --> Put "y" to have coupling variables in ouptut files 
    34 IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices Output_mode  
    35 eval Output_mode=\${${compname}_UserChoices_Output_mode} > /dev/null 2>&1 
    36 echo ${Output_mode} 
    37 Output_var='EXPORTED' 
    38 if [ ${Output_mode} = y ] ; then 
    39     Output_var='EXPOUT' 
    40 fi 
     30    ############ Update Other Parameters  ############## 
     31    ## Read Output_mode option in ${compname}.card --> Put "y" to have coupling variables in ouptut files 
     32    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices Output_mode  
     33    eval Output_mode=\${${compname}_UserChoices_Output_mode} > /dev/null 2>&1 
     34    echo ${Output_mode} 
     35    Output_var='EXPORTED' 
     36    if [ ${Output_mode} = y ] ; then 
     37        Output_var='EXPOUT' 
     38    fi 
    4139 
    42 ############ Update Parameter Files   ############## 
    43 sed -e "s/<initial_date>/${PeriodDateBegin}/" \ 
    44     -e "s/<total_time>/${D_JOB_SEC}/" \ 
    45     -e "s/<lib_mpi>/${LIBMPI}/" \ 
    46     -e "s/<nproc_atm>/${NUM_PROC_ATM}/g" \ 
    47     -e "s/<nproc_oce>/${NUM_PROC_OCE}/g" \ 
    48     -e "s/<output_mode>/${Output_var}/g" \ 
     40    ############ Update Parameter Files   ############## 
     41    sed -e "s/<initial_date>/${PeriodDateBegin}/" \ 
     42        -e "s/<total_time>/${D_JOB_SEC}/" \ 
     43        -e "s/<lib_mpi>/${LIBMPI}/" \ 
     44        -e "s/<nproc_atm>/${NUM_PROC_ATM}/g" \ 
     45        -e "s/<nproc_oce>/${NUM_PROC_OCE}/g" \ 
     46        -e "s/<output_mode>/${Output_var}/g" \ 
    4947        namcouple > namcouple.tmp 
    5048 
    … …  
    7068 
    7169    IGCM_debug_PopStack "CPL_Finalize" 
    72  
    7370} 

  • CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/opa9.driver

    r583 r653  
    1010    ORCA_NPDT_JOUR=${opa9_UserChoices_OPA_NPDT_JOURS:=15} 
    1111 
    12 # Local function to find namelists parameters 
    13         supergrep () { 
    14             grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%" 
    15         } 
    16          
     12    # Local function to find namelists parameters 
     13    supergrep () { 
     14        grep "^ *$1 *=" $2 | sed -e "s% *\!.*%%" 
     15    } 
     16 
    1717    ##--Variables used by OPA -- 
    1818 
    … …  
    3131    # nf_ptr_wri frequency of zonal means and transport output 
    3232 
    33             PAT_CEXPER=$( supergrep cexper     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    34             PAT_NIT000=$( supergrep nit000     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    35             PAT_NITEND=$( supergrep nitend     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    36             PAT_NWRITE=$( supergrep nwrite     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    37             PAT_NF_PTR=$( supergrep nf_ptr_wri ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    38             PAT_RESTAR=$( supergrep ln_rstart  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    39             PAT_NSTOCK=$( supergrep nstock     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    40             PAT_NRSTAR=$( supergrep nrstdt     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    41             PAT_NDATE0=$( supergrep ndate0     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    42             PAT_NLEAPY=$( supergrep nleapy     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    43             PAT_NMSH=$(   supergrep nmsh       ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
    44          
    45             ORCA_RDT=$( supergrep rdt  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} | sed 's/ *rdt *=//' | sed 's/\. *//' ) 
     33    PAT_CEXPER=$( supergrep cexper     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     34    PAT_NIT000=$( supergrep nit000     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     35    PAT_NITEND=$( supergrep nitend     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     36    PAT_NWRITE=$( supergrep nwrite     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     37    PAT_NF_PTR=$( supergrep nf_ptr_wri ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     38    PAT_RESTAR=$( supergrep ln_rstart  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     39    PAT_NSTOCK=$( supergrep nstock     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     40    PAT_NRSTAR=$( supergrep nrstdt     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     41    PAT_NDATE0=$( supergrep ndate0     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     42    PAT_NLEAPY=$( supergrep nleapy     ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     43    PAT_NMSH=$(   supergrep nmsh       ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} ) 
     44 
     45    ORCA_RDT=$( supergrep rdt  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE} | sed 's/ *rdt *=//' | sed 's/\. *//' ) 
    4646 
    4747    # Period Length In Days between DateBegin and first day of calendar 0001 01 01 
    … …  
    128128    (( NB_SEC_JOUR = 60 * 60 * 24 )) 
    129129 
    130     if [ ${NB_SEC_JOUR_MODEL} -ne ${NB_SEC_JOUR} ] 
    131         then 
     130    if [ ${NB_SEC_JOUR_MODEL} -ne ${NB_SEC_JOUR} ] ; then 
    132131        echo " VERIFY ORCA_NPDT_JOUR in opa9.card " 
    133132        exit 
    … …  
    136135    ##-- Restart configuration 
    137136    if ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "n" ] ) ; then 
    138  
    139137        ORCA_LRSTAR=.FALSE. 
    140138        ORCA_NRSTDT=0 
    141139        # Put ORCA_NMSH=0 when OPA running in parallel mode 
    142140        ORCA_NMSH=1 
    143  
    144141        #echo "NO OPA RESTART" 
    145142    elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "y" ] ) ; then 
    146  
    147143        ORCA_LRSTAR=.TRUE. 
    148144        ORCA_NRSTDT=0 
    149145        ORCA_NMSH=0 
    150  
    151146        #echo "OPA RESTART" 
    152147    else 
    153  
    154148        ORCA_LRSTAR=.TRUE. 
    155149        ORCA_NRSTDT=2 
    156150        ORCA_NMSH=0 
    157  
    158151        #echo "OPA RESTART" 
    159152    fi 
    160  
    161153 
    162154    # nleapy configuration 
    163155    case ${config_UserChoices_CalendarType} in 
    164          leap) 
    165          ORCA_NLEAPY=1;; 
    166          noleap) 
    167          ORCA_NLEAPY=0;; 
    168          360d) 
    169          ORCA_NLEAPY=30;; 
    170          *) 
    171          ORCA_NLEAPY=30 
     156        leap) 
     157            ORCA_NLEAPY=1;; 
     158        noleap) 
     159            ORCA_NLEAPY=0;; 
     160        360d) 
     161            ORCA_NLEAPY=30;; 
     162        *) 
     163            ORCA_NLEAPY=30 
    172164    esac 
    173  
    174165 
    175166    typeset -r PRECIS=8 

  • CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/orchidee.driver

    r396 r653  
    3535    IGCM_sys_Mv orchidee.def.tmp orchidee.def 
    3636 
    37 #     IGCM_sys_Cp ${RUN_DIR}/orchidee.def ${RUN_DIR}/run.def 
    38 #     IGCM_sys_Put_Out ${RUN_DIR}/run.def ${R_SAVE}/${PREFIX}_run.def 
     37    #IGCM_sys_Cp ${RUN_DIR}/orchidee.def ${RUN_DIR}/run.def 
     38    #IGCM_sys_Put_Out ${RUN_DIR}/run.def ${R_SAVE}/${PREFIX}_run.def 
    3939 
    4040    IGCM_debug_PopStack "SRF_Update" 
    … …  
    4646    IGCM_debug_PushStack "SRF_Finalize" 
    4747 
    48 #     IGCM_sys_Put_Out ${RUN_DIR}/used_run.def ${R_SAVE}/${PREFIX}_used_run.def 
     48    #IGCM_sys_Put_Out ${RUN_DIR}/used_run.def ${R_SAVE}/${PREFIX}_used_run.def 
    4949 
    5050    echo FINALIZE SRF !!! 
Note: See TracChangeset for help on using the changeset viewer.