Ignore:
Timestamp:
06/25/15 15:37:32 (9 years ago)
Author:
jgipsl
Message:

Update with changes done on v6_rc0 (sdipsl) :

  • remove IOIPSL
  • clean

This is done only for IPSLCM6 and LMDZOR_v6 configurations and only for the part LMDZ and ORCHIDEE.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

    r2512 r2582  
    325325    fi 
    326326 
    327  
    328     ## output.def parameters 
    329     #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    330     #                                            histmth       histday        histhf    histhf3h   histhf3hm   histstn 
    331     IGCM_comp_modifyDefFile nonblocker output.def phys_out_filekeys "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    332     IGCM_comp_modifyDefFile nonblocker output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    333     IGCM_comp_modifyDefFile nonblocker output.def ok_cosp     ${LMDZ_COSP_OK} 
    334     IGCM_comp_modifyDefFile nonblocker output.def ok_mensuelCOSP  ${LMDZ_COSP_monthly} 
    335     IGCM_comp_modifyDefFile nonblocker output.def ok_journeCOSP   ${LMDZ_COSP_daily} 
    336     IGCM_comp_modifyDefFile nonblocker output.def ok_hfCOSP   ${LMDZ_COSP_hf} 
    337     IGCM_comp_modifyDefFile nonblocker output.def ok_histNMC  "${LMDZ_NMC_monthly} ${LMDZ_NMC_daily} ${LMDZ_NMC_hf}" 
    338  
    339     # XIOS XML definition 
    340     if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    341327    # Default init : files are desactivated 
    342         IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .FALSE.  
    343         IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .FALSE.  
    344         IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .FALSE. 
    345 #       IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .FALSE. 
    346 #       IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .FALSE. 
    347         IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .FALSE. 
    348         IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE. 
    349         IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
    350         IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
    351         IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .FALSE. 
    352         IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .FALSE. 
    353         IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .FALSE. 
     328    IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .FALSE.  
     329    IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .FALSE.  
     330    IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .FALSE. 
     331    #IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .FALSE. 
     332    #IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .FALSE. 
     333    IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .FALSE. 
     334    IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE. 
     335    IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
     336    IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
     337    IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .FALSE. 
     338    IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .FALSE. 
     339    IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .FALSE. 
    354340 
    355341    # Default output level : 5 
    356         IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_level 5  
    357         IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 5  
    358         IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 5 
    359 #       IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_level 5 
    360 #       IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_level 5 
    361         IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_level 5 
    362         IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
    363         IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
    364         IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
    365         IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_level 5 
    366         IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_level 5 
    367         IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_level 5 
    368      # Filling of XML files  
    369         if [ X${ok_mensuel} = Xy ] ; then 
    370             IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .TRUE.  
    371             IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_freq 1mo 
    372             IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth name histmth 
    373         fi 
    374         if [ X${ok_journe} = Xy ] ; then         
    375             IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .TRUE.  
    376             IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_freq 1d 
    377             IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday name histday 
    378             if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then 
    379                 IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 2 
    380             fi 
    381         fi 
    382         if [ X${ok_hf} = Xy ] ; then 
    383             IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .TRUE.  
    384             IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_freq 6h 
    385             IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf name histhf 
    386             if [ X${OutLevel} = Xlow ] ; then 
    387                 IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 2 
    388             fi 
    389         fi       
    390 #       if [ X${ok_hf3h} = Xy ] ; then 
    391 #           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE.  
    392 #           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_freq 3h 
    393 #           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h name histhf3h 
    394 #       fi       
    395 #       if [ X${ok_hf3hm} = Xy ] ; then 
    396 #           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE.  
    397 #           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h 
    398 #           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm 
    399 #       fi 
    400         if [ X${ok_stn} = Xy ] ; then 
    401             IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .TRUE.  
    402             IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_freq 1800s 
    403             IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn name histstn 
    404         fi 
    405         if [ X${LMDZ_NMC_monthly} = Xy ] ; then 
    406             IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE.  
    407             IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo 
    408             IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC 
    409         fi 
    410         if [ X${LMDZ_NMC_daily} = Xy ] ; then 
    411             IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE.  
    412             IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d 
    413             IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC 
    414         fi 
    415         if [ X${LMDZ_NMC_hf} = Xy ] ; then 
    416             IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE.  
    417             IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h 
    418             IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC 
    419         fi 
    420  
    421         if [  X${LMDZ_COSP_OK} = Xy ] ; then 
    422             if [ X${LMDZ_COSP_monthly} = Xy ] ; then 
    423                 IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .TRUE.  
    424                 IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_freq 1mo 
    425                 IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP name histmthCOSP 
    426             fi 
    427             if [ X${LMDZ_COSP_daily} = Xy ] ; then 
    428                 IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .TRUE.  
    429                 IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_freq 1d 
    430                 IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP name histdayCOSP 
    431             fi 
    432             if [ X${LMDZ_COSP_hf} = Xy ] ; then 
    433                 IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .TRUE.  
    434                 IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_freq 6h 
    435                 IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP name histhfCOSP 
    436             fi 
    437         fi 
    438  
     342    IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_level 5  
     343    IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 5  
     344    IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 5 
     345    #IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_level 5 
     346    #IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_level 5 
     347    IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_level 5 
     348    IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
     349    IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
     350    IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
     351    IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_level 5 
     352    IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_level 5 
     353    IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_level 5 
     354 
     355    # FILLING XIOS XMLs 
     356    if [ X${ok_mensuel} = Xy ] ; then 
     357        IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .TRUE.  
     358        IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_freq 1mo 
     359        IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth name histmth 
     360    fi 
     361    if [ X${ok_journe} = Xy ] ; then     
     362        IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .TRUE.  
     363        IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_freq 1d 
     364        IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday name histday 
     365        if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then 
     366            IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 2 
     367        fi 
     368    fi 
     369    if [ X${ok_hf} = Xy ] ; then 
     370        IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .TRUE.  
     371        IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_freq 6h 
     372        IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf name histhf 
     373        if [ X${OutLevel} = Xlow ] ; then 
     374            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 5 
     375        elif [ X${OutLevel} = Xmedium ] ; then 
     376            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 6 
     377        elif [ X${OutLevel} = Xhigh ] ; then 
     378            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 7 
     379        fi 
     380    fi   
     381    if [ X${ok_hf3h} = Xy ] ; then 
     382        IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE.  
     383        IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_freq 3h 
     384        IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h name histhf3h 
     385    fi   
     386    if [ X${ok_hf3hm} = Xy ] ; then 
     387        IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE.  
     388        IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h 
     389        IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm 
     390    fi 
     391    if [ X${ok_stn} = Xy ] ; then 
     392        IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .TRUE.  
     393        IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_freq 1800s 
     394        IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn name histstn 
     395    fi 
     396    if [ X${LMDZ_NMC_monthly} = Xy ] ; then 
     397        IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE.  
     398        IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo 
     399        IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC 
     400    fi 
     401    if [ X${LMDZ_NMC_daily} = Xy ] ; then 
     402        IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE.  
     403        IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d 
     404        IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC 
     405    fi 
     406    if [ X${LMDZ_NMC_hf} = Xy ] ; then 
     407        IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE.  
     408        IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h 
     409        IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC 
     410    fi 
     411    if [  X${LMDZ_COSP_OK} = Xy ] ; then 
     412        if [ X${LMDZ_COSP_monthly} = Xy ] ; then 
     413            IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP enabled .TRUE.  
     414            IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP output_freq 1mo 
     415            IGCM_comp_modifyXmlFile force file_def_histmthCOSP_lmdz.xml histmthCOSP name histmthCOSP 
     416        fi 
     417        if [ X${LMDZ_COSP_daily} = Xy ] ; then 
     418            IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP enabled .TRUE.  
     419            IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP output_freq 1d 
     420            IGCM_comp_modifyXmlFile force file_def_histdayCOSP_lmdz.xml histdayCOSP name histdayCOSP 
     421        fi 
     422        if [ X${LMDZ_COSP_hf} = Xy ] ; then 
     423            IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP enabled .TRUE.  
     424            IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP output_freq 6h 
     425            IGCM_comp_modifyXmlFile force file_def_histhfCOSP_lmdz.xml histhfCOSP name histhfCOSP 
     426        fi 
    439427    fi 
    440428 
    … …  
    481469 
    482470    ## run.def parameters 
    483     IGCM_comp_modifyDefFile blocker run.def dayref   ${InitDay} 
    484     IGCM_comp_modifyDefFile blocker run.def nday     ${PeriodLengthInDays} 
    485     IGCM_comp_modifyDefFile blocker run.def raz_date ${RAZ_DATE} 
    486     IGCM_comp_modifyDefFile blocker run.def periodav ${LMDZ_periodav} 
    487     IGCM_comp_modifyDefFile nonblocker run.def adjust   ${LMDZ_adjust} 
     471    IGCM_comp_modifyDefFile blocker run.def dayref    ${InitDay} 
     472    IGCM_comp_modifyDefFile blocker run.def nday      ${PeriodLengthInDays} 
     473    IGCM_comp_modifyDefFile blocker run.def raz_date  ${RAZ_DATE} 
     474    IGCM_comp_modifyDefFile blocker run.def periodav  ${LMDZ_periodav} 
     475    IGCM_comp_modifyDefFile nonblocker run.def adjust ${LMDZ_adjust} 
    488476 
    489477    # Set anneeref different for gcm and ce0l 
    … …  
    623611 
    624612    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    625     # Add include of LMDZ context in iodef.xml 
    626     # In iodef.xml add on next line after "COMPONENT CONTEXT" 
    627     #  <context id="LMDZ" src="./context_lmdz.xml"/> 
    628         echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
    629         cp iodef.xml iodef.xml.tmp 
    630         sed -e "/COMPONENT CONTEXT/r add.tmp" \ 
    631             iodef.xml.tmp > iodef.xml 
    632         rm iodef.xml.tmp add.tmp 
     613        # Add include of LMDZ context in iodef.xml 
     614        # In iodef.xml add on next line after "COMPONENT CONTEXT" 
     615        #  <context id="LMDZ" src="./context_lmdz.xml"/> 
     616        echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
     617        cp iodef.xml iodef.xml.tmp 
     618        sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml 
     619        rm iodef.xml.tmp add.tmp 
    633620 
    634621        # Set ok_all_xml=y in run.def 
    635         IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y 
    636     else 
    637         # Deactivate ok_all_xml in run.def 
    638         IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n 
     622        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml y 
     623    else 
     624        # Deactivate ok_all_xml in run.def 
     625        IGCM_comp_modifyDefFile nonblocker run.def ok_all_xml n 
    639626    fi 
    640627     
Note: See TracChangeset for help on using the changeset viewer.