Changeset 2093


Ignore:
Timestamp:
06/27/13 17:53:03 (8 years ago)
Author:
aclsce
Message:
  • Modified name of output files created by NEMOGCM (*.card, iodef.xml)
  • Added geo2ocean and arch.fcm specific to IPSLCM6 for Curie in IPSL SOURCES/NEMO directory
  • Removed iom.f90 and sbccpl.f90 from SOURCES/NEMO directory : not needed anymore thanks to the commit.
  • Modified NEMO namelist and namcouple file to have coherency with IPSLCM5A coupling interface
  • Put jpni,j,nij in NEMO namelist to have vertical decomposition (horizontal one by default)
  • ln_presatm = .false. in NEMO namelist
  • some cleaning in configuration files (removed files related to 96x71 and 56x55 resolution
Location:
CONFIG/UNIFORM/v6/IPSLCM6
Files:
2 added
6 deleted
9 edited

Legend:

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

    r2090 r2093  
    9898 
    9999orca2: ../../modeles/NEMOGCM/CONFIG 
    100         (cd ../../modeles/NEMOGCM/CONFIG; ./makenemo -m ${FCM_ARCH} -n ORCA2_LIM_PISCES -e "$(MYSRC_DIR)/SOURCES/NEMO" -j16 add_key "key_lim2_vp key_coupled key_oasis3 key_diahth" ; cp ORCA2_LIM_PISCES/BLD/bin/nemo.exe ../../../bin/opa ; ) 
     100        (cd ../../modeles/NEMOGCM/CONFIG; cp ../../../config/IPSLCM6/SOURCES/NEMO/arch-${FCM_ARCH}.fcm ../ARCH/. ; ./makenemo -m ${FCM_ARCH} -n ORCA2_LIM_PISCES -e "$(MYSRC_DIR)/SOURCES/NEMO" -j16 add_key "key_lim2_vp key_coupled key_oasis3 key_diahth" ; cp ORCA2_LIM_PISCES/BLD/bin/nemo.exe ../../../bin/opa ; ) 
    101101 
    102102orca2nopisces: ../../modeles/NEMOGCM/CONFIG 
    103         (cd ../../modeles/NEMOGCM/CONFIG; ./makenemo -m ${FCM_ARCH} -n ORCA2_LIM -e "$(MYSRC_DIR)/SOURCES/NEMO" -j16 add_key "key_lim2_vp key_coupled key_oasis3 key_diahth" ; cp ORCA2_LIM/BLD/bin/nemo.exe ../../../bin/opa ; ) 
     103        (cd ../../modeles/NEMOGCM/CONFIG; cp ../../../config/IPSLCM6/SOURCES/NEMO/arch-${FCM_ARCH}.fcm ../ARCH/. ; ./makenemo -m ${FCM_ARCH} -n ORCA2_LIM -e "$(MYSRC_DIR)/SOURCES/NEMO" -j16 add_key "key_lim2_vp key_coupled key_oasis3 key_diahth" ; cp ORCA2_LIM/BLD/bin/nemo.exe ../../../bin/opa ; ) 
    104104 
    105105verif: ../../bin 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lim2.card

    r1549 r2093  
    2424 
    2525[OutputFiles] 
    26 List=   (ORCA2_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod), \ 
    27         (ORCA2_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, Post_1D_icemod) 
     26List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod), \ 
     27        (${config_UserChoices_JobName}_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, Post_1D_icemod) 
    2828 
    2929[Post_1M_icemod] 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

    r2085 r2093  
    5252[OutputFiles] 
    5353List=   (mesh_mask.nc      , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc, NONE),\ 
    54         (ORCA2_1y_scalar.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_scalar.nc, Post_1Y_scalar),\ 
    55         (ORCA2_1y_grid_T.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_T.nc, Post_1Y_grid_T),\ 
    56         (ORCA2_1y_grid_U.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_U.nc, Post_1Y_grid_U),\ 
    57         (ORCA2_1y_grid_V.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc, Post_1Y_grid_V),\ 
    58         (ORCA2_1y_grid_W.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc, Post_1Y_grid_W),\ 
    59         (ORCA2_1m_scalar.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc, Post_1M_scalar),\ 
    60         (ORCA2_1m_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc, Post_1M_grid_T),\ 
    61         (ORCA2_1m_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc, Post_1M_grid_U),\ 
    62         (ORCA2_1m_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc, Post_1M_grid_V),\ 
    63         (ORCA2_1m_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc, Post_1M_grid_W),\ 
    64         (ORCA2_1d_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc, Post_1D_grid_T),\ 
    65         (ORCA2_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\ 
    66         (ORCA2_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\ 
     54        (${config_UserChoices_JobName}_1y_scalar.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_scalar.nc, Post_1Y_scalar),\ 
     55        (${config_UserChoices_JobName}_1y_grid_T.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_T.nc, Post_1Y_grid_T),\ 
     56        (${config_UserChoices_JobName}_1y_grid_U.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_U.nc, Post_1Y_grid_U),\ 
     57        (${config_UserChoices_JobName}_1y_grid_V.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc, Post_1Y_grid_V),\ 
     58        (${config_UserChoices_JobName}_1y_grid_W.nc, ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc, Post_1Y_grid_W),\ 
     59        (${config_UserChoices_JobName}_1m_scalar.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc, Post_1M_scalar),\ 
     60        (${config_UserChoices_JobName}_1m_grid_T.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc, Post_1M_grid_T),\ 
     61        (${config_UserChoices_JobName}_1m_grid_U.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc, Post_1M_grid_U),\ 
     62        (${config_UserChoices_JobName}_1m_grid_V.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc, Post_1M_grid_V),\ 
     63        (${config_UserChoices_JobName}_1m_grid_W.nc, ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc, Post_1M_grid_W),\ 
     64        (${config_UserChoices_JobName}_1d_grid_T.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc, Post_1D_grid_T),\ 
     65        (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\ 
     66        (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\ 
    6767        (${PREFIX_NWRITE}_${DATE_OPA}_diaptr.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_diaptr.nc, Post_1M_diaptr),\ 
    6868        (damping.coeff.nc , ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc, NONE),\ 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/pisces.card

    r2082 r2093  
    4040 
    4141[OutputFiles] 
    42 List=   (ORCA2_1m_ptrc_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_ptrc_T.nc, Post_1M_ptrc_T), \ 
    43         (ORCA2_1m_diad_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc, Post_1M_diad_T), \ 
    44         (ORCA2_1m_dbio_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_dbio_T.nc, Post_1M_dbio_T) 
     42List=   (${config_UserChoices_JobName}_1m_ptrc_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_ptrc_T.nc, Post_1M_ptrc_T), \ 
     43        (${config_UserChoices_JobName}_1m_diad_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc, Post_1M_diad_T), \ 
     44        (${config_UserChoices_JobName}_1m_dbio_T.nc, ${R_OUT_MBG_O_M}/${PREFIX}_1M_dbio_T.nc, Post_1M_dbio_T) 
    4545 
    4646[Post_1M_ptrc_T] 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/field_def.xml

    r2061 r2093  
    6565         <field id="taum"         long_name="wind stress module"                                           unit="N/m2"     /> 
    6666         <field id="wspd"         long_name="Wind speed module at 10 m"                                    unit="m/s"      /> 
    67           
     67         <field id="fmmflx"       long_name="Freezing-melting water flux"                                  unit="Kg/m2/s" />  
    6868         <!-- * variable relative to atmospheric pressure forcing : available with ln_apr_dyn --> 
    6969         <field id="ssh_ib"       long_name="Inverse barometer sea surface height"                         unit="m"        /> 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/iodef.xml

    r2083 r2093  
    2121    --> 
    2222     
    23     <file_definition type="multiple_file" sync_freq="1d" min_digits="4"> 
     23    <file_definition type="multiple_file" name="@expname@_@freq@" sync_freq="1d" min_digits="4"> 
    2424     
    2525      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".FALSE."/> <!-- 1h files --> 
     
    2727      <file_group id="1d" output_freq="1d"  output_level="10" enabled="_1D_ENABLE_"> <!-- 1d files --> 
    2828 
    29         <file id="1d_grid_T" name="auto" description="ocean T grid variables" > 
     29        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
    3030          <field field_ref="sst"          name="sosstsst"  /> 
    3131          <field field_ref="sss"          name="sosaline"  /> 
     
    4444        </file> 
    4545 
    46         <file id="1d_grid_U" name="auto" description="ocean U grid variables" > 
     46        <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" > 
    4747          <field field_ref="uoce"         name="vozocrtx"  /> 
    4848          <field field_ref="uoce_eiv"     name="vozoeivu"  /> 
     
    5050        </file> 
    5151         
    52         <file id="1d_grid_V" name="auto" description="ocean V grid variables" > 
     52        <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" > 
    5353          <field field_ref="voce"         name="vomecrty"  /> 
    5454          <field field_ref="voce_eiv"     name="vomeeivv"  /> 
     
    6060      <file_group id="1m" output_freq="1mo" output_level="10" enabled="_1M_ENABLE_"> <!-- real monthly files --> 
    6161 
    62         <file id="1m_grid_T" name="auto" description="ocean T grid variables" > 
     62        <file id="file4" name_suffix="_grid_T" description="ocean T grid variables" > 
    6363          <field field_ref="sst"          name="sosstsst"  /> 
    6464          <field field_ref="sss"          name="sosaline"  /> 
     
    7979        </file> 
    8080 
    81         <file id="1m_grid_U" name="auto" description="ocean U grid variables" > 
     81        <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" > 
    8282          <field field_ref="uoce"         name="vozocrtx"  /> 
    8383          <field field_ref="uoce_eiv"     name="vozoeivu"  /> 
     
    8585        </file> 
    8686         
    87         <file id="1m_grid_V" name="auto" description="ocean V grid variables" > 
     87        <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" > 
    8888          <field field_ref="voce"         name="vomecrty"  /> 
    8989          <field field_ref="voce_eiv"     name="vomeeivv"  /> 
     
    9191        </file> 
    9292 
    93         <file id="1m_ptrc_T" name="auto" description="pisces sms variables" > 
     93        <file id="file7" name_suffix="_ptrc_T" description="pisces sms variables" > 
    9494          <field field_ref="DIC"      /> 
    9595          <field field_ref="Alkalini" /> 
     
    103103        </file> 
    104104         
    105         <file id="1m_diad_T" name="auto" description="additional pisces diagnostics" > 
     105        <file id="file8" name_suffix="_diad_T" description="additional pisces diagnostics" > 
    106106          <field field_ref="Cflx"     /> 
    107107          <field field_ref="Dpco2"    /> 
     
    112112      <file_group id="1y"  output_freq="1y" output_level="10" enabled="_1Y_ENABLE_"> <!-- real yearly files --> 
    113113 
    114         <file id="1y_ptrc_T" name="auto" description="pisces sms variables" > 
     114        <file id="file8" name_suffix="_ptrc_T" description="pisces sms variables" > 
    115115          <field field_ref="DIC"      /> 
    116116          <field field_ref="Alkalini" /> 
     
    139139        </file> 
    140140 
    141         <file id="1y_diad_T" name="auto" description="additional pisces diagnostics" > 
     141        <file id="file9" name_suffix="_diad_T" description="additional pisces diagnostics" > 
    142142          <field field_ref="PH"       /> 
    143143          <field field_ref="CO3"      /> 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namcouple_ORCA2xLMD9695

    r1548 r2093  
    127127# Field 2 : Sea ice extent  (o->a 2) 
    128128# 
    129 OIceFrac SIICECOV 44 86400  5  sstoc.nc <output_mode> 
     129OIceFrc SIICECOV 44 86400  5  sstoc.nc <output_mode> 
    130130torc  tlmd   LAG=5760 
    131131P  2 P  0 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_ORCA2

    r2062 r2093  
    246246sn_snd_alb    =       'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   '' 
    247247sn_snd_thick  =       'none'                 ,    'no'   ,     ''      ,         ''           ,   '' 
    248 sn_snd_crt    =       'none'                 ,    'no'    , 'spherical' , 'eastward-northward' ,  'T' 
     248sn_snd_crt    =       'none'        ,    'no'    , 'cartesian' , 'eastward-northward' ,  'T' 
    249249sn_snd_co2    =       'coupled'              ,    'no'    ,     ''      ,         ''           ,   '' 
    250250! receive 
    251 sn_rcv_w10m   =       'none'                 ,    'no'    ,     ''      ,         ''          ,   '' 
    252 sn_rcv_taumod =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   '' 
    253 sn_rcv_tau    =       'oce only'             ,    'no'    , 'cartesian' , 'eastward-northward',  'U,V' 
     251sn_rcv_w10m   =       'coupled'                 ,    'no'    ,     ''      ,         ''          ,   '' 
     252sn_rcv_taumod =       'none'              ,    'no'    ,     ''      ,         ''          ,   '' 
     253sn_rcv_tau    =       'mixed oce-ice'             ,    'no'    , 'cartesian' , 'eastward-northward',  'U,V' 
    254254sn_rcv_dqnsdt =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   '' 
    255 sn_rcv_qsr    =       'oce and ice'          ,    'no'    ,     ''      ,         ''          ,   '' 
    256 sn_rcv_qns    =       'oce and ice'          ,    'no'    ,     ''      ,         ''          ,   '' 
     255sn_rcv_qsr    =       'conservative'          ,    'no'    ,     ''      ,         ''          ,   '' 
     256sn_rcv_qns    =       'conservative'          ,    'no'    ,     ''      ,         ''          ,   '' 
    257257sn_rcv_emp    =       'conservative'         ,    'no'    ,     ''      ,         ''          ,   '' 
    258258sn_rcv_rnf    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   '' 
     
    824824   nn_buffer   =   0       !  size in bytes of exported buffer ('B' case), 0 no exportation 
    825825   ln_nnogather=  .false.  !  activate code to avoid mpi_allgather use at the northfold 
    826    jpni        =   0       !  jpni   number of processors following i (set automatically if < 1) 
    827    jpnj        =   0       !  jpnj   number of processors following j (set automatically if < 1) 
    828    jpnij       =   0       !  jpnij  number of local domains (set automatically if < 1) 
     826   jpni        =   1       !  jpni   number of processors following i (set automatically if < 1) 
     827   jpnj        =   5       !  jpnj   number of processors following j (set automatically if < 1) 
     828   jpnij       =   5       !  jpnij  number of local domains (set automatically if < 1) 
    829829/ 
    830830!----------------------------------------------------------------------- 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/namelist_pisces_ORCA2

    r2061 r2093  
    3030   cn_dir      = './'     !  root directory for the location of the dynamical files 
    3131! 
    32    ln_presatm  = .true.   ! constant atmopsheric pressure (F) or from a file (T) 
     32   ln_presatm  = .false.   ! constant atmopsheric pressure (F) or from a file (T) 
    3333/ 
    3434!''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' 
Note: See TracChangeset for help on using the changeset viewer.