Ignore:
Timestamp:
12/21/22 15:49:31 (19 months ago)
Author:
aclsce
Message:
  • Finalized merge in ICOLMDZOR configuration :
    • compilation : added rad option (with correct handling of svn test version)
    • experiments : merge with LMDZOR_v6.2 configuration, handling of remap frequency for ORCHIDEE xml file_def
    • cleaning and other small things
File:
1 edited

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/orchidee.driver

    r6100 r6290  
    4242        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0 
    4343        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo 
    44  
    4544        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE. 
    4645        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0 
    4746        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo 
    48  
    49         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE. 
    50         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0 
    51         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo 
     47        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 enabled .FALSE. 
     48        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_level 0 
     49        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate3 output_freq 1mo 
     50        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     51        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     52        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
    5253    fi 
    5354 
    … …  
    7071    else 
    7172        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y 
     73    fi 
     74 
     75    # Set parameters related to ROUTING in orchidee.def 
     76    if [ X${orchidee_UserChoices_ROUTING} = X ] || [ X${orchidee_UserChoices_ROUTING} = Xstandard ]; then 
     77        # Nothing is set or ROUTING=standard in orchidee.def, default option 
     78        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     79        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
     80    elif [ X${orchidee_UserChoices_ROUTING} = Xsimple ]; then 
     81        # ROUTING=simple is set in orchidee.card 
     82        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     83        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  simple 
     84    elif [ X${orchidee_UserChoices_ROUTING} = Xhighres ]; then 
     85        # ROUTING=highres is set in orchidee.card 
     86        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING y 
     87        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  highres 
     88    else 
     89        # ROUTING=off, routing will be deactivated 
     90        IGCM_comp_modifyDefFile nonblocker orchidee.def RIVER_ROUTING n 
     91        IGCM_comp_modifyDefFile nonblocker orchidee.def ROUTING_METHOD  standard 
    7292    fi 
    7393 
    … …  
    120140        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_level ${orchidee_UserChoices_output_level_sechiba_history} 
    121141        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history} 
     142        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba1 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history} 
    122143    fi 
    123144     
    … …  
    132153        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_level ${orchidee_UserChoices_output_level_sechiba_out_2} 
    133154        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq  ${orchidee_UserChoices_output_freq_sechiba_out_2} 
     155        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba2 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_out_2}           
    134156    fi 
    135157     
    … …  
    144166        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_level ${orchidee_UserChoices_output_level_sechiba_history_4dim} 
    145167        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history_4dim} 
     168        IGCM_comp_modifyXmlFile force      file_def_orchidee.xml groupremap_sechiba3 group_ref remap_${orchidee_UserChoices_output_freq_sechiba_history_4dim}            
    146169    fi 
    147170         
    … …  
    159182        echo '<context id="orchidee" src="./context_input_orchidee.xml"/>' >> add.tmp 
    160183    fi 
     184 
     185    # Add inclusion of file context_routing_orchidee.xml if this file exists 
     186    if [ -f context_routing_orchidee.xml ] ; then 
     187        echo '<context id="orchidee" src="./context_routing_orchidee.xml"/>' >> add.tmp 
     188    fi 
     189 
    161190    # Include xml files for output configuration if running with workflow CMIP6 
    162     if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
    163         echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
    164         echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
     191    if ( [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] || [ X${config_Post_dr2xmlIPSL} = XTRUE ] ) ; then 
     192          echo '<context id="orchidee" src="./ping_orchidee.xml"/>' >> add.tmp 
     193          echo '<context id="orchidee" src="./dr2xml_orchidee.xml"/>' >> add.tmp 
    165194    fi 
    166195    cp iodef.xml iodef.xml.tmp 
Note: See TracChangeset for help on using the changeset viewer.