Changeset 2343 for CONFIG/UNIFORM/v6


Ignore:
Timestamp:
09/26/14 11:46:12 (7 years ago)
Author:
aclsce
Message:

Modifed to have same handling of XIOS xml files as in LMDZOR configuration.

Location:
CONFIG/UNIFORM/v6/IPSLCM6
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

    r2327 r2343  
    7575        (${SUBMIT_DIR}/PARAM/output.def_${OutLevel},  output.def),    \ 
    7676        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \ 
     77    (${SUBMIT_DIR}/PARAM/guide.def, .), \ 
    7778        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    7879        (${SUBMIT_DIR}/PARAM/traceur.def, .), \ 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/lmdz.driver

    r2321 r2343  
    11#!/bin/ksh 
    22#----------------------------------------------------------------- 
    3 function LMDZ_sed 
    4 { 
    5 # Usage : LMDZ_sed filedef var_name myvalue 
    6 #         In file filedef modify the line containing var_name=xxx into var_name=myvalue 
    7     IGCM_debug_PushStack "LMDZ_sed" 
    8      
    9     # Test if the fichier exist 
    10     if [ ! -f ${1} ] ; then 
    11         echo "WARNING : ${1} file does not exist. Following will not be done : LMDZ_sed : ${1} ${2} ${3}" 
    12         IGCM_debug_PopStack "LMDZ_sed" 
    13         return 
    14     fi 
    15  
    16     sed -e "s/^${2}\ *=.*/${2}= ${3}/" ${1} > ${1}.tmp 
    17     RET=$? 
    18     echo "LMDZ_sed : ${1} ${2} ${3}" 
    19     \mv ${1}.tmp ${1} 
    20  
    21     IGCM_debug_PopStack "LMDZ_sed" 
    22     return $RET 
    23 } 
    24  
    25 function LMDZ_sed_default 
    26 { 
    27 # Usage : LMDZ_sed_default filedef var_name 
    28 #         In file filedef modify the line  "var_name=xxx DEFAULT= myvalue" 
    29 #         into "var_name=myvalue" 
    30     IGCM_debug_PushStack "LMDZ_sed_default" 
    31  
    32     DefValue=$( grep ${2} ${1}  | awk -F"DEFAULT.=*" '{print $2}') 
    33  
    34     LMDZ_sed  ${1} ${2} $DefValue 
    35     IGCM_debug_PopStack "LMDZ_sed_default" 
    36     return $RET 
    37 } 
    38  
    39 function LMDZ_sed_xml 
    40 { 
    41 # Usage : LMDZ_sed_xml xml_file output_file attribute value  
    42 #         In file xml_file modify at the line containing id="output_file" the attribute "attribute=xxx" into "attribute=value" 
    43  
    44     IGCM_debug_PushStack "LMDZ_sed_xml" 
    45     # Test if the fichier exist 
    46     if [ ! -f ${1} ] ; then 
    47       echo "WARNING : ${1} file does not exist. Following will not be done : LMDZ_sed : ${1} ${2} ${3} ${4}" 
    48       IGCM_debug_PopStack "LMDZ_sed_xml" 
    49       return 
    50     fi 
    51     sed -e "/id=\"${2}\"/s/\(${3}=\"\)[^\"]*\(\"\)/\1${4}\2/" ${1} > ${1}.tmp 
    52     RET=$? 
    53     echo "LMDZ_sed : ${1} ${2} ${3} ${4}" 
    54     \mv ${1}.tmp ${1} 
    55     IGCM_debug_PopStack "LMDZ_sed_xml" 
    56     return $RET 
    57 } 
    58  
    593function ATM_Initialize 
    604{ 
     
    6913    RESOL_ATM_Y=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $2}' ) 
    7014    RESOL_ATM_XY="${RESOL_ATM_X}x${RESOL_ATM_Y}" 
    71     FreqCoupling=${oasis_UserChoices_FreqCoupling:-86400} 
    7215 
    7316    ##-- Calendar type for LMDZ and create_etat0_limit 
     
    281224    ##   If forcing file exist in run directory, read values for the current year  
    282225    ##   and set in config.def. If not use the default value set in config.def 
     226 
     227    # Read value for solaire from file SOLARANDVOLCANOES.txt. If file not existing, take DEFAULT value from file.  
    283228    if [ -f SOLARANDVOLCANOES.txt ] ; then 
    284         IPCC_SOLAR=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
    285         if [ X"${IPCC_SOLAR}" = X ] ; then 
     229        value=`grep Annee_${year} SOLARANDVOLCANOES.txt | awk -F= '{print $2}'` 
     230        if [ X"${value}" = X ] ; then 
    286231            # The grep returned empty variable, stop execution 
    287232            IGCM_debug_Exit "The file SOLARANDVOLCANOES.txt do not contain the current year." 
    288233            IGCM_debug_Verif_Exit 
    289         else 
    290             # Set new variable in config.def file 
    291             LMDZ_sed config.def solaire     ${IPCC_SOLAR} 
    292         fi 
    293     else 
    294         LMDZ_sed_default config.def solaire 
    295     fi 
    296  
     234        fi 
     235    else 
     236        value=DEFAULT 
     237    fi 
     238    IGCM_comp_modifyDefFile nonblocker config.def solaire $value 
     239 
     240 
     241    # Read value for co2_ppm from file CO2.txt. If file not existing, take DEFAULT value from file.  
    297242    if [ -f CO2.txt ] ; then 
    298         IPCC_CO2=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
    299         if [ X"${IPCC_CO2}" = X ] ; then 
     243        value=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'` 
     244        if [ X"${value}" = X ] ; then 
    300245            # The grep returned empty variable, stop execution 
    301246            IGCM_debug_Exit "The file CO2.txt do not contain the current year." 
    302247            IGCM_debug_Verif_Exit 
    303         else 
    304             # Set new variable in config.def file 
    305             LMDZ_sed config.def co2_ppm     ${IPCC_CO2} 
    306         fi 
    307     else 
    308         LMDZ_sed_default config.def co2_ppm 
    309     fi 
    310  
     248        fi 
     249    else 
     250        value=DEFAULT 
     251    fi 
     252    IGCM_comp_modifyDefFile nonblocker config.def co2_ppm $value 
     253 
     254 
     255    # Read value for CH4_ppb from file CH4.txt. If file not existing, take DEFAULT value from file.  
    311256    if [ -f CH4.txt ] ; then 
    312         IPCC_CH4=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
    313         if [ X"${IPCC_CH4}" = X ] ; then 
     257        value=`grep Annee_${year} CH4.txt | awk -F= '{print $2}'` 
     258        if [ X"${value}" = X ] ; then 
    314259            # The grep returned empty variable, stop execution 
    315260            IGCM_debug_Exit "The file CH4.txt do not contain the current year." 
    316261            IGCM_debug_Verif_Exit 
    317         else 
    318             # Set new variable in config.def file 
    319             LMDZ_sed config.def CH4_ppb     ${IPCC_CH4} 
    320         fi 
    321      else 
    322         LMDZ_sed_default config.def CH4_ppb 
    323     fi 
    324  
     262        fi 
     263    else 
     264        value=DEFAULT 
     265    fi 
     266    IGCM_comp_modifyDefFile nonblocker config.def CH4_ppb $value 
     267 
     268 
     269    # Read value for N2O_ppb from file N2O.txt. If file not existing, take DEFAULT value from file.  
    325270    if [ -f N2O.txt ] ; then 
    326         IPCC_N2O=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
    327         if [ X"${IPCC_N2O}" = X ] ; then 
     271        value=`grep Annee_${year} N2O.txt | awk -F= '{print $2}'` 
     272        if [ X"${value}" = X ] ; then 
    328273            # The grep returned empty variable, stop execution 
    329274            IGCM_debug_Exit "The file N2O.txt do not contain the current year." 
    330275            IGCM_debug_Verif_Exit 
    331         else 
    332             # Set new variable in config.def file 
    333             LMDZ_sed config.def N2O_ppb     ${IPCC_N2O} 
    334         fi 
    335     else 
    336         LMDZ_sed_default config.def N2O_ppb 
    337     fi 
    338  
     276        fi 
     277    else 
     278        value=DEFAULT 
     279    fi 
     280    IGCM_comp_modifyDefFile nonblocker config.def N2O_ppb $value 
     281 
     282    # Read value for CFC11_ppt from file CFC11.txt. If file not existing, take DEFAULT value from file.  
    339283    if [ -f CFC11.txt ] ; then 
    340         IPCC_CFC11=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
    341         if [ X"${IPCC_CFC11}" = X ] ; then 
     284        value=`grep Annee_${year} CFC11.txt | awk -F= '{print $2}'` 
     285        if [ X"${value}" = X ] ; then 
    342286            # The grep returned empty variable, stop execution 
    343287            IGCM_debug_Exit "The file CFC11.txt do not contain the current year." 
    344288            IGCM_debug_Verif_Exit 
    345         else 
    346             # Set new variable in config.def file 
    347             LMDZ_sed config.def CFC11_ppt   ${IPCC_CFC11} 
    348         fi 
    349     else 
    350         LMDZ_sed_default config.def CFC11_ppt 
    351     fi 
    352  
     289        fi 
     290    else 
     291        value=DEFAULT 
     292    fi 
     293    IGCM_comp_modifyDefFile nonblocker config.def CFC11_ppt $value 
     294 
     295 
     296    # Read value for CFC12_ppt from file CFC12.txt. If file not existing, take DEFAULT value from file.  
    353297    if [ -f CFC12.txt ] ; then 
    354         IPCC_CFC12=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
    355         if [ X"${IPCC_CFC12}" = X ] ; then 
     298        value=`grep Annee_${year} CFC12.txt | awk -F= '{print $2}'` 
     299        if [ X"${value}" = X ] ; then 
    356300            # The grep returned empty variable, stop execution 
    357301            IGCM_debug_Exit "The file CFC12.txt do not contain the current year." 
    358302            IGCM_debug_Verif_Exit 
    359         else 
    360             # Set new variable in config.def file 
    361             LMDZ_sed config.def CFC12_ppt   ${IPCC_CFC12} 
    362         fi 
    363     else 
    364         LMDZ_sed_default config.def CFC12_ppt 
    365     fi 
    366  
    367  
    368     ## Coupling Time Step 
    369     LMDZ_t_coupl=${oasis_UserChoices_FreqCoupling:-${lmdz_UserChoices_t_coupl}} 
     303        fi 
     304    else 
     305        value=DEFAULT 
     306    fi 
     307    IGCM_comp_modifyDefFile nonblocker config.def CFC12_ppt $value 
     308 
     309 
     310    ## Coupling Time Step : Take value of FreqCoupling set in oasis.card or if it is not set, take default value 86400 
     311    LMDZ_t_coupl=${oasis_UserChoices_FreqCoupling:-86400} 
    370312    IGCM_debug_Print 3 "LMDZ_t_coupl "   ${LMDZ_t_coupl} 
    371     LMDZ_sed config.def t_coupl   ${LMDZ_t_coupl} 
     313    IGCM_comp_modifyDefFile nonblocker config.def t_coupl   ${LMDZ_t_coupl}  
    372314 
    373315    ##-- Add special treatement for CARBON CYCLE 
     
    386328    ## output.def parameters 
    387329    #  columns in phys_output_filekeys refer to the filenames given in phys_out_filenames in output.def :   
    388     #                                            histmth       histday        histhf    histfh3h   histhf3hm   histstn 
    389     LMDZ_sed output.def phys_out_filekeys      "${ok_mensuel} ${ok_journe}   ${ok_hf}  ${ok_hf3h} ${ok_hf3hm} ${ok_stn}" 
    390     LMDZ_sed output.def ecrit_ISCCP ${LMDZ_ecrit_ISCCP} 
    391     LMDZ_sed output.def ok_cosp     ${LMDZ_COSP_OK} 
    392     LMDZ_sed output.def ok_mensuelCOSP  ${LMDZ_COSP_monthly} 
    393     LMDZ_sed output.def ok_journeCOSP   ${LMDZ_COSP_daily} 
    394     LMDZ_sed output.def ok_hfCOSP   ${LMDZ_COSP_hf} 
    395     LMDZ_sed output.def ok_histNMC  "${LMDZ_NMC_monthly} ${LMDZ_NMC_daily} ${LMDZ_NMC_hf}" 
     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}" 
    396338 
    397339    # XIOS XML definition 
    398340    # Default init : files are desactivated 
    399         LMDZ_sed_xml file_def_histmth_lmdz.xml histmth enabled .FALSE.  
    400         LMDZ_sed_xml file_def_histday_lmdz.xml histday enabled .FALSE.  
    401         LMDZ_sed_xml file_def_histhf_lmdz.xml histhf enabled .FALSE. 
    402         LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h enabled .FALSE. 
    403         LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm enabled .FALSE. 
    404         LMDZ_sed_xml file_def_histstn_lmdz.xml histstn enabled .FALSE. 
    405         LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE. 
    406         LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
    407         LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
     341        IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .FALSE.  
     342        IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .FALSE.  
     343        IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .FALSE. 
     344#       IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .FALSE. 
     345#       IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .FALSE. 
     346        IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .FALSE. 
     347        IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE. 
     348        IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
     349        IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
    408350        if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    409351    # Default output level : 5 
    410             LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_level 5  
    411             LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 5  
    412             LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 5 
    413             LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h output_level 5 
    414             LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm output_level 5 
    415             LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_level 5 
    416             LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
    417             LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
    418             LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
     352            IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_level 5  
     353            IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 5  
     354            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 5 
     355#           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_level 5 
     356#           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_level 5 
     357            IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_level 5 
     358            IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
     359            IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
     360            IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
    419361     # Filling of XML files  
    420362        if [ X${ok_mensuel} = Xy ] ; then 
    421             LMDZ_sed_xml file_def_histmth_lmdz.xml histmth enabled .TRUE.  
    422             LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_freq 1mo 
    423             LMDZ_sed_xml file_def_histmth_lmdz.xml histmth name histmth 
     363            IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth enabled .TRUE.  
     364            IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth output_freq 1mo 
     365            IGCM_comp_modifyXmlFile force file_def_histmth_lmdz.xml histmth name histmth 
    424366        fi 
    425367        if [ X${ok_journe} = Xy ] ; then         
    426             LMDZ_sed_xml file_def_histday_lmdz.xml histday enabled .TRUE.  
    427             LMDZ_sed_xml file_def_histday_lmdz.xml histday output_freq 1d 
    428             LMDZ_sed_xml file_def_histday_lmdz.xml histday name histday 
     368            IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday enabled .TRUE.  
     369            IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_freq 1d 
     370            IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday name histday 
    429371            if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then 
    430                 LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 2 
     372                IGCM_comp_modifyXmlFile force file_def_histday_lmdz.xml histday output_level 2 
    431373            fi 
    432374        fi 
    433375        if [ X${ok_hf} = Xy ] ; then 
    434             LMDZ_sed_xml file_def_histhf_lmdz.xml histhf enabled .TRUE.  
    435             LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_freq 6h 
    436             LMDZ_sed_xml file_def_histhf_lmdz.xml histhf name histhf 
     376            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf enabled .TRUE.  
     377            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_freq 6h 
     378            IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf name histhf 
    437379            if [ X${OutLevel} = Xlow ] ; then 
    438                 LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 2 
     380                IGCM_comp_modifyXmlFile force file_def_histhf_lmdz.xml histhf output_level 2 
    439381            fi 
    440382        fi       
    441         if [ X${ok_hf3h} = Xy ] ; then 
    442             LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE.  
    443             LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h output_freq 3h 
    444             LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h name histhf3h 
    445         fi       
    446         if [ X${ok_hf3hm} = Xy ] ; then 
    447             LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE.  
    448             LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h 
    449             LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm 
    450         fi 
     383#       if [ X${ok_hf3h} = Xy ] ; then 
     384#           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE.  
     385#           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h output_freq 3h 
     386#           IGCM_comp_modifyXmlFile force file_def_histhf3h_lmdz.xml histhf3h name histhf3h 
     387#       fi       
     388#       if [ X${ok_hf3hm} = Xy ] ; then 
     389#           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE.  
     390#           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h 
     391#           IGCM_comp_modifyXmlFile force file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm 
     392#       fi 
    451393        if [ X${ok_stn} = Xy ] ; then 
    452             LMDZ_sed_xml file_def_histstn_lmdz.xml histstn enabled .TRUE.  
    453             LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_freq 1800s 
    454             LMDZ_sed_xml file_def_histstn_lmdz.xml histstn name histstn 
     394            IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn enabled .TRUE.  
     395            IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn output_freq 1800s 
     396            IGCM_comp_modifyXmlFile force file_def_histstn_lmdz.xml histstn name histstn 
    455397        fi 
    456398        if [ X${LMDZ_NMC_monthly} = Xy ] ; then 
    457             LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE.  
    458             LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo 
    459             LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC 
     399            IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE.  
     400            IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo 
     401            IGCM_comp_modifyXmlFile force file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC 
    460402        fi 
    461403        if [ X${LMDZ_NMC_daily} = Xy ] ; then 
    462             LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE.  
    463             LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d 
    464             LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC 
     404            IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE.  
     405            IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d 
     406            IGCM_comp_modifyXmlFile force file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC 
    465407        fi 
    466408        if [ X${LMDZ_NMC_hf} = Xy ] ; then 
    467             LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE.  
    468             LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h 
    469             LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC 
     409            IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE.  
     410            IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h 
     411            IGCM_comp_modifyXmlFile force file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC 
    470412        fi 
    471413    fi 
    472414 
    473415    ## gcm.def parameters :  
    474     # Modification only for new physics 
     416    # Modification of variable iphysiq depending on the physics 
    475417    if [ X${LMDZ_Physics} = X"AP" ] ; then 
    476         LMDZ_sed gcm.def iphysiq     10 
    477     else 
    478         LMDZ_sed_default gcm.def iphysiq 
    479     fi 
     418        value=10 
     419    else 
     420        value=DEFAULT 
     421    fi 
     422    IGCM_comp_modifyDefFile nonblocker gcm.def iphysiq $value 
    480423 
    481424 
    482425    ## run.def parameters 
    483     LMDZ_sed run.def dayref   ${InitDay} 
    484     LMDZ_sed run.def nday     ${PeriodLengthInDays} 
    485     LMDZ_sed run.def raz_date ${RAZ_DATE} 
    486     LMDZ_sed run.def periodav ${LMDZ_periodav} 
    487     LMDZ_sed run.def adjust   ${LMDZ_adjust} 
     426    IGCM_comp_modifyDefFile blocker run.def dayref   ${InitDay} 
     427    IGCM_comp_modifyDefFile blocker run.def nday     ${PeriodLengthInDays} 
     428    IGCM_comp_modifyDefFile blocker run.def raz_date ${RAZ_DATE} 
     429    IGCM_comp_modifyDefFile blocker run.def periodav ${LMDZ_periodav} 
     430    IGCM_comp_modifyDefFile nonblocker run.def adjust   ${LMDZ_adjust} 
    488431 
    489432    # Set anneeref different for gcm and ce0l 
     
    492435    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then 
    493436        # for case ce0l : always take current year 
    494         LMDZ_sed run.def anneeref ${year} 
    495         LMDZ_sed run.def calend   ${CalendarTypeForCreate} 
     437        IGCM_comp_modifyDefFile blocker run.def anneeref ${year} 
     438        IGCM_comp_modifyDefFile blocker run.def calend   ${CalendarTypeForCreate} 
    496439    else 
    497440        # for case gcm : take first year of simulation 
    498         LMDZ_sed run.def anneeref ${InitYear} 
    499         LMDZ_sed run.def calend   ${CalendarTypeForLmdz} 
     441        IGCM_comp_modifyDefFile blocker run.def anneeref ${InitYear} 
     442        IGCM_comp_modifyDefFile blocker run.def calend   ${CalendarTypeForLmdz} 
    500443    fi 
    501444 
    502445    # Activate creation of file grilles_gcm.nc only at first period 
    503446    if [ ${CumulPeriod} -eq 1 ] ; then 
    504         LMDZ_sed run.def grilles_gcm_netcdf y 
    505     else 
    506         LMDZ_sed run.def grilles_gcm_netcdf n 
     447        IGCM_comp_modifyDefFile nonblocker run.def grilles_gcm_netcdf y 
     448    else 
     449        IGCM_comp_modifyDefFile nonblocker run.def grilles_gcm_netcdf n 
    507450    fi 
    508451 
     
    513456    if [ X${config_ListOfComponents_SRF} = Xorchidee ] ; then 
    514457        echo "Activate ORCHIDEE, set VEGET=y in run.def" 
    515         LMDZ_sed run.def VEGET y 
     458        IGCM_comp_modifyDefFile blocker run.def VEGET y 
    516459    else 
    517460        echo "No ORCHIDEE, set VEGET=n in run.def" 
    518         LMDZ_sed run.def VEGET n 
     461        IGCM_comp_modifyDefFile blocker run.def VEGET n 
    519462    fi 
    520463 
    521464    if [ X${config_ListOfComponents_CPL} = Xoasis ] ; then 
    522465        echo "Activate coupling to ocean, set type_ocean=couple in run.def" 
    523         LMDZ_sed run.def type_ocean couple 
     466        IGCM_comp_modifyDefFile blocker run.def type_ocean couple 
    524467    else 
    525468        echo "LMDZ is running in forced mode without ocean model, set type_ocean=force in run.def" 
    526         LMDZ_sed run.def type_ocean force 
     469        IGCM_comp_modifyDefFile blocker run.def type_ocean force 
    527470    fi 
    528471 
    529472    if [ X${config_ListOfComponents_CHM} = Xinca ] ; then 
    530473        echo "Activate coupling to INCA, set type_trac=inca in run.def" 
    531         LMDZ_sed run.def type_trac inca 
     474        IGCM_comp_modifyDefFile blocker run.def type_trac inca 
    532475    elif [ X${config_ListOfComponents_CHM} = Xreprobus ] ; then 
    533476        echo "Activate coupling to REPROBUS, set type_trac=repr in run.def" 
    534         LMDZ_sed run.def type_trac repr 
    535         LMDZ_sed run.def config_inca none 
     477        IGCM_comp_modifyDefFile blocker run.def type_trac repr 
     478        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    536479    else 
    537480        echo "No coupling to chemistry model, set type_trac=lmdz in run.def" 
    538         LMDZ_sed run.def type_trac lmdz 
    539         LMDZ_sed run.def config_inca none 
     481        IGCM_comp_modifyDefFile blocker run.def type_trac lmdz 
     482        IGCM_comp_modifyDefFile blocker run.def config_inca none 
    540483    fi 
    541484 
     
    543486    # config.def : Activate direct radiative effect if ok_ade=y 
    544487    if [ ! X${lmdz_UserChoices_ok_ade} = X ]; then  
    545         LMDZ_sed config.def ok_ade ${lmdz_UserChoices_ok_ade} 
    546     else 
    547         LMDZ_sed config.def ok_ade n 
     488        IGCM_comp_modifyDefFile nonblocker config.def ok_ade ${lmdz_UserChoices_ok_ade} 
     489    else 
     490        IGCM_comp_modifyDefFile nonblocker config.def ok_ade n 
    548491    fi  
    549492 
    550493    # config.def : Activate indirect radiative effect if ok_aie=y 
    551494    if [ ! X${lmdz_UserChoices_ok_aie} = X ]; then  
    552         LMDZ_sed config.def ok_aie ${lmdz_UserChoices_ok_aie} 
    553     else 
    554         LMDZ_sed config.def ok_aie n 
     495        IGCM_comp_modifyDefFile nonblocker config.def ok_aie ${lmdz_UserChoices_ok_aie} 
     496    else 
     497        IGCM_comp_modifyDefFile nonblocker config.def ok_aie n 
    555498    fi  
    556499 
    557500    # config.def : Activate online aerosol coupled model if aerosol_couple=y 
    558501    if [ ! X${lmdz_UserChoices_aerosol_couple} = X ]; then  
    559         LMDZ_sed config.def aerosol_couple ${lmdz_UserChoices_aerosol_couple} 
    560     else 
    561         LMDZ_sed config.def aerosol_couple n 
     502        IGCM_comp_modifyDefFile nonblocker config.def aerosol_couple ${lmdz_UserChoices_aerosol_couple} 
     503    else 
     504        IGCM_comp_modifyDefFile nonblocker config.def aerosol_couple n 
    562505    fi  
    563506 
    564507    # config.def : Activate reading of ozone in climatology if read_climoz=2 
    565508    if [ ! X${lmdz_UserChoices_read_climoz} = X ]; then  
    566         LMDZ_sed config.def read_climoz ${lmdz_UserChoices_read_climoz} 
    567     else 
    568         LMDZ_sed config.def read_climoz 0        
     509        IGCM_comp_modifyDefFile nonblocker config.def read_climoz ${lmdz_UserChoices_read_climoz} 
     510    else 
     511        IGCM_comp_modifyDefFile nonblocker config.def read_climoz 0      
    569512    fi  
    570513 
     
    573516    # =5 => dust only =6 => all aerosol     
    574517    if [ ! X${lmdz_UserChoices_flag_aerosol} = X ]; then  
    575         LMDZ_sed config.def flag_aerosol ${lmdz_UserChoices_flag_aerosol} 
    576     else 
    577         LMDZ_sed config.def flag_aerosol 0 
     518        IGCM_comp_modifyDefFile nonblocker config.def flag_aerosol ${lmdz_UserChoices_flag_aerosol} 
     519    else 
     520        IGCM_comp_modifyDefFile nonblocker config.def flag_aerosol 0 
    578521    fi  
    579522 
    580523    # config.def : Activate calcul of Cloud droplet number concentration if ok_cdnc=y 
    581524    if [ ! X${lmdz_UserChoices_ok_cdnc} = X ]; then  
    582         LMDZ_sed config.def ok_cdnc ${lmdz_UserChoices_ok_cdnc} 
    583     else 
    584         LMDZ_sed config.def ok_cdnc n    
     525        IGCM_comp_modifyDefFile nonblocker config.def ok_cdnc ${lmdz_UserChoices_ok_cdnc} 
     526    else 
     527        IGCM_comp_modifyDefFile nonblocker config.def ok_cdnc n  
    585528    fi  
    586529 
    587530    # guide.def : Activate nudging if ok_guide=y set in lmdz.card 
    588531    if [ ! X${lmdz_UserChoices_ok_guide} = X ] ; then 
    589         LMDZ_sed guide.def ok_guide  ${lmdz_UserChoices_ok_guide} 
    590     else 
    591         LMDZ_sed guide.def ok_guide n 
     532        IGCM_comp_modifyDefFile nonblocker guide.def ok_guide  ${lmdz_UserChoices_ok_guide} 
     533    else 
     534        IGCM_comp_modifyDefFile nonblocker guide.def ok_guide n 
    592535    fi 
    593536 
     
    741684    if [ ${lmdz_UserChoices_CARBON_CYCLE} = historical ] ; then 
    742685            # Modify co2_ppm in config.def only for historical run 
    743             # If not historical run, keep co2_ppm value set earlier by LMDZ_sed 
    744         LMDZ_sed config.def co2_ppm     ${CO2_ppm} 
     686            # If not historical run, keep co2_ppm value set earlier by IGCM_comp_modifyDefFile 
     687        IGCM_comp_modifyDefFile nonblocker config.def co2_ppm     ${CO2_ppm} 
    745688    fi 
    746689    IGCM_debug_PopStack "ATM_Carbon_Update" 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/oasis.driver

    r2282 r2343  
    8181        ncrename -v OIceFrac,OIceFrc sstoc.nc > /dev/null 2>&1 
    8282    fi 
     83    # For use of XIOS 
     84    IGCM_comp_modifyXmlFile force iodef.xml using_oasis NONE true 
    8385 
    8486    IGCM_debug_PopStack "CPL_Update" 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/orchidee.driver

    r2300 r2343  
    11#!/bin/ksh 
    2  
    32#D- Driver du script pour ORCHIDEE 
    4  
    5 function ORCHIDEE_sed 
    6 { 
    7     IGCM_debug_PushStack "ORCHIDEE_sed" 
    8      
    9     sed -e "s/^${1}\ *=.*/${1}= ${2}/" \ 
    10         orchidee.def > orchidee.def.tmp 
    11     RET=$? 
    12     echo "ORCHIDEE_sed : ${1} ${2}" 
    13     \mv orchidee.def.tmp orchidee.def 
    14      
    15     IGCM_debug_PopStack "ORCHIDEE_sed" 
    16     return $RET 
    17 } 
    18  
    19 function ORCHIDEE_sed_xml 
    20 { 
    21 # Usage : ORCHIDEE_sed_xml xml_file output_file attribute value  
    22 #         In file xml_file modify at the line containing id="output_file" the attribute "attribute=xxx" into "attribute=value" 
    23      
    24     # Test if the fichier exist 
    25     if [ ! -f ${1} ] ; then 
    26         echo "WARNING : ${1} file does not exist. Following will not be done : ORCHIDEE_sed : ${1} ${2} ${3} ${4}" 
    27         IGCM_debug_PopStack "LMDZ_sed" 
    28         return 
    29     fi 
    30     sed -e "/id=\"${2}\"/s/\(${3}=\"\)[^\"]*\(\"\)/\1${4}\2/" ${1} > ${1}.tmp 
    31     RET=$? 
    32     echo "ORCHIDEE_sed : ${1} ${2} ${3} ${4}" 
    33     \mv ${1}.tmp ${1} 
    34  
    35     return $RET 
    36 } 
    37  
    383#----------------------------------------------------------------- 
    394function SRF_Initialize 
     
    6631    IGCM_debug_PushStack "SRF_Update" 
    6732 
     33    # Activate STOMATE if the compontent SBG=stomate is set in config.card 
     34    if [ X${config_ListOfComponents_SBG} = Xstomate ] ; then 
     35        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE y 
     36    else 
     37        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_OK_STOMATE n 
     38    fi 
     39 
    6840    typeset SECHIBA_WRITE_STEP 
    6941 
    7042    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    71         ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .FALSE.  
    72         ORCHIDEE_sed_xml file_def_orchidee.xml sechiba2 enabled .FALSE.  
    73         ORCHIDEE_sed XIOS_ORCHIDEE_OK y 
     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 
    7448    fi     
    7549 
     
    8155            (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears * 86400 ))  
    8256            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    83                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    84                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${WriteInYears}y 
    85                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    8660            fi 
    8761            ;; 
    8862        1M) 
    8963            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    90                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    91                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq 1mo 
    92                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    9367            fi 
    9468            case ${config_UserChoices_PeriodLength} in 
     
    10781            WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    10882            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    109                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    110                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${WriteInMonths}mo 
    111                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    11286            fi 
    11387            case ${config_UserChoices_PeriodLength} in 
     
    12397                (( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 )) 
    12498                if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    125                     ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    126                     ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${SECHIBA_WRITE_STEP}s 
    127                     ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history 
     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 
    128102                fi 
    129103                ;; 
     
    132106        5D|5d)  
    133107            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    134                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    135                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq 5d 
    136                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    137111            fi 
    138112            (( SECHIBA_WRITE_STEP = 5 * 86400 ))  
     
    140114        1D|1d)  
    141115            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    142                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    143                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq 1d 
    144                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    145119            fi 
    146120            (( SECHIBA_WRITE_STEP = 86400 ))  
     
    149123            WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
    150124            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    151                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    152                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
    153                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
     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  
    154128            fi 
    155129            (( SECHIBA_WRITE_STEP = WriteInSeconds )) ;; 
     
    164138        (( SECHIBA_WRITE_STEP = 0 )) 
    165139    fi 
    166  
    167     ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    168     ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
     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} 
    169142 
    170143    # Outputs HF in HISTFILE2 if required 
    171144    if [ X${SRF_ok_hf} = Xy ] ; then 
    172         ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     145        IGCM_comp_modifyDefFile nonblocker orchidee.def SECHIBA_HISTFILE2 y 
    173146        if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    174             ORCHIDEE_sed_xml file_def_orchidee.xml sechiba2 enabled .TRUE.  
    175             ORCHIDEE_sed_xml file_def_orchidee.xml sechiba2 output_freq 10800s 
    176             ORCHIDEE_sed_xml file_def_orchidee.xml sechiba2 name sechiba_out_2 
     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 
    177150        fi 
    178151    else 
    179         ORCHIDEE_sed SECHIBA_HISTFILE2 n 
    180     fi 
    181     ORCHIDEE_sed SECHIBA_HISTLEVEL2 1 
    182     ORCHIDEE_sed WRITE_STEP2 10800.0 
     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 
    183156 
    184157    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then 
    185         ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc 
    186     else 
    187         ORCHIDEE_sed SECHIBA_restart_in NONE 
     158        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in sechiba_rest_in.nc 
     159    else 
     160        IGCM_comp_modifyDefFile blocker orchidee.def SECHIBA_restart_in NONE 
    188161    fi 
    189162 
    190163# Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices 
    191164    if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then 
    192         ORCHIDEE_sed VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
    193     else 
    194         ORCHIDEE_sed VEGET_UPDATE 0Y 
     165        IGCM_comp_modifyDefFile blocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE} 
     166    else 
     167        IGCM_comp_modifyDefFile blocker orchidee.def VEGET_UPDATE 0Y 
    195168    fi 
    196169    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then 
    197         ORCHIDEE_sed LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
    198     else 
    199         ORCHIDEE_sed LAND_COVER_CHANGE n 
     170        IGCM_comp_modifyDefFile blocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE} 
     171    else 
     172        IGCM_comp_modifyDefFile blocker orchidee.def LAND_COVER_CHANGE n 
    200173    fi 
    201174 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/stomate.driver

    r2300 r2343  
    2121 
    2222    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    23         ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .FALSE.  
    24         ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .FALSE.  
     23        IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate1 enabled .FALSE.  
     24        IGCM_comp_modifyXmlFile force file_def_orchidee.xml stomate2 enabled .FALSE.  
    2525    fi    
    2626    case ${config_SBG_WriteFrequency} in 
     
    3030            (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears ))  
    3131            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    32                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    33                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${WriteInYears}y 
    34                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    35                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    36                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInYears}y 
    37                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    3838 
    3939            fi 
     
    4141        1M|1m)  
    4242            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    43                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    44                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 1mo 
    45                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    46                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    47                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 1mo 
    48                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    4949            fi 
    5050            case ${config_UserChoices_PeriodLength} in 
     
    6262            WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
    6363            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    64                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    65                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${WriteInMonths}mo 
    66                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    67                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    68                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInMonths}mo 
    69                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    7070            fi 
    7171            case ${config_UserChoices_PeriodLength} in 
     
    8181                (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) ))  
    8282                if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    83                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    84                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq ${STOMATE_WRITE_STEP}s 
    85                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history 
    86                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    87                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${STOMATE_WRITE_STEP}s 
    88                     ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history 
     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 
    8989                fi 
    9090                ;; 
     
    9494            (( STOMATE_WRITE_STEP = 5 )) 
    9595            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    96                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    97                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 5d 
    98                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    99                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    100                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 5d 
    101                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    102102            fi 
    103103            ;; 
     
    105105            (( STOMATE_WRITE_STEP = 1 ))  
    106106            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    107                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 enabled .TRUE.  
    108                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 output_freq 1d 
    109                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate1 name stomate_history  
    110                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    111                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq 1d 
    112                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    113113            fi 
    114114            ;; 
     
    116116            WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
    117117            if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
    118                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 enabled .TRUE.  
    119                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 output_freq ${WriteInSeconds}s 
    120                 ORCHIDEE_sed_xml file_def_orchidee.xml sechiba1 name sechiba_history  
    121                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 enabled .TRUE.  
    122                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 output_freq ${WriteInSeconds}s 
    123                 ORCHIDEE_sed_xml file_def_orchidee.xml stomate2 name stomate_ipcc_history  
     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  
    124124            fi 
    125125            (( STOMATE_WRITE_STEP = 1 )) ;; 
     
    129129    esac 
    130130 
    131     ORCHIDEE_sed STOMATE_OK_STOMATE y 
    132131 
    133132#Use of XIOS library only 
     
    137136    fi 
    138137 
    139     ORCHIDEE_sed STOMATE_HIST_DT ${STOMATE_WRITE_STEP} 
    140     ORCHIDEE_sed STOMATE_HISTLEVEL ${stomate_UserChoices_stomate_LEVEL} 
     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} 
    141140 
    142141    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SBG_Restart}" = "n" ] ) ; then 
    143142        echo "STOMATE : without restart" 
    144         ORCHIDEE_sed STOMATE_RESTART_FILEIN NONE 
     143        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN NONE 
    145144    else 
    146         ORCHIDEE_sed STOMATE_RESTART_FILEIN stomate_rest_in.nc 
     145        IGCM_comp_modifyDefFile blocker orchidee.def STOMATE_RESTART_FILEIN stomate_rest_in.nc 
    147146    fi 
    148147 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/xios.driver

    r2315 r2343  
    11#!/bin/ksh 
    2  
    3 function XIOS_sed_xml 
    4 { 
    5 # Usage : XIOS_sed_xml xml_file attribute value  
    6 #         In file xml_file modify at the line containing id="attribute" the attribute value ">value<"  
    7     IGCM_debug_PushStack "XIOS_sed_xml" 
    8     # Test if the fichier exist 
    9     if [ ! -f ${1} ] ; then 
    10         echo "WARNING : ${1} file does not exist. Following will not be done : XIOS_sed_xml : ${1} ${2} ${3}" 
    11         IGCM_debug_PopStack "XIOS_sed_xml" 
    12         return 
    13     fi 
    14     sed -e "s/\(<[^\"]*\"${2}\".*>\)\([^<]*\)\(<[^>]*\)/\1${3}\3/" ${1} > ${1}.tmp 
    15     RET=$? 
    16     echo "XIOS_sed_xml" : ${1} ${2} ${3} 
    17     \mv ${1}.tmp ${1} 
    18     IGCM_debug_PopStack "XIOS_sed_xml" 
    19     return $RET 
    20 } 
    21  
    222#----------------------------------- 
    233function IOS_Initialize 
     
    3717    echo UPDATE IOS !!! 
    3818# Activate server mode 
    39     XIOS_sed_xml iodef.xml using_server true 
     19    IGCM_comp_modifyXmlfile force iodef.xml using_server NONE true 
    4020# If lmdz_UserChoices_XIOS=y add LMDZ as component id : 
    4121    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
    42         XIOS_sed_xml iodef.xml oasis_codes_id LMDZ,oceanx 
     22        IGCM_comp_modifyXmlFile force iodef.xml oasis_codes_id NONE LMDZ,oceanx 
    4323    fi  
    4424    if [ -f namcouple ] ; then 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/iodef.xml

    r2337 r2343  
    2020          <variable id="info_level"                type="integer">1</variable> 
    2121          <variable id="using_server"              type="boolean">false</variable> 
    22           <variable id="using_oasis"               type="boolean">true</variable> 
     22          <variable id="using_oasis"               type="boolean">false</variable> 
    2323          <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    2424         
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_CWRR

    r2300 r2343  
    318318# Activate STOMATE? 
    319319# set to TRUE if STOMATE is to be activated 
    320 # STOMATE_OK_STOMATE=_AUTO_ : will be set to y if stomate component SBG is activated in config.card 
    321 STOMATE_OK_STOMATE = n 
     320# STOMATE_OK_STOMATE will be set to y or n by orchidee.driver depending on activation of stomate component SBG in config.card 
     321STOMATE_OK_STOMATE = _AUTO_  
    322322# default = n 
    323323 
     
    891891# default = n 
    892892 
    893 # Flag to activate XIOS as output library 
    894 XIOS_ORCHIDEE_OK = n 
    895  
    896 #************************************************************************** 
     893# Use XIOS for writing diagnostics file 
     894# defulat = n 
     895XIOS_ORCHIDEE_OK = _AUTO_ 
     896#************************************************************************** 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_Choi

    r2300 r2343  
    318318# Activate STOMATE? 
    319319# set to TRUE if STOMATE is to be activated 
    320 # STOMATE_OK_STOMATE=_AUTO_ : will be set to y if stomate component SBG is activated in config.card 
    321 STOMATE_OK_STOMATE = n 
     320# STOMATE_OK_STOMATE will be set to y or n by orchidee.driver depending on activation of stomate component SBG in config.card 
     321STOMATE_OK_STOMATE = _AUTO_  
    322322# default = n 
    323323 
     
    891891# default = n 
    892892 
    893 # Flag to activate XIOS as output library 
    894 XIOS_ORCHIDEE_OK = n 
    895  
    896 #************************************************************************** 
     893# Use XIOS for writing diagnostics file 
     894# defulat = n 
     895XIOS_ORCHIDEE_OK = _AUTO_ 
     896#************************************************************************** 
Note: See TracChangeset for help on using the changeset viewer.