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.

Location:
CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL
Files:
5 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     

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

    r2410 r2582  
    1515 
    1616    ##- Define variable DefSuffix set in orchidee.card 
    17     ##  This variable is used in orchidee.card to choose  
    18     ##  parameter file(orchidee.def_DefSuffix).  
     17    ##  This variable is used in orchidee.card to choose 
     18    ##  parameter file(orchidee.def_DefSuffix). 
    1919    if [ ! X${orchidee_UserChoices_DefSuffix} = X ] ; then 
    20         DefSuffix=${orchidee_UserChoices_DefSuffix} 
     20        DefSuffix=${orchidee_UserChoices_DefSuffix} 
    2121    else 
    22         DefSuffix=Choi 
     22        DefSuffix=Choi 
    2323    fi 
    2424 
    … …  
    3333    # Activate STOMATE if the compontent SBG=stomate is set in config.card 
    3434    if [ X${config_ListOfComponents_SBG} = Xstomate ] ; then 
    35         IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y 
     35        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y 
    3636    else 
    37         IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n 
     37        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n 
    3838    fi 
    3939 
    40     typeset SECHIBA_WRITE_STEP 
     40    # Default init : files are desactivated 
     41    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .FALSE. 
     42    IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .FALSE. 
    4143 
    42     if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    43         IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .FALSE.  
    44         IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .FALSE.  
    45         IGCM_comp_modifyDefFile nonblocker orchidee.def XIOS_ORCHIDEE_OK y 
    46     else 
    47         IGCM_comp_modifyDefFile nonblocker orchidee.def XIOS_ORCHIDEE_OK n 
    48     fi     
    49  
    50     SRF_WriteFrequency=$( echo ${config_SRF_WriteFrequency} | sed -e 's/\([0-9]*[yYmMdDs]\).*/\1/' )  
     44    SRF_WriteFrequency=$( echo ${config_SRF_WriteFrequency} | sed -e 's/\([0-9]*[yYmMdDs]\).*/\1/' ) 
    5145    case ${SRF_WriteFrequency} in 
    52         *Y|*y)  
    53             WriteInYears=$( echo ${SRF_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
    54             PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    55             (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears * 86400 ))  
    56             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    57                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    58                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInYears}y 
    59                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    60             fi 
    61             ;; 
    62         1M) 
    63             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    64                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    65                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 1mo 
    66                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    67             fi 
    68             case ${config_UserChoices_PeriodLength} in 
    69             *Y|*y) 
    70                 SECHIBA_WRITE_STEP=-1. 
    71                 ;; 
    72             *M|*m) 
    73                 SECHIBA_WRITE_STEP=-1. 
    74                 ;; 
    75             *) 
    76                 (( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 )) 
    77                 ;; 
    78             esac 
    79             ;; 
    80         *M|*m)  
    81             WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    82             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    83                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    84                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInMonths}mo 
    85                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    86             fi 
    87             case ${config_UserChoices_PeriodLength} in 
    88             *Y|*y) 
    89                 PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    90                 (( SECHIBA_WRITE_STEP = PeriodLengthInDays * 86400 / PeriodLengthInYears / 12  )) 
    91                 ;; 
    92             *M|*m) 
    93                 PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' ) 
    94                 (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInMonths  * 86400 / PeriodLengthInMonths  )) 
    95                 ;; 
    96             *) 
    97                 (( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 )) 
    98                 if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    99                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    100                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${SECHIBA_WRITE_STEP}s 
    101                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
    102                 fi 
    103                 ;; 
    104             esac 
    105             ;; 
    106         5D|5d)  
    107             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    108                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    109                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 5d 
    110                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    111             fi 
    112             (( SECHIBA_WRITE_STEP = 5 * 86400 ))  
    113             ;; 
    114         1D|1d)  
    115             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    116                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    117                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 1d 
    118                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    119             fi 
    120             (( SECHIBA_WRITE_STEP = 86400 ))  
    121             ;; 
    122         *s) 
    123             WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
    124             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    125                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    126                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
    127                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    128             fi 
    129             (( SECHIBA_WRITE_STEP = WriteInSeconds )) ;; 
    130         *)  
    131             IGCM_debug_Exit "SRF_Update " ${SRF_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D."  
    132             IGCM_debug_Verif_Exit ;; 
     46        *Y|*y) 
     47            WriteInYears=$( echo ${SRF_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
     48            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
     49            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     50            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInYears}y 
     51            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     52            ;; 
     53        *M|*m) 
     54            WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
     55            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     56            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInMonths}mo 
     57            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     58            ;; 
     59        5D|5d) 
     60            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     61            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 5d 
     62            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     63            ;; 
     64        1D|1d) 
     65            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     66            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq 1d 
     67            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     68            ;; 
     69        *s) 
     70            WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
     71            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     72            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
     73            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     74            ;; 
     75        *) 
     76            IGCM_debug_Exit "SRF_Update " ${SRF_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D." 
     77            IGCM_debug_Verif_Exit ;; 
    13378    esac 
    13479 
    135 #Use of XIOS ouputs only 
    136  
    137     if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    138         (( SECHIBA_WRITE_STEP = 0 )) 
     80    # Outputs HF in HISTFILE2 if required. Output frequency is 3 hours by default. 
     81    if [ X${SRF_ok_hf} = Xy ] ; then 
     82        IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .TRUE. 
     83        IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 output_freq 10800s 
     84        IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 name sechiba_out_2 
    13985    fi 
    140     IGCM_comp_modifyDefFile nonblocker orchidee.def WRITE_STEP ${SECHIBA_WRITE_STEP} 
    141     IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
    142  
    143     # Outputs HF in HISTFILE2 if required 
    144     if [ X${SRF_ok_hf} = Xy ] ; then 
    145         IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTFILE2 y 
    146         if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    147             IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 enabled .TRUE.  
    148             IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 output_freq 10800s 
    149             IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba2 name sechiba_out_2 
    150         fi 
    151     else 
    152         IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTFILE2 n 
    153     fi 
    154     IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTLEVEL2 1 
    155     IGCM_comp_modifyDefFile nonblocker orchidee.def WRITE_STEP2 10800.0 
    15686 
    15787    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    158         IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc 
     88        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc 
    15989    else 
    160         IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE 
     90        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE 
    16191    fi 
    16292 
    163 # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
     93    # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    16494    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    165         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     95        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
    16696    else 
    167         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
     97        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
    16898    fi 
    16999    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    170         IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     100        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
    171101    else 
    172         IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n 
     102        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n 
    173103    fi 
    174104 
    … …  
    176106    #IGCM_sys_Put_Out ${RUN_DIR}/run.def ${R_SAVE}/${PREFIX}_run.def 
    177107 
    178 #Temporary way to fix bug on cimean variable 
    179     IGCM_comp_modifyXmlFile force field_def_orchidee.xml cimean enabled .FALSE.  
     108    #Temporary way to fix bug on cimean variable 
     109    IGCM_comp_modifyXmlFile force field_def_orchidee.xml cimean enabled .FALSE. 
    180110 
    181     if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    182111    # Add include of orchidee context in iodef.xml 
    183112    # In iodef.xml add on next line after "COMPONENT CONTEXT" 
    184113    #  <context id="orchidee" src="./context_orchidee.xml"/> 
    185         echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp 
    186         cp iodef.xml iodef.xml.tmp 
    187         sed -e "/COMPONENT CONTEXT/r add.tmp" \ 
    188             iodef.xml.tmp > iodef.xml 
    189         rm iodef.xml.tmp add.tmp 
    190     fi 
     114    echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp 
     115    cp iodef.xml iodef.xml.tmp 
     116    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml 
     117    rm iodef.xml.tmp add.tmp 
    191118 
    192119    IGCM_debug_PopStack "SRF_Update" 

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

    r2341 r2582  
    99 
    1010    RESOL_SBG=ALL 
    11      
     11 
    1212    IGCM_debug_PopStack "SBG_Initialize" 
    1313} 
    … …  
    1818    IGCM_debug_PushStack "SBG_Update" 
    1919 
    20     typeset STOMATE_WRITE_STEP 
     20    # Default init : files are desactivated 
     21    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE. 
     22    IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE. 
    2123 
    22     if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    23         IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE.  
    24         IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE.  
    25     fi    
    2624    case ${config_SBG_WriteFrequency} in 
    27         *Y|*y)  
    28             WriteInYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
    29             PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    30             (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears ))  
    31             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    32                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    33                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y 
    34                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
    35                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    36                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y 
    37                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    38  
    39             fi 
    40             ;; 
    41         1M|1m)  
    42             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    43                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    44                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1mo 
    45                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
    46                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    47                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1mo 
    48                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    49             fi 
    50             case ${config_UserChoices_PeriodLength} in 
    51             *Y|*y) 
    52                 STOMATE_WRITE_STEP=-1. 
    53                 ;; 
    54             *M|*m) 
    55                 STOMATE_WRITE_STEP=-1. 
    56                 ;; 
    57             *) 
    58                 (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) )) ;; 
    59             esac 
    60             ;; 
    61         *M|*m)  
    62             WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    63             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    64                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    65                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo 
    66                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
    67                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    68                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo 
    69                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    70             fi 
    71             case ${config_UserChoices_PeriodLength} in 
    72             *Y|*y) 
    73                 PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    74                 (( STOMATE_WRITE_STEP = 30 )) 
    75                 ;; 
    76             *M|*m) 
    77                 PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' ) 
    78                 (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInMonths / PeriodLengthInMonths )) 
    79                 ;; 
    80             *) 
    81                 (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) ))  
    82                 if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    83                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    84                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${STOMATE_WRITE_STEP}s 
    85                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
    86                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    87                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${STOMATE_WRITE_STEP}s 
    88                     IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
    89                 fi 
    90                 ;; 
    91             esac 
    92             ;; 
    93         5D|5d)  
    94             (( STOMATE_WRITE_STEP = 5 )) 
    95             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    96                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    97                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 5d 
    98                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
    99                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    100                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 5d 
    101                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    102             fi 
    103             ;; 
    104         1D|1d)  
    105             (( STOMATE_WRITE_STEP = 1 ))  
    106             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    107                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE.  
    108                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1d 
    109                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history  
    110                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    111                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1d 
    112                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    113             fi 
    114             ;; 
    115         *s) 
    116             WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
    117             if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    118                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE.  
    119                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
    120                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history  
    121                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE.  
    122                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s 
    123                 IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history  
    124             fi 
    125             (( STOMATE_WRITE_STEP = 1 )) ;; 
    126         *)  
    127             IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D."  
    128             IGCM_debug_Verif_Exit ;; 
     25        *Y|*y) 
     26            WriteInYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
     27            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
     28            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
     29            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y 
     30            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
     31            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
     32            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y 
     33            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     34            ;; 
     35        *M|*m) 
     36            WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
     37            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
     38            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo 
     39            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
     40            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
     41            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo 
     42            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     43            ;; 
     44        5D|5d) 
     45            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
     46            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 5d 
     47            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
     48            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
     49            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 5d 
     50            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     51            ;; 
     52        1D|1d) 
     53            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .TRUE. 
     54            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 output_freq 1d 
     55            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 name stomate_history 
     56            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
     57            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq 1d 
     58            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     59            ;; 
     60        *s) 
     61            WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
     62            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 enabled .TRUE. 
     63            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
     64            IGCM_comp_modifyXmlFile force file_def_orchidee.xml sechiba1 name sechiba_history 
     65            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .TRUE. 
     66            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s 
     67            IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     68            ;; 
     69        *) 
     70            IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose in 1Y, 1M, 5D, 1D." 
     71            IGCM_debug_Verif_Exit ;; 
    12972    esac 
    13073 
    131  
    132 #Use of XIOS library only 
    133  
    134     if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    135         (( STOMATE_WRITE_STEP = 0 )) 
    136     fi 
    137  
    138     IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HIST_DT ${STOMATE_WRITE_STEP} 
    139     IGCM_comp_modifyDefFile nonblocker orchidee.def STOMATE_HISTLEVEL ${stomate_UserChoices_stomate_LEVEL} 
    140  
    14174    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    142         echo "STOMATE : without restart" 
    143         IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE 
     75        echo "STOMATE : without restart" 
     76        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE 
    14477    else 
    145         IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc 
     78        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc 
    14679    fi 
    14780 
    … …  
    15689 
    15790    if [ $( IGCM_date_DaysBetweenGregorianDate ${PeriodDateEnd} ${year}1230 ) -ge 0 ] ; then 
    158         IGCM_sys_Put_Out stomate_Cforcing.nc ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_Cforcing.nc 
    159         IGCM_sys_Put_Out stomate_forcing.nc  ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_forcing.nc 
    160 #       rm -f stomate_Cforcing.nc 
    161 #       rm -f stomate_forcing.nc 
     91        IGCM_sys_Put_Out stomate_Cforcing.nc ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_Cforcing.nc 
     92        IGCM_sys_Put_Out stomate_forcing.nc  ${R_OUT_SBG_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_stomate_forcing.nc 
     93#       rm -f stomate_Cforcing.nc 
     94#       rm -f stomate_forcing.nc 
    16295    fi 
    16396 

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_CWRR

    r2415 r2582  
    2020# Use XIOS for writing diagnostics file 
    2121# defulat = n 
    22 XIOS_ORCHIDEE_OK = _AUTO_ 
    23  
    24 # Flag to activate sechiba_out_2.nc history file for SECHIBA 
    25 # default  = FALSE 
    26 SECHIBA_HISTFILE2 = _AUTO_ 
    27  
    28 # SECHIBA history output level (0..10) 
    29 # default = 5 
    30 SECHIBA_HISTLEVEL = _AUTO_ 
    31  
    32 # SECHIBA history 2 output level (0..10) 
    33 # default = 1 
    34 SECHIBA_HISTLEVEL2 = _AUTO_ 
    35  
    36 # STOMATE history output level (0..10) 
    37 # default = 10 
    38 STOMATE_HISTLEVEL = _AUTO_ 
     22XIOS_ORCHIDEE_OK = y 
    3923 
    4024# Writefrequency in seconds in sechiba_history.nc 
    4125# default = 86400.0 
    42 WRITE_STEP = _AUTO_ 
    43  
    44 # Writefrequency in seconds sechiba_out_2.nc  
    45 # default = 1800.0 
    46 WRITE_STEP2 = _AUTO_ 
    47  
    48 # Writefrequency in days in stomate_history.nc 
    49 # default = 10. 
    50 STOMATE_HIST_DT = _AUTO_ 
    51  
    52 # Writefrequency in days or -1 for monthly output in stomate_ipcc_history.nc 
    53 # default = 0. 
    54 STOMATE_IPCC_HIST_DT = -1 
    55  
     26WRITE_STEP = 0 
    5627 
    5728# Hydrology parameters 
    … …  
    7243# default = n 
    7344RIVER_ROUTING = y 
    74  
    7545 
    7646#************************************************************************** 

  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_Choi

    r2415 r2582  
    2020# Use XIOS for writing diagnostics file 
    2121# defulat = n 
    22 XIOS_ORCHIDEE_OK = _AUTO_ 
    23  
    24 # Flag to activate sechiba_out_2.nc history file for SECHIBA 
    25 # default  = FALSE 
    26 SECHIBA_HISTFILE2 = _AUTO_ 
    27  
    28 # SECHIBA history output level (0..10) 
    29 # default = 5 
    30 SECHIBA_HISTLEVEL = _AUTO_ 
    31  
    32 # SECHIBA history 2 output level (0..10) 
    33 # default = 1 
    34 SECHIBA_HISTLEVEL2 = _AUTO_ 
    35  
    36 # STOMATE history output level (0..10) 
    37 # default = 10 
    38 STOMATE_HISTLEVEL = _AUTO_ 
     22XIOS_ORCHIDEE_OK = y 
    3923 
    4024# Writefrequency in seconds in sechiba_history.nc 
    4125# default = 86400.0 
    42 WRITE_STEP = _AUTO_ 
    43  
    44 # Writefrequency in seconds sechiba_out_2.nc  
    45 # default = 1800.0 
    46 WRITE_STEP2 = _AUTO_ 
    47  
    48 # Writefrequency in days in stomate_history.nc 
    49 # default = 10. 
    50 STOMATE_HIST_DT = _AUTO_ 
    51  
    52 # Writefrequency in days or -1 for monthly output in stomate_ipcc_history.nc 
    53 # default = 0. 
    54 STOMATE_IPCC_HIST_DT = -1 
    55  
     26WRITE_STEP = 0 
    5627 
    5728# Hydrology parameters 
    … …  
    7243# default = n 
    7344RIVER_ROUTING = y 
    74  
    7545 
    7646#************************************************************************** 
Note: See TracChangeset for help on using the changeset viewer.