Changeset 1546


Ignore:
Timestamp:
08/24/11 16:42:22 (11 years ago)
Author:
jgipsl
Message:

Corrected errors :

  • Forgot to change in lmdz.driver after splitting physiq.def into output.def and config.def. Now done.
  • Syntax error in if
Location:
CONFIG/IPSLCM/IPSLCM5-2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/IPSLCM/IPSLCM5-2/Chistorical/COMP/lmdz.driver

    r1545 r1546  
    129129               ;; 
    130130    esac 
    131  
     131   
    132132    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
    133133    if [ ${CumulPeriod} -eq 1 ] ; then 
     
    160160 
    161161    ##-- GHG forcing : 
    162     ##   If forcing file exist in run directory, read values for the current year and modify physiq.def 
     162    ##   If forcing file exist in run directory, read values for the current year and modify config.def 
    163163    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    164164        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    165         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR} 
     165        LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    166166    fi 
    167167    if [ -f CO2.txt ] ; then 
    168168        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    169         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2} 
     169        LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    170170    fi 
    171171    if [ -f CH4.txt ] ; then 
    172172        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    173         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4} 
     173        LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    174174    fi 
    175175    if [ -f N2O.txt ] ; then 
    176176        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    177         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O} 
     177        LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    178178    fi 
    179179    if [ -f CFC11.txt ] ; then 
    180180        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    181         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11} 
     181        LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    182182    fi 
    183183    if [ -f CFC12.txt ] ; then 
    184184        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    185         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12} 
    186     fi 
    187  
     185        LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
     186    fi 
    188187 
    189188    # Add special treatement for CARBON CYCLE 
    190     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     189    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    191190 
    192191        typeset InitPeriodCo2 InitDateBeginCo2 InitDateEndCo2 
     
    262261 
    263262        if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    264             # Modify co2_ppm in physiq.def only for historical run 
    265             LMDZ_sed physiq.def co2_ppm     ${CO2_ppm} 
     263            # Modify co2_ppm in config.def only for historical run 
     264            LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
    266265        fi 
    267266    fi 
     
    276275 
    277276    ## output.def parameters 
    278     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in physiq.def :   
     277    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    279278    #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    280     LMDZ_sed output.def phys_out_filekeys        ${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn} 
     279    LMDZ_sed output.def phys_out_filekeys       "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    281280    LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    282281    LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
     
    335334            if [ ${DRYRUN} -le 2 ] ; then 
    336335                ##-- suppression of ozone file construction -- 
    337                 cp physiq.def physiq.def.save 
    338                 LMDZ_sed physiq.def read_climoz 0 
     336                cp config.def config.def.save 
     337                LMDZ_sed config.def read_climoz 0 
    339338                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/. 
    340339                if [ ${DRYRUN} -le 1 ] ; then 
     
    343342                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc 
    344343                fi 
    345                 IGCM_sys_Mv physiq.def.save physiq.def 
     344                IGCM_sys_Mv config.def.save config.def 
    346345            else 
    347346                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated" 
     
    364363 
    365364    # Add special treatement for CARBON CYCLE 
    366     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     365    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    367366        typeset CO2SBG_3V CO2SBG CO2MBG CO2SRF CO2LU CO2_ppm CO2_ppm_prec fCO2_ff 
    368367 
  • CONFIG/IPSLCM/IPSLCM5-2/CpiControl/COMP/lmdz.driver

    r1545 r1546  
    129129               ;; 
    130130    esac 
    131  
     131   
    132132    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
    133133    if [ ${CumulPeriod} -eq 1 ] ; then 
     
    160160 
    161161    ##-- GHG forcing : 
    162     ##   If forcing file exist in run directory, read values for the current year and modify physiq.def 
     162    ##   If forcing file exist in run directory, read values for the current year and modify config.def 
    163163    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    164164        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    165         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR} 
     165        LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    166166    fi 
    167167    if [ -f CO2.txt ] ; then 
    168168        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    169         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2} 
     169        LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    170170    fi 
    171171    if [ -f CH4.txt ] ; then 
    172172        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    173         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4} 
     173        LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    174174    fi 
    175175    if [ -f N2O.txt ] ; then 
    176176        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    177         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O} 
     177        LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    178178    fi 
    179179    if [ -f CFC11.txt ] ; then 
    180180        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    181         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11} 
     181        LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    182182    fi 
    183183    if [ -f CFC12.txt ] ; then 
    184184        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    185         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12} 
    186     fi 
    187  
     185        LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
     186    fi 
    188187 
    189188    # Add special treatement for CARBON CYCLE 
    190     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     189    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    191190 
    192191        typeset InitPeriodCo2 InitDateBeginCo2 InitDateEndCo2 
     
    262261 
    263262        if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    264             # Modify co2_ppm in physiq.def only for historical run 
    265             LMDZ_sed physiq.def co2_ppm     ${CO2_ppm} 
     263            # Modify co2_ppm in config.def only for historical run 
     264            LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
    266265        fi 
    267266    fi 
     
    276275 
    277276    ## output.def parameters 
    278     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in physiq.def :   
     277    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    279278    #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    280     LMDZ_sed output.def phys_out_filekeys        ${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn} 
     279    LMDZ_sed output.def phys_out_filekeys       "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    281280    LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    282281    LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
     
    335334            if [ ${DRYRUN} -le 2 ] ; then 
    336335                ##-- suppression of ozone file construction -- 
    337                 cp physiq.def physiq.def.save 
    338                 LMDZ_sed physiq.def read_climoz 0 
     336                cp config.def config.def.save 
     337                LMDZ_sed config.def read_climoz 0 
    339338                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/. 
    340339                if [ ${DRYRUN} -le 1 ] ; then 
     
    343342                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc 
    344343                fi 
    345                 IGCM_sys_Mv physiq.def.save physiq.def 
     344                IGCM_sys_Mv config.def.save config.def 
    346345            else 
    347346                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated" 
     
    364363 
    365364    # Add special treatement for CARBON CYCLE 
    366     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     365    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    367366        typeset CO2SBG_3V CO2SBG CO2MBG CO2SRF CO2LU CO2_ppm CO2_ppm_prec fCO2_ff 
    368367 
  • CONFIG/IPSLCM/IPSLCM5-2/EXP00/COMP/lmdz.driver

    r1544 r1546  
    129129               ;; 
    130130    esac 
    131  
     131   
    132132    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
    133133    if [ ${CumulPeriod} -eq 1 ] ; then 
     
    160160 
    161161    ##-- GHG forcing : 
    162     ##   If forcing file exist in run directory, read values for the current year and modify physiq.def 
     162    ##   If forcing file exist in run directory, read values for the current year and modify config.def 
    163163    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    164164        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    165         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR} 
     165        LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    166166    fi 
    167167    if [ -f CO2.txt ] ; then 
    168168        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    169         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2} 
     169        LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    170170    fi 
    171171    if [ -f CH4.txt ] ; then 
    172172        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    173         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4} 
     173        LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    174174    fi 
    175175    if [ -f N2O.txt ] ; then 
    176176        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    177         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O} 
     177        LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    178178    fi 
    179179    if [ -f CFC11.txt ] ; then 
    180180        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    181         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11} 
     181        LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    182182    fi 
    183183    if [ -f CFC12.txt ] ; then 
    184184        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    185         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12} 
    186     fi 
    187  
     185        LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
     186    fi 
    188187 
    189188    # Add special treatement for CARBON CYCLE 
    190     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     189    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    191190 
    192191        typeset InitPeriodCo2 InitDateBeginCo2 InitDateEndCo2 
     
    262261 
    263262        if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    264             # Modify co2_ppm in physiq.def only for historical run 
    265             LMDZ_sed physiq.def co2_ppm     ${CO2_ppm} 
     263            # Modify co2_ppm in config.def only for historical run 
     264            LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
    266265        fi 
    267266    fi 
     
    276275 
    277276    ## output.def parameters 
    278     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in physiq.def :   
     277    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    279278    #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    280     LMDZ_sed output.def phys_out_filekeys        ${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn} 
     279    LMDZ_sed output.def phys_out_filekeys       "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    281280    LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    282281    LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
     
    335334            if [ ${DRYRUN} -le 2 ] ; then 
    336335                ##-- suppression of ozone file construction -- 
    337                 cp physiq.def physiq.def.save 
    338                 LMDZ_sed physiq.def read_climoz 0 
     336                cp config.def config.def.save 
     337                LMDZ_sed config.def read_climoz 0 
    339338                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/. 
    340339                if [ ${DRYRUN} -le 1 ] ; then 
     
    343342                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc 
    344343                fi 
    345                 IGCM_sys_Mv physiq.def.save physiq.def 
     344                IGCM_sys_Mv config.def.save config.def 
    346345            else 
    347346                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated" 
     
    364363 
    365364    # Add special treatement for CARBON CYCLE 
    366     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     365    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    367366        typeset CO2SBG_3V CO2SBG CO2MBG CO2SRF CO2LU CO2_ppm CO2_ppm_prec fCO2_ff 
    368367 
  • CONFIG/IPSLCM/IPSLCM5-2/historical/COMP/lmdz.driver

    r1545 r1546  
    129129               ;; 
    130130    esac 
    131  
     131   
    132132    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
    133133    if [ ${CumulPeriod} -eq 1 ] ; then 
     
    160160 
    161161    ##-- GHG forcing : 
    162     ##   If forcing file exist in run directory, read values for the current year and modify physiq.def 
     162    ##   If forcing file exist in run directory, read values for the current year and modify config.def 
    163163    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    164164        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    165         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR} 
     165        LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    166166    fi 
    167167    if [ -f CO2.txt ] ; then 
    168168        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    169         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2} 
     169        LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    170170    fi 
    171171    if [ -f CH4.txt ] ; then 
    172172        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    173         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4} 
     173        LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    174174    fi 
    175175    if [ -f N2O.txt ] ; then 
    176176        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    177         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O} 
     177        LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    178178    fi 
    179179    if [ -f CFC11.txt ] ; then 
    180180        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    181         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11} 
     181        LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    182182    fi 
    183183    if [ -f CFC12.txt ] ; then 
    184184        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    185         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12} 
    186     fi 
    187  
     185        LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
     186    fi 
    188187 
    189188    # Add special treatement for CARBON CYCLE 
    190     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     189    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    191190 
    192191        typeset InitPeriodCo2 InitDateBeginCo2 InitDateEndCo2 
     
    262261 
    263262        if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    264             # Modify co2_ppm in physiq.def only for historical run 
    265             LMDZ_sed physiq.def co2_ppm     ${CO2_ppm} 
     263            # Modify co2_ppm in config.def only for historical run 
     264            LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
    266265        fi 
    267266    fi 
     
    276275 
    277276    ## output.def parameters 
    278     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in physiq.def :   
     277    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    279278    #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    280     LMDZ_sed output.def phys_out_filekeys        ${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn} 
     279    LMDZ_sed output.def phys_out_filekeys       "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    281280    LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    282281    LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
     
    335334            if [ ${DRYRUN} -le 2 ] ; then 
    336335                ##-- suppression of ozone file construction -- 
    337                 cp physiq.def physiq.def.save 
    338                 LMDZ_sed physiq.def read_climoz 0 
     336                cp config.def config.def.save 
     337                LMDZ_sed config.def read_climoz 0 
    339338                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/. 
    340339                if [ ${DRYRUN} -le 1 ] ; then 
     
    343342                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc 
    344343                fi 
    345                 IGCM_sys_Mv physiq.def.save physiq.def 
     344                IGCM_sys_Mv config.def.save config.def 
    346345            else 
    347346                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated" 
     
    364363 
    365364    # Add special treatement for CARBON CYCLE 
    366     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     365    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    367366        typeset CO2SBG_3V CO2SBG CO2MBG CO2SRF CO2LU CO2_ppm CO2_ppm_prec fCO2_ff 
    368367 
  • CONFIG/IPSLCM/IPSLCM5-2/piControl/COMP/lmdz.driver

    r1545 r1546  
    129129               ;; 
    130130    esac 
    131  
     131   
    132132    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
    133133    if [ ${CumulPeriod} -eq 1 ] ; then 
     
    160160 
    161161    ##-- GHG forcing : 
    162     ##   If forcing file exist in run directory, read values for the current year and modify physiq.def 
     162    ##   If forcing file exist in run directory, read values for the current year and modify config.def 
    163163    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    164164        IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    165         LMDZ_sed physiq.def solaire     ${IPCC_SOLAR} 
     165        LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    166166    fi 
    167167    if [ -f CO2.txt ] ; then 
    168168        IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    169         LMDZ_sed physiq.def co2_ppm     ${IPCC_CO2} 
     169        LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    170170    fi 
    171171    if [ -f CH4.txt ] ; then 
    172172        IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    173         LMDZ_sed physiq.def CH4_ppb     ${IPCC_CH4} 
     173        LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    174174    fi 
    175175    if [ -f N2O.txt ] ; then 
    176176        IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    177         LMDZ_sed physiq.def N2O_ppb     ${IPCC_N2O} 
     177        LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    178178    fi 
    179179    if [ -f CFC11.txt ] ; then 
    180180        IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    181         LMDZ_sed physiq.def CFC11_ppt   ${IPCC_CFC11} 
     181        LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    182182    fi 
    183183    if [ -f CFC12.txt ] ; then 
    184184        IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    185         LMDZ_sed physiq.def CFC12_ppt   ${IPCC_CFC12} 
    186     fi 
    187  
     185        LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
     186    fi 
    188187 
    189188    # Add special treatement for CARBON CYCLE 
    190     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     189    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    191190 
    192191        typeset InitPeriodCo2 InitDateBeginCo2 InitDateEndCo2 
     
    262261 
    263262        if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    264             # Modify co2_ppm in physiq.def only for historical run 
    265             LMDZ_sed physiq.def co2_ppm     ${CO2_ppm} 
     263            # Modify co2_ppm in config.def only for historical run 
     264            LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
    266265        fi 
    267266    fi 
     
    276275 
    277276    ## output.def parameters 
    278     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in physiq.def :   
     277    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    279278    #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    280     LMDZ_sed output.def phys_out_filekeys        ${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn} 
     279    LMDZ_sed output.def phys_out_filekeys       "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    281280    LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    282281    LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
     
    335334            if [ ${DRYRUN} -le 2 ] ; then 
    336335                ##-- suppression of ozone file construction -- 
    337                 cp physiq.def physiq.def.save 
    338                 LMDZ_sed physiq.def read_climoz 0 
     336                cp config.def config.def.save 
     337                LMDZ_sed config.def read_climoz 0 
    339338                IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/. 
    340339                if [ ${DRYRUN} -le 1 ] ; then 
     
    343342                    IGCM_sys_Put_Out startphy.nc ${R_OUT_ATM_R}/${config_UserChoices_JobName}_${PeriodDateBegin}_startphy.nc 
    344343                fi 
    345                 IGCM_sys_Mv physiq.def.save physiq.def 
     344                IGCM_sys_Mv config.def.save config.def 
    346345            else 
    347346                echo "EXECUTION of ${HOST_MPIRUN_COMMAND} -np 1 ./create_etat0_limit.e simulated" 
     
    364363 
    365364    # Add special treatement for CARBON CYCLE 
    366     if [ ${lmdz_UserChoices_CARBON_CYCLE} = control ] || [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
     365    if [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"control" ] || [ X"${lmdz_UserChoices_CARBON_CYCLE}" = X"historical" ] ; then 
    367366        typeset CO2SBG_3V CO2SBG CO2MBG CO2SRF CO2LU CO2_ppm CO2_ppm_prec fCO2_ff 
    368367 
Note: See TracChangeset for help on using the changeset viewer.