Changeset 3378


Ignore:
Timestamp:
09/20/17 16:09:25 (4 years ago)
Author:
jgipsl
Message:

Preparing for IPSLCM6.0.13: Added new input file file_def_input_orchidee.xml needed for ORCHIDEE trunk revision 4577 and later. This modification can not be used with older versions of ORCHIDEE because the file did not exist.

Some homogenization of empty space between orchidee.card.

Location:
CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/historical/COMP/orchidee.card

    r3300 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ), \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    18         (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     18        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1919 
    2020[BoundaryFiles] 
     
    2828List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    2929        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     30        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3031        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3536 
    3637[OutputText] 
    37 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     38List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3839 
    3940[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/orchidee.card

    r3300 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ), \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    1818        (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_2000_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\ 
    19         (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     19        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    2020 
    2121[BoundaryFiles] 
     
    2929List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    3030        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     31        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3233        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3637 
    3738[OutputText] 
    38 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     39List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3940 
    4041[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card

    r3300 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ), \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    1818        (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_1850_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\ 
    19         (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     19        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    2020 
    2121[BoundaryFiles] 
     
    2929List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    3030        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     31        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3233        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3637 
    3738[OutputText] 
    38 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     39List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3940 
    4041[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r3288 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ),            \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    1818        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    1919 
    2020[BoundaryFiles] 
    21 List=(${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_${year}_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc) 
     21List= (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_${year}_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc) 
    2222ListNonDel= () 
    2323 
     
    2828List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    2929        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     30        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3031        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3536 
    3637[OutputText] 
    37 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     38List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3839 
    3940[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/LMDZOR/clim_360d/COMP/orchidee.card

    r3288 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ),            \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    1818        (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_2000_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\ 
    19         (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     19        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    2020 
    2121[BoundaryFiles] 
     
    2929List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    3030        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     31        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3233        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3637 
    3738[OutputText] 
    38 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     39List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3940 
    4041[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r3288 r3378  
    1212 
    1313[InitialStateFiles] 
    14 List=   (${R_IN}/SRF/soils_param.nc,        . ), \ 
    15         (${R_IN}/SRF/reftemp.nc,. ),            \ 
    16         (${R_IN}/SRF/routing.nc,            . ), \ 
     14List=   (${R_IN}/SRF/soils_param.nc, . ), \ 
     15        (${R_IN}/SRF/reftemp.nc, . ), \ 
     16        (${R_IN}/SRF/routing.nc, . ), \ 
    1717        (${R_IN}/SRF/albedo/alb_bg_modisopt_2D_ESA_v2.nc, alb_bg.nc ), \ 
    1818        (${R_IN}/SRF/PFTMAPS/CMIP6/ESA-LUH2/historical/v1.2/withoutNoBio/13PFTmap_2000_ESA_LUH2v2h_withoutNoBio_v1.2.nc, PFTmap.nc),\ 
    19         (${R_IN}/SRF/cartepente2d_15min.nc, .) 
     19        (${R_IN}/SRF/cartepente2d_15min.nc, .) 
    2020 
    2121[BoundaryFiles] 
     
    2929List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    3030        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     31        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_input_orchidee.xml, .) ,\ 
    3132        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    3233        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     
    3637 
    3738[OutputText] 
    38 List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, river_desc.nc) 
     39List=   (out_orchidee, orchidee.def, used_orchidee.def, iodef.xml, context_orchidee.xml, field_def_orchidee.xml, file_def_orchidee.xml, file_def_input_orchidee.xml, river_desc.nc) 
    3940 
    4041[OutputFiles] 
Note: See TracChangeset for help on using the changeset viewer.