Changeset 4190


Ignore:
Timestamp:
12/13/18 11:56:52 (22 months ago)
Author:
jgipsl
Message:

Now take xml files for DYNAMICO from folder modeles/DYNAMICO/xml. The configuration, icluding previous commit [4189] can only be used with DYANMICO/trunk rev 793 or later.

Location:
CONFIG/UNIFORM/v7/ICOLMDZOR_v7
Files:
4 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/EXPERIMENTS/DYNAMICO_LMDZ/clim_noleap/COMP/dynamicolmdz.card

    r4180 r4190  
    3434        (${SUBMIT_DIR}/PARAM/vert.def_L${RESOL_LLM}, vert.def),\ 
    3535        (${SUBMIT_DIR}/PARAM/iodef.xml, .),\ 
    36         (${SUBMIT_DIR}/PARAM/icosa.xml, .),\ 
    37         (${SUBMIT_DIR}/PARAM/field_def.xml, .),\ 
    38         (${SUBMIT_DIR}/PARAM/filedef_dcmip2016.xml, .),\ 
    39         (${SUBMIT_DIR}/PARAM/filedef_debug.xml, .),\ 
     36        (${MODIPSL}/modeles/DYNAMICO/xml/context_dynamico.xml, .),\ 
     37        (${MODIPSL}/modeles/DYNAMICO/xml/field_def_dynamico.xml, .),\ 
     38        (${MODIPSL}/modeles/DYNAMICO/xml/file_def_dynamico.xml, .),\ 
    4039        (${MODIPSL}/modeles/LMDZ5/DefLists/context_lmdz.xml, .),\ 
    4140        (${MODIPSL}/modeles/LMDZ5/DefLists/field_def_lmdz.xml, .),\ 
     
    6059 
    6160[OutputText] 
    62 List=   (config.def, earth_const.def, physiq.def, run.def, run_icosa.def, start.def, traceur.def, vert.def, context_lmdz.xml, file_def_histLES_lmdz.xml, file_def_histday_lmdz.xml, file_def_histhf_lmdz.xml, file_def_histmthNMC_lmdz.xml, filedef_dcmip2016.xml, iodef.xml, field_def.xml, file_def_histdayCOSP_lmdz.xml, file_def_histhfCOSP_lmdz.xml, file_def_histins_lmdz.xml, file_def_histmth_lmdz.xml, filedef_debug.xml, field_def_lmdz.xml, file_def_histdayNMC_lmdz.xml, file_def_histhfNMC_lmdz.xml, file_def_histmthCOSP_lmdz.xml,file_def_histstn_lmdz.xml,  icosa.xml, out_icosa_lmdz.exe.out*, out_icosa_lmdz.exe.err*, xios_client_*) 
     61List=   (config.def, earth_const.def, physiq.def, run.def, run_icosa.def, start.def, traceur.def, vert.def, context_lmdz.xml, file_def_histLES_lmdz.xml, file_def_histday_lmdz.xml, file_def_histhf_lmdz.xml, file_def_histmthNMC_lmdz.xml, iodef.xml, context_dynmico.xml, field_def_dynamico.xml, file_def_dynamico.xml, file_def_histdayCOSP_lmdz.xml, file_def_histhfCOSP_lmdz.xml, file_def_histins_lmdz.xml, file_def_histmth_lmdz.xml, field_def_lmdz.xml, file_def_histdayNMC_lmdz.xml, file_def_histhfNMC_lmdz.xml, file_def_histmthCOSP_lmdz.xml,file_def_histstn_lmdz.xml, out_icosa_lmdz.exe.out*, out_icosa_lmdz.exe.err*, xios_client_*) 
    6362 
    6463 
     
    7473        (histhfNMC.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhfNMC.nc,     NONE),                  \ 
    7574        (histhf3h.nc,      ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3h.nc,      NONE),                  \ 
    76         (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE) 
     75        (histhf3hm.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_3H_histhf3hm.nc,     NONE),                  \ 
     76        (output_dcmip2016_native.nc,    ${R_OUT_ATM_O_H}/${PREFIX}_3H_output_dcmip2016_native.nc,     NONE), \ 
     77        (output_dcmip2016_regular.nc,   ${R_OUT_ATM_O_H}/${PREFIX}_3H_output_dcmip2016_regular.nc,    NONE) 
    7778 
    7879 
  • CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/dynamicolmdz.driver

    r4180 r4190  
    8888    fi 
    8989 
     90 
     91 
     92    # Add include of context xml files for LMDZ and DYNAMICO in iodef.xml 
     93    # In iodef.xml add on the next line after "COMPONENT CONTEXT" 
     94    echo '<context id="LMDZ" src="./context_lmdz.xml"/>' > add.tmp 
     95    echo '<context id="icosagcm" src="./context_dynamico.xml"/>' >> add.tmp 
     96 
     97    # Add inclusion of file context_input_lmdz.xml if this file exists 
     98    if [ -f context_input_lmdz.xml ] ; then 
     99        echo '<context id="LMDZ" src="./context_input_lmdz.xml"/>' >> add.tmp 
     100    fi 
     101    # Add inclusion of file context_input_dynamico.xml if this file exists 
     102    if [ -f context_input_dynamico.xml ] ; then 
     103        echo '<context id="icosagcm" src="./context_input_dynamico.xml"/>' >> add.tmp 
     104    fi 
     105 
     106 
     107    # Include xml files for output configuration if running with workflow CMIP6 
     108    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then 
     109      echo '<context id="LMDZ" src="./ping_lmdz.xml"/>' >> add.tmp 
     110      echo '<context id="LMDZ" src="./dr2xml_lmdz.xml"/>' >> add.tmp 
     111    fi 
     112    cp iodef.xml iodef.xml.tmp 
     113    sed -e "/COMPONENT CONTEXT/r add.tmp" iodef.xml.tmp > iodef.xml 
     114    rm iodef.xml.tmp add.tmp 
     115 
     116    # Add a Long Name as global attribute in output files if LongName is set in config.card 
     117    if [ ! "X${config_UserChoices_LongName}" = "X" ] ; then 
     118      listfile=$(ls file_def*lmdz.xml) 
     119      echo "<variable id=\"LongName\" type=\"string\">${config_UserChoices_LongName}</variable>" > add.tmp 
     120      for file in ${listfile} ; do 
     121          cp ${file} ${file}.tmp 
     122          sed -e "/<file id/r add.tmp" \ 
     123          ${file}.tmp > ${file} 
     124          rm ${file}.tmp  
     125      done 
     126      rm add.tmp 
     127    fi 
     128 
     129 
    90130    IGCM_debug_PopStack "ATM_Update" 
    91131} 
Note: See TracChangeset for help on using the changeset viewer.