Changeset 2773


Ignore:
Timestamp:
03/11/16 16:37:24 (8 years ago)
Author:
omamce
Message:

O.M. ORCA_version in config.card

Use orchidee xml file from source dir
User lmdz xml files from SUBMIT_DIR

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

Legend:

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

    r2758 r2773  
    5555 
    5656[InitialStateFiles] 
    57 List=  (${R_IN}/ATM/LMDZ/IPSLCM6/${opa9_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/start.nc   , start.nc    ), \ 
    58        (${R_IN}/ATM/LMDZ/IPSLCM6/${opa9_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/startphy.nc, startphy.nc ) 
     57List=  (${R_IN}/ATM/LMDZ/IPSLCM6/${config_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/start.nc   , start.nc    ), \ 
     58       (${R_IN}/ATM/LMDZ/IPSLCM6/${config_UserChoices_ORCA_version}xLMD${RESOL_ATM_3D}/startphy.nc, startphy.nc ) 
    5959 
    6060[BoundaryFiles] 
     
    101101 
    102102[OutputText] 
    103 List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml,debug.01,lmdz.prt,out_lmdz.x.err, out_lmdz.x.out) 
     103List=   (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,lmdz.prt,out_lmdz.x.err, out_lmdz.x.out) 
    104104 
    105105[OutputFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card

    r2726 r2773  
    88 
    99[InitialStateFiles] 
    10 List=   (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \ 
     10List=   (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \ 
    1111        (/ccc/scratch/cont003/dsm/p86mart/ORCA1_BLD/eORCA1.0xLMD144142/RESTARTS/eORCA1.0xLMD14414279/sstocean_P0_0362x0332_CM6.nc, sstoc.nc) 
    1212 
    1313[BoundaryFiles] 
    1414List=   () 
    15 # ListNonDel= (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/grids.nc, grids.nc ) ,\ 
    16 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/masks.nc, masks.nc ) ,\ 
    17 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/areas.nc, areas.nc ) ,\ 
    18 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_torc_to_tlmd_MOSAIC.nc       , rmp_torc_to_tlmd_MOSAIC.nc        ) ,\ 
    19 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC.nc       , rmp_tlmd_to_torc_MOSAIC.nc        ) ,\ 
    20 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc ) ,\ 
    21 #           (${SCRATCHDIR}/ORCA1_BLD/eORCA1.0xLMD144142/MOZAIC/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc ) 
    22  
    23  
    24  
    25 ListNonDel= (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\ 
    26             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\ 
    27             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\ 
    28             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\ 
    29             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\ 
    30             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\ 
    31             (${R_IN}/CPL/IPSLCM6/${opa9_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc) 
     15ListNonDel= (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\ 
     16            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\ 
     17            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\ 
     18            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_torc_to_tlmd_MOSAIC.nc, rmp_torc_to_tlmd_MOSAIC.nc),\ 
     19            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC.nc, rmp_tlmd_to_torc_MOSAIC.nc),\ 
     20            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_calvin.nc, rmp_tlmd_to_torc_MOSAIC_calvin.nc),\ 
     21            (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/rmp_tlmd_to_torc_MOSAIC_rivflu.nc, rmp_tlmd_to_torc_MOSAIC_rivflu.nc) 
    3222 
    3323[SmoothFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

    r2748 r2773  
    33 
    44[UserChoices] 
    5 ORCA_version=eORCA1.0 
     5ORCA_version=${config_UserChoices_ORCA_version:-eORCA1.1} 
    66mesh_mask=n 
    77iceflx="linear" 
     
    1010OUTPUT_LEVEL=2 
    1111 
    12 V6=/ccc/scratch/cont003/dsm/p86mart/INPUTS_ORCA1_LIM3_PISCES_V6 
    13  
    1412[InitialStateFiles] 
    1513List=   () 
     
    1917ListNonDel= (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/coordinates.nc                     , .  ), \ 
    2018            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/bathy_meter.nc                     , .  ), \ 
    21             (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/runoffs_eORCA1.0_depths.nc         , .  ), \ 
     19            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/runoffs_${opa9_UserChoices_ORCA_version}_depths.nc    , runoffs_eORCA1.0_depths.nc   ), \ 
    2220            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/ahmcoef.nc                         , .  ), \ 
    2321            (${R_IN}/OCE/IPSLCM6/${opa9_UserChoices_ORCA_version}/mask_itf.nc                        , .  ), \ 
     
    7068        (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\ 
    7169        (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\ 
     70        (${config_UserChoices_JobName}_1ts_grid_T.nc,${R_OUT_OCE_O_D}/${PREFIX}_1TS_grid_T.nc, NONE),\ 
    7271        (damping.coeff.nc , ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc, NONE),\ 
    7372        (output.abort.nc  , ${R_OUT_OCE_D}/${PREFIX}_output.abort.nc, NONE),\ 
     
    8887Patches = () 
    8988GatherWithInternal = (nav_lon, nav_lat, deptht, time_instant, time_counter, time_centered, time_centered_bounds) 
    90 TimeSeriesVars2D = (zos, zossq, tos, sos, tossq, omlmax, mldkz5, mldr10_1, nshfls, rsntds, rsds, friver, wfo, hc300) 
     89TimeSeriesVars2D = (zos, zossq, tos, sos, tossq, omlmax, mldkz5, mldr10_1, nshfls, rsntds, rsds, friver, hc300) 
    9190ChunckJob2D = NONE 
    9291TimeSeriesVars3D = (e3t, thetao, so) 
     
    173172Patches = () 
    174173GatherWithInternal = (nav_lon, nav_lat, deptht, time_counter, time_centered, time_centered_bounds) 
    175 TimeSeriesVars2D = ( wfo, friver ) 
     174TimeSeriesVars2D = ( ) 
    176175ChunckJob2D = NONE 
    177176TimeSeriesVars3D = (thetao, so) 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/orchidee.card

    r2758 r2773  
    2828[ParametersFiles] 
    2929List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
    30         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
     30        (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    3131        (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    32         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     32        (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) ,\ 
     33        (${R_IN}/SRF/soils_param.nc,        . ), \ 
     34        (${R_IN}/SRF/routing.nc,            . ), \ 
     35        (${R_IN}/SRF/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_2000.nc, PFTmap.nc), \ 
     36        (${R_IN}/SRF/cartepente2d_15min.nc, .), \ 
     37        (${R_IN}/SRF/albedo/alb_bg_jrctip.nc                       , .) 
    3338 
    3439[RestartFiles] 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/opa9.driver

    r2768 r2773  
    4444    (( DaysSinceJC = $( IGCM_date_DaysSinceJC ${DateBegin} ) + 1 )) 
    4545 
    46     # Parallelism 
    47     OCE_PROC_MPI=$(echo ${config_Executable_OCE[2]} | sed s'/MPI//' ) 
    48     OPA_JPNI=$(supergrep jpni  ${NAMELIST_OPA_CFG} ) 
    49     OPA_JPNJ=$(supergrep jpnj  ${NAMELIST_OPA_CFG} ) 
    50     IGCM_debug_Print 1 " " 
    51     IGCM_debug_Print 1 "Readed OPA_JPNI  ${OPA_JPNI}" 
    52     IGCM_debug_Print 1 "Readed OPA_JPNJ  ${OPA_JPNJ}" 
    53     IGCM_debug_Print 1 "OCE_PROC_MPI  ${OCE_PROC_MPI}" 
    54  
    55     (( Residu = OCE_PROC_MPI % OPA_JPNJ )) 
    56     if [[ ${Residu} != 0 ]] ; then 
    57         IGCM_debug_Exit "OCE_PROC_MPI (specified in config.card, [Executable]) is not a multiple of OPA_JPNJ" 
    58         #IGCM_debug_Verif_Exit 
    59     fi 
    60      
    61     (( OPA_JPNI  = OCE_PROC_MPI / OPA_JPNJ )) 
    62     (( OPA_JPNIJ = OPA_JPNI * OPA_JPNJ     )) 
    63     IGCM_debug_Print 1 "Computed OPA_JPNI   ${OPA_JPNI}" 
    64     IGCM_debug_Print 1 "Computed OPA_JPNIJ  ${OPA_JPNIJ}" 
    65  
    66     if [[ ${OCE_PROC_MPI} != ${OPA_JPNIJ} ]] ; then 
    67         IGCM_debug_Exit "OCE_PROC_MPI /= OPA_JPNI * OPA_JPNJ" 
    68         IGCM_debug_Verif_Exit 
    69     fi   
    70  
    71     # 
    7246    IGCM_debug_Print 1 " " 
    7347    IGCM_debug_Print 1 "OPA_RDT        ${OPA_RDT}" 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo.xml

    r2768 r2773  
    1010<file_definition type="one_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4"> 
    1111   
    12   <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 
    13  
     12  <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".FALSE."> <!-- 1 time step files --> 
     13    <file id="file51" name_suffix="_grid_T" description="ocean T grid variables" > 
     14      <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       /> 
     15      <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          /> 
     16      <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                /> 
     17      <field field_ref="mldkz5"       /> 
     18      <field field_ref="mldr10_1"     /> 
     19      <field field_ref="ssu"          name="uos"     long_name="sea_surface_x_velocity"    /> 
     20      <field field_ref="ssv"          name="vos"     long_name="sea_surface_y_velocity"    /> 
     21 
     22    </file> 
     23    <file id="file52" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc --> 
     24      <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     /> 
     25      <field field_ref="qsr_oce"      name="qsr_oce"  long_name="downward shortwave flux at ocean surface"           /> 
     26      <field field_ref="qns_oce"      name="qns_oce"  long_name="downward non solar flux at ocean surface"           /> 
     27      <field field_ref="qt_oce"       name="qt_oce"   long_name="downward total flux at ocean surface"           /> 
     28      <field field_ref="qsr_ice"      name="qsr_ice"  long_name="downward shortwave flux at ice surface"           /> 
     29      <field field_ref="qns_ice"      name="qns_ice"  long_name="downward non solar flux at ice surface"           /> 
     30      <field field_ref="qtr_ice"      name="qtr_ice"  long_name="shortwave flux transmitted thru the ice"           /> 
     31      <field field_ref="qt_ice"       name="qt_ice"   long_name="downward total flux at ice surface"           /> 
     32      <field field_ref="saltflx"      name="sfx"  /> 
     33      <field field_ref="taum"         name="taum" /> 
     34      <field field_ref="wspd"         name="windsp"  /> 
     35      <field field_ref="precip"       name="precip" /> 
     36      <!-- ice and snow --> 
     37      <field field_ref="snowpre"      /> 
     38      <field field_ref="utau_ice"         name="utau_ice" /> 
     39      <field field_ref="vtau_ice"         name="vtau_ice" /> 
     40      <field field_ref="snowthic_cea"     name="snthic"     long_name="surface_snow_thickness"   /> 
     41      <field field_ref="icethic_cea"      name="sithic"     long_name="sea_ice_thickness"        /> 
     42      <field field_ref="uice_ipa"         name="sivelu" /> 
     43      <field field_ref="vice_ipa"         name="sivelv" /> 
     44      <field field_ref="icevolu"          name="sivolu"  /> 
     45      <field field_ref="snowvol"          name="snvolu"  /> 
     46      <field field_ref="iiceconc"         name="siconc"  /> 
     47    </file> 
     48  </file_group> 
     49    
    1450  <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files --> 
    1551 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_ORCA1_cfg

    r2754 r2773  
    361361   ln_nnogather=  .false.  ! 
    362362   jpni        =   12      !  jpni   number of processors following i (set automatically if < 1) 
    363    jpnj        =   16      !  jpnj   number of processors following j (set automatically if < 1) 
    364    jpnij       =   -1      !  jpnij  number of local domains (set automatically if < 1) 
     363   jpnj        =   15      !  jpnj   number of processors following j (set automatically if < 1) 
     364   jpnij       =    -1     !  jpnij  number of local domains (set automatically if < 1) 
    365365/ 
    366366!----------------------------------------------------------------------- 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_CWRR

    r2772 r2773  
    5353SECHIBA_QSINT = 0.02 
    5454 
     55# Parmeters related toalbedo 
     56#************************************************************************** 
     57ALB_BG_MODIS=y 
     58 
    5559# Parmeters related to vegetation map 
    5660#************************************************************************** 
Note: See TracChangeset for help on using the changeset viewer.