Changeset 2300


Ignore:
Timestamp:
07/22/14 16:38:56 (10 years ago)
Author:
aclsce
Message:
  • Added possibility to use XIOS as output library for LMDZ and ORCHIDEE as IPSLCM6_rc0 component.
Location:
CONFIG/UNIFORM/v6/IPSLCM6
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/AA_make

    r2285 r2300  
    1111        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else $(M_K) ORCA2LIM2xLMD9695-L39 ; fi 
    1212 
    13 ORCA2LIM2xLMD9695-L39 : libioipsl oasis3-mct liborchidee xios orca2lim2 lmdz96x95x39 verif 
     13ORCA2LIM2xLMD9695-L39 : libioipsl oasis3-mct xios liborchidee orca2lim2 lmdz96x95x39 verif 
    1414        echo "ORCA2LIM2xLMD9695-L39" >.resol 
    1515        echo "RESOL_ATM_3D=96x95x39" >>.resol 
    1616        echo "$(LIB_MPI)" >.libmpi 
    1717 
    18 ORCA2LIM3xLMD9695-L39 : libioipsl oasis3-mct liborchidee xios orca2lim3 lmdz96x95x39 verif 
     18ORCA2LIM3xLMD9695-L39 : libioipsl oasis3-mct xios liborchidee orca2lim3 lmdz96x95x39 verif 
    1919        echo "ORCA2LIM3xLMD9695-L39" >.resol 
    2020        echo "RESOL_ATM_3D=96x95x39" >>.resol 
    2121        echo "$(LIB_MPI)" >.libmpi 
    2222 
    23 ORCA2LIM2xLMD9695-L39-NOPISCES : libioipsl oasis3-mct liborchidee xios orca2lim2nopisces lmdz96x95x39 verif 
     23ORCA2LIM2xLMD9695-L39-NOPISCES : libioipsl oasis3-mct xios liborchidee orca2lim2nopisces lmdz96x95x39 verif 
    2424        echo "ORCA2LIM2xLMD9695-L39" >.resol 
    2525        echo "RESOL_ATM_3D=96x95x39" >>.resol 
     
    2727        echo "$(LIB_MPI)" >.libmpi 
    2828 
    29 ORCA2LIM2xLMD144142-L39 : libioipsl oasis3-mct liborchidee xios orca2lim2 lmdz144x142x39 verif 
     29ORCA2LIM2xLMD144142-L39 : libioipsl oasis3-mct xios liborchidee orca2lim2 lmdz144x142x39 verif 
    3030        echo "ORCA2LIM2xLMD144142-L39" >.resol 
    3131        echo "RESOL_ATM_3D=144x142x39" >>.resol 
    3232        echo "$(LIB_MPI)" >.libmpi 
    3333 
    34 ORCA2LIM2xLMD144142-L59 : libioipsl oasis3-mct liborchidee xios orca2lim2 lmdz144x142x59 verif 
     34ORCA2LIM2xLMD144142-L59 : libioipsl oasis3-mct xios liborchidee orca2lim2 lmdz144x142x59 verif 
    3535        echo "ORCA2LIM2xLMD144142-L59" >.resol 
    3636        echo "RESOL_ATM_3D=144x142x59" >>.resol 
    3737        echo "$(LIB_MPI)" >.libmpi 
    3838 
    39 ORCA2LIM3xLMD144142-L39 : libioipsl oasis3-mct liborchidee xios orca2lim3 lmdz144x142x39 verif 
     39ORCA2LIM3xLMD144142-L39 : libioipsl oasis3-mct xios liborchidee orca2lim3 lmdz144x142x39 verif 
    4040        echo "ORCA2LIM3xLMD144142-L39" >.resol 
    4141        echo "RESOL_ATM_3D=144x142x39" >>.resol 
    4242        echo "$(LIB_MPI)" >.libmpi 
    4343 
    44 ORCA2LIM3xLMD144142-L59 : libioipsl oasis3-mct liborchidee xios orca2lim3 lmdz144x142x59 verif 
     44ORCA2LIM3xLMD144142-L59 : libioipsl oasis3-mct xios liborchidee orca2lim3 lmdz144x142x59 verif 
    4545        echo "ORCA2LIM3xLMD144142-L59" >.resol 
    4646        echo "RESOL_ATM_3D=144x142x59" >>.resol 
    4747        echo "$(LIB_MPI)" >.libmpi 
    4848 
    49 ORCA1LIM2xLMD9695-L39 : libioipsl oasis3-mct liborchidee xios orca1lim2 lmdz96x95x39 verif 
     49ORCA1LIM2xLMD9695-L39 : libioipsl oasis3-mct xios liborchidee orca1lim2 lmdz96x95x39 verif 
    5050        echo "ORCA1LIM2xLMD9695-L39" >.resol 
    5151        echo "RESOL_ATM_3D=96x95x39" >>.resol 
    5252        echo "$(LIB_MPI)" >.libmpi 
    5353 
    54 ORCA1LIM2xLMD144142-L39 : libioipsl oasis3-mct liborchidee xios orca1lim2 lmdz144x142x39 verif 
     54ORCA1LIM2xLMD144142-L39 : libioipsl oasis3-mct xios liborchidee orca1lim2 lmdz144x142x39 verif 
    5555        echo "ORCA1LIM2xLMD144142-L39" >.resol 
    5656        echo "RESOL_ATM_3D=144x142x39" >>.resol 
    5757        echo "$(LIB_MPI)" >.libmpii 
    5858 
    59 ORCA1LIM2xLMD144142-L59 : libioipsl oasis3-mct liborchidee xios orca1lim2 lmdz144x142x59 verif 
     59ORCA1LIM2xLMD144142-L59 : libioipsl oasis3-mct xios liborchidee orca1lim2 lmdz144x142x59 verif 
    6060        echo "ORCA1LIM2xLMD144142-L59" >.resol 
    6161        echo "RESOL_ATM_3D=144x142x59" >>.resol 
    6262        echo "$(LIB_MPI)" >.libmpii 
    6363 
    64 ORCA1LIM2xLMD144142-L79 : libioipsl oasis3-mct liborchidee xios orca1lim2 lmdz144x142x79 verif 
     64ORCA1LIM2xLMD144142-L79 : libioipsl oasis3-mct xios liborchidee orca1lim2 lmdz144x142x79 verif 
    6565        echo "ORCA1LIM2xLMD144142-L79" >.resol 
    6666        echo "RESOL_ATM_3D=144x142x79" >>.resol 
    6767        echo "$(LIB_MPI)" >.libmpii 
    6868 
    69 ORCA1LIM3xLMD9695-L39 : libioipsl oasis3-mct liborchidee xios orca1lim3 lmdz96x95x39 verif 
     69ORCA1LIM3xLMD9695-L39 : libioipsl oasis3-mct xios liborchidee orca1lim3 lmdz96x95x39 verif 
    7070        echo "ORCA1LIM3xLMD9695-L39" >.resol 
    7171        echo "RESOL_ATM_3D=96x95x39" >>.resol 
    7272        echo "$(LIB_MPI)" >.libmpi 
    7373 
    74 ORCA1LIM3xLMD144142-L39 : libioipsl oasis3-mct liborchidee xios orca1lim3 lmdz144x142x39 verif 
     74ORCA1LIM3xLMD144142-L39 : libioipsl oasis3-mct xios liborchidee orca1lim3 lmdz144x142x39 verif 
    7575        echo "ORCA1LIM3xLMD144142-L39" >.resol 
    7676        echo "RESOL_ATM_3D=144x142x39" >>.resol 
    7777        echo "$(LIB_MPI)" >.libmpi 
    7878 
    79 ORCA1LIM3xLMD144142-L59 : libioipsl oasis3-mct liborchidee xios orca1lim3 lmdz144x142x59 verif 
     79ORCA1LIM3xLMD144142-L59 : libioipsl oasis3-mct xios liborchidee orca1lim3 lmdz144x142x59 verif 
    8080        echo "ORCA1LIM3xLMD144142-L59" >.resol 
    8181        echo "RESOL_ATM_3D=144x142x59" >>.resol 
    8282        echo "$(LIB_MPI)" >.libmpi 
    8383 
    84 ORCA1LIM3xLMD144142-L79 : libioipsl oasis3-mct liborchidee xios orca1lim3 lmdz144x142x79 verif 
     84ORCA1LIM3xLMD144142-L79 : libioipsl oasis3-mct xios liborchidee orca1lim3 lmdz144x142x79 verif 
    8585        echo "ORCA1LIM3xLMD144142-L79" >.resol 
    8686        echo "RESOL_ATM_3D=144x142x79" >>.resol 
     
    9494 
    9595liborchidee : ../../modeles/ORCHIDEE/ 
    96         (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi -arch $(FCM_ARCH) -j 8 -driver) 
     96        (cd ../../modeles/ORCHIDEE/ ; ./makeorchidee_fcm -parallel mpi -arch $(FCM_ARCH) -j 8 -xios -driver) 
    9797 
    9898lmdz96x95x39: 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

    r2291 r2300  
    4949LMDZ_NMC_monthly=y 
    5050LMDZ_NMC_daily=y 
    51 LMDZ_NMC_hf=y 
     51LMDZ_NMC_hf=n 
     52 
     53# Use XIOS as output library 
     54XIOS=n 
    5255 
    5356[InitialStateFiles] 
     
    7376        (${SUBMIT_DIR}/PARAM/config.def_${ConfType},  config.def),    \ 
    7477        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    75         (${SUBMIT_DIR}/PARAM/traceur.def, .) 
     78        (${SUBMIT_DIR}/PARAM/traceur.def, .), \ 
     79        (${SUBMIT_DIR}/PARAM/iodef.xml, . ),\ 
     80        (${MODIPSL}/modeles/LMDZ/DefLists/context_lmdz.xml, . )            ,\ 
     81        (${MODIPSL}/modeles/LMDZ/DefLists/field_def_lmdz.xml, . )          ,\ 
     82        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histday_lmdz.xml, . )   ,\ 
     83        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhf_lmdz.xml, . )    ,\ 
     84        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histins_lmdz.xml, . )   ,\ 
     85        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histLES_lmdz.xml, . )   ,\ 
     86        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmth_lmdz.xml, . )   ,\ 
     87        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histstn_lmdz.xml, . )   ,\ 
     88        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histmthNMC_lmdz.xml, . ),\ 
     89        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histdayNMC_lmdz.xml, . ),\ 
     90        (${MODIPSL}/modeles/LMDZ/DefLists/file_def_histhfNMC_lmdz.xml, . ) 
    7691 
    7792[RestartFiles] 
     
    8095 
    8196[OutputText] 
    82 List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, debug.01) 
     97List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, used_run.def, iodef.xml, context_lmdz.xml,field_def_lmdz.xml,debug.01) 
     98#List=   (lmdz.x.prt) 
    8399 
    84100[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

    r2284 r2300  
    3535List=   (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_ref, namelist_ref),      \ 
    3636        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg, namelist_cfg),      \ 
    37         (${SUBMIT_DIR}/PARAM/iodef.xml,                    iodef.xml),      \ 
    38         (${SUBMIT_DIR}/PARAM/context_nemo.xml,      context_nemo.xml),      \ 
     37        (${SUBMIT_DIR}/PARAM/context_nemo.xml,   context_nemo.xml),         \ 
    3938        (${SUBMIT_DIR}/PARAM/field_def_nemo.xml,   field_def_nemo.xml),     \ 
    4039        (${SUBMIT_DIR}/PARAM/domain_def_nemo.xml,  domain_def_nemo.xml) 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card

    r2112 r2300  
    1010 
    1111sechiba_LEVEL=11 
     12 
     13# Use XIOS as output library 
     14XIOS=n 
    1215 
    1316[InitialStateFiles] 
     
    2427 
    2528[ParametersFiles] 
    26 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def) 
     29List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
     30        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
     31        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) ,\ 
     32        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .) 
    2733 
    2834[RestartFiles] 
     
    3137 
    3238[OutputText] 
    33 List=   (out_orchidee, orchidee.def) 
     39List=   (out_orchidee, orchidee.def, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml) 
    3440 
    3541[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/lmdz.driver

    r2275 r2300  
    3434    LMDZ_sed  ${1} ${2} $DefValue 
    3535    IGCM_debug_PopStack "LMDZ_sed_default" 
     36    return $RET 
     37} 
     38 
     39function 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    # Test if the fichier exist 
     45    if [ ! -f ${1} ] ; then 
     46        echo "WARNING : ${1} file does not exist. Following will not be done : LMDZ_sed : ${1} ${2} ${3} ${4}" 
     47        IGCM_debug_PopStack "LMDZ_sed" 
     48        return 
     49    fi 
     50    sed -e "/id=\"${2}\"/s/\(${3}=\"\)[^\"]*\(\"\)/\1${4}\2/" ${1} > ${1}.tmp 
     51    RET=$? 
     52    echo "LMDZ_sed : ${1} ${2} ${3} ${4}" 
     53    \mv ${1}.tmp ${1} 
     54 
    3655    return $RET 
    3756} 
     
    327346    LMDZ_sed output.def ok_hfCOSP   ${LMDZ_COSP_hf} 
    328347    LMDZ_sed output.def ok_histNMC  "${LMDZ_NMC_monthly} ${LMDZ_NMC_daily} ${LMDZ_NMC_hf}" 
     348 
     349    # XIOS XML definition 
     350    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
     351    # Default init : files are desactivated 
     352        LMDZ_sed_xml file_def_histmth_lmdz.xml histmth enabled .FALSE.  
     353        LMDZ_sed_xml file_def_histday_lmdz.xml histday enabled .FALSE.  
     354        LMDZ_sed_xml file_def_histhf_lmdz.xml histhf enabled .FALSE. 
     355        LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h enabled .FALSE. 
     356        LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm enabled .FALSE. 
     357        LMDZ_sed_xml file_def_histstn_lmdz.xml histstn enabled .FALSE. 
     358        LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC enabled .FALSE. 
     359        LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC enabled .FALSE. 
     360        LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC enabled .FALSE. 
     361    # Default output level : 5 
     362        LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_level 5  
     363        LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 5  
     364        LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 5 
     365        LMDZ_sed_xml file_def_histfh3h_lmdz.xml histfh3h output_level 5 
     366        LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histfh3hm output_level 5 
     367        LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_level 5 
     368        LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_level 5 
     369        LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_level 5 
     370        LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_level 5 
     371     # Filling of XML files  
     372        if [ X${ok_mensuel} = Xy ] ; then 
     373            LMDZ_sed_xml file_def_histmth_lmdz.xml histmth enabled .TRUE.  
     374            LMDZ_sed_xml file_def_histmth_lmdz.xml histmth output_freq 1mo 
     375            LMDZ_sed_xml file_def_histmth_lmdz.xml histmth name histmth 
     376        fi 
     377        if [ X${ok_journe} = Xy ] ; then         
     378            LMDZ_sed_xml file_def_histday_lmdz.xml histday enabled .TRUE.  
     379            LMDZ_sed_xml file_def_histday_lmdz.xml histday output_freq 1d 
     380            LMDZ_sed_xml file_def_histday_lmdz.xml histday name histday 
     381            if [ X${OutLevel} = Xlow ] || [ X${OutLevel} = Xmedium ] ; then 
     382                LMDZ_sed_xml file_def_histday_lmdz.xml histday output_level 2 
     383            fi 
     384        fi 
     385        if [ X${ok_hf} = Xy ] ; then 
     386            LMDZ_sed_xml file_def_histhf_lmdz.xml histhf enabled .TRUE.  
     387            LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_freq 6h 
     388            LMDZ_sed_xml file_def_histhf_lmdz.xml histhf name histhf 
     389            if [ X${OutLevel} = Xlow ] ; then 
     390                LMDZ_sed_xml file_def_histhf_lmdz.xml histhf output_level 2 
     391            fi 
     392        fi       
     393        if [ X${ok_hf3h} = Xy ] ; then 
     394            LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h enabled .TRUE.  
     395            LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h output_freq 3h 
     396            LMDZ_sed_xml file_def_histhf3h_lmdz.xml histhf3h name histhf3h 
     397        fi       
     398        if [ X${ok_hf3hm} = Xy ] ; then 
     399            LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm enabled .TRUE.  
     400            LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm output_freq 3h 
     401            LMDZ_sed_xml file_def_histhf3hm_lmdz.xml histhf3hm name histhf3hm 
     402        fi 
     403        if [ X${ok_stn} = Xy ] ; then 
     404            LMDZ_sed_xml file_def_histstn_lmdz.xml histstn enabled .TRUE.  
     405            LMDZ_sed_xml file_def_histstn_lmdz.xml histstn output_freq 1800s 
     406            LMDZ_sed_xml file_def_histstn_lmdz.xml histstn name histstn 
     407        fi 
     408        if [ X${LMDZ_NMC_monthly} = Xy ] ; then 
     409            LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC enabled .TRUE.  
     410            LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC output_freq 1mo 
     411            LMDZ_sed_xml file_def_histmthNMC_lmdz.xml histmthNMC name histmthNMC 
     412        fi 
     413        if [ X${LMDZ_NMC_daily} = Xy ] ; then 
     414            LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC enabled .TRUE.  
     415            LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC output_freq 1d 
     416            LMDZ_sed_xml file_def_histdayNMC_lmdz.xml histdayNMC name histdayNMC 
     417        fi 
     418        if [ X${LMDZ_NMC_hf} = Xy ] ; then 
     419            LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC enabled .TRUE.  
     420            LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC output_freq 6h 
     421            LMDZ_sed_xml file_def_histhfNMC_lmdz.xml histhfNMC name histhfNMC 
     422        fi 
     423    fi 
    329424 
    330425    ## gcm.def parameters :  
     
    503598    fi 
    504599 
     600    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
     601    # Add include of LMDZ context in iodef.xml 
     602    # In iodef.xml add on next line after "COMPONENT CONTEXT" 
     603    #  <context id="LMDZ" src="./context_lmdz.xml"/> 
     604        echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
     605        cp iodef.xml iodef.xml.tmp 
     606        sed -e "/COMPONENT CONTEXT/r add.tmp" \ 
     607            iodef.xml.tmp > iodef.xml 
     608        rm iodef.xml.tmp add.tmp 
     609    fi 
     610     
    505611    IGCM_debug_PopStack "ATM_Update" 
    506612} 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/orchidee.driver

    r2018 r2300  
    1717} 
    1818 
     19function 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 
    1938#----------------------------------------------------------------- 
    2039function SRF_Initialize 
     
    4968    typeset SECHIBA_WRITE_STEP 
    5069 
     70    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 
     74    fi     
     75 
    5176    SRF_WriteFrequency=$( echo ${config_SRF_WriteFrequency} | sed -e 's/\([0-9]*[yYmMdDs]\).*/\1/' )  
    5277    case ${SRF_WriteFrequency} in 
     
    5479            WriteInYears=$( echo ${SRF_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
    5580            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    56             (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears * 86400 )) ;; 
     81            (( SECHIBA_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears * 86400 ))  
     82            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  
     86            fi 
     87            ;; 
    5788        1M) 
     89            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  
     93            fi 
    5894            case ${config_UserChoices_PeriodLength} in 
    5995            *Y|*y) 
     
    70106        *M|*m)  
    71107            WriteInMonths=$( echo ${SRF_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
     108            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  
     112            fi 
    72113            case ${config_UserChoices_PeriodLength} in 
    73114            *Y|*y) 
     
    81122            *) 
    82123                (( SECHIBA_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) * 86400 )) 
     124                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 
     128                fi 
    83129                ;; 
    84130            esac 
    85131            ;; 
    86132        5D|5d)  
    87             (( SECHIBA_WRITE_STEP = 5 * 86400 )) ;; 
     133            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  
     137            fi 
     138            (( SECHIBA_WRITE_STEP = 5 * 86400 ))  
     139            ;; 
    88140        1D|1d)  
    89             (( SECHIBA_WRITE_STEP = 86400 )) ;; 
     141            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  
     145            fi 
     146            (( SECHIBA_WRITE_STEP = 86400 ))  
     147            ;; 
    90148        *s) 
    91149            WriteInSeconds=$( echo ${SRF_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
     150            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  
     154            fi 
    92155            (( SECHIBA_WRITE_STEP = WriteInSeconds )) ;; 
    93156        *)  
     
    96159    esac 
    97160 
     161#Use of XIOS ouputs only 
     162 
     163    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
     164        (( SECHIBA_WRITE_STEP = 0 )) 
     165    fi 
     166 
    98167    ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP} 
    99168    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL} 
     
    102171    if [ X${SRF_ok_hf} = Xy ] ; then 
    103172        ORCHIDEE_sed SECHIBA_HISTFILE2 y 
     173        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 
     177        fi 
    104178    else 
    105179        ORCHIDEE_sed SECHIBA_HISTFILE2 n 
     
    130204 
    131205 
     206    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
     207    # Add include of orchidee context in iodef.xml 
     208    # In iodef.xml add on next line after "COMPONENT CONTEXT" 
     209    #  <context id="orchidee" src="./context_orchidee.xml"/> 
     210        echo '<context id="orchidee" src="./context_orchidee.xml"/>' > add.tmp 
     211        cp iodef.xml iodef.xml.tmp 
     212        sed -e "/COMPONENT CONTEXT/r add.tmp" \ 
     213            iodef.xml.tmp > iodef.xml 
     214        rm iodef.xml.tmp add.tmp 
     215    fi 
     216 
    132217    IGCM_debug_PopStack "SRF_Update" 
    133218} 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/stomate.driver

    r1692 r2300  
    2020    typeset STOMATE_WRITE_STEP 
    2121 
     22    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.  
     25    fi    
    2226    case ${config_SBG_WriteFrequency} in 
    2327        *Y|*y)  
    2428            WriteInYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' ) 
    2529            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' ) 
    26             (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears )) ;; 
     30            (( STOMATE_WRITE_STEP = PeriodLengthInDays * WriteInYears / PeriodLengthInYears ))  
     31            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  
     38 
     39            fi 
     40            ;; 
    2741        1M|1m)  
     42            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  
     49            fi 
    2850            case ${config_UserChoices_PeriodLength} in 
    2951            *Y|*y) 
     
    3961        *M|*m)  
    4062            WriteInMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' ) 
     63            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  
     70            fi 
    4171            case ${config_UserChoices_PeriodLength} in 
    4272            *Y|*y) 
     
    4979                ;; 
    5080            *) 
    51                 (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) )) ;; 
     81                (( STOMATE_WRITE_STEP = $( IGCM_date_DaysInMonth $year $month ) ))  
     82                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 
     89                fi 
     90                ;; 
    5291            esac 
    5392            ;; 
    5493        5D|5d)  
    55             (( STOMATE_WRITE_STEP = 5 )) ;; 
     94            (( STOMATE_WRITE_STEP = 5 )) 
     95            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  
     102            fi 
     103            ;; 
    56104        1D|1d)  
    57             (( STOMATE_WRITE_STEP = 1 )) ;; 
     105            (( STOMATE_WRITE_STEP = 1 ))  
     106            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  
     113            fi 
     114            ;; 
    58115        *s) 
    59116            WriteInSeconds=$( echo ${config_SBG_WriteFrequency} | awk -F '[s]' '{print $1}' ) 
     117            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  
     124            fi 
    60125            (( STOMATE_WRITE_STEP = 1 )) ;; 
    61126        *)  
     
    65130 
    66131    ORCHIDEE_sed STOMATE_OK_STOMATE y 
     132 
     133#Use of XIOS library only 
     134 
     135    if [ X${orchidee_UserChoices_XIOS} = Xy ] ; then 
     136        (( STOMATE_WRITE_STEP = 0 )) 
     137    fi 
    67138 
    68139    ORCHIDEE_sed STOMATE_HIST_DT ${STOMATE_WRITE_STEP} 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/xios.driver

    r2270 r2300  
    11#!/bin/ksh 
     2 
     3function 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     
     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 
     19    return $RET 
     20} 
    221 
    322#----------------------------------- 
     
    1736 
    1837    echo UPDATE IOS !!! 
    19  
    20     sed -e 's/<variable id="using_server"              type="boolean">false/<variable id="using_server" type="boolean">true/' iodef.xml > iodef.xml.tmp 
    21     IGCM_sys_Mv iodef.xml.tmp iodef.xml 
     38# Activate server mode 
     39    XIOS_sed_xml iodef.xml using_server true 
     40# If lmdz_UserChoices_XIOS=y add LMDZ as component id : 
     41    if [ X${lmdz_UserChoices_XIOS}  = Xy ] ; then 
     42        XIOS_sed_xml iodef.xml oasis_codes_id LMDZ,oceanx 
     43    fi  
    2244    if [ -f namcouple ] ; then 
    2345        sed -e "s/2  LMDZ oceanx/3 LMDZ oceanx ${config_Executable_IOS[1]}/" namcouple > namcouple.tmp  
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_CWRR

    r2019 r2300  
    891891# default = n 
    892892 
    893 #************************************************************************** 
     893# Flag to activate XIOS as output library 
     894XIOS_ORCHIDEE_OK = n 
     895 
     896#************************************************************************** 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_Choi

    r2018 r2300  
    891891# default = n 
    892892 
    893 #************************************************************************** 
     893# Flag to activate XIOS as output library 
     894XIOS_ORCHIDEE_OK = n 
     895 
     896#************************************************************************** 
Note: See TracChangeset for help on using the changeset viewer.