Changeset 6262 for CONFIG


Ignore:
Timestamp:
10/27/22 16:56:31 (18 months ago)
Author:
jgipsl
Message:

Allow a new file in stomate to exist and be set to AUTO in file_def_orchidee.xml. The file is not activated in the coupled set up. This modification is needed since ORCHIDEE/trunk revision 7789.

Location:
CONFIG/UNIFORM/v6
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6.2/GENERAL/DRIVER/stomate.driver

    r4351 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6.3/GENERAL/DRIVER/stomate.driver

    r5555 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6.5.1/GENERAL/DRIVER/stomate.driver

    r6119 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6.5/GENERAL/DRIVER/stomate.driver

    r5066 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/stomate.driver

    r4351 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6_LANDN/GENERAL/DRIVER/stomate.driver

    r4351 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6.1.10/GENERAL/DRIVER/stomate.driver

    r4788 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6.2/GENERAL/DRIVER/stomate.driver

    r4625 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZORINCA_v6.3/GENERAL/DRIVER/stomate.driver

    r5975 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.2/GENERAL/DRIVER/stomate.driver

    r4311 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.3/GENERAL/DRIVER/stomate.driver

    r4311 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZOR_v6.4/GENERAL/DRIVER/stomate.driver

    r4311 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
  • CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/stomate.driver

    r4311 r6262  
    6060 
    6161 
     62    if [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = X ] || [ X${stomate_UserChoices_output_level_stomate_fixed_dia} = XNONE ] ; then 
     63        # output_level_stomate_fixed_dia is not set in stomate.card or it is set to NONE. 
     64        # Deactivate the file. 
     65        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled .FALSE. 
     66        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level 0 
     67        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq 1mo 
     68    else 
     69        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 enabled      .TRUE. 
     70        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_level ${stomate_UserChoices_output_level_stomate_fixed_dia} 
     71        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate4 output_freq  ${stomate_UserChoices_output_freq_stomate_fixed_dia} 
     72    fi 
     73 
     74 
    6275    # Define in orchidee.def if restart file should be used 
    6376    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
Note: See TracChangeset for help on using the changeset viewer.