Changeset 3219


Ignore:
Timestamp:
04/26/17 11:39:50 (4 years ago)
Author:
flavoni
Message:

update for trunk of NEMO_v7_dev

Location:
CONFIG/UNIFORM/v6/NEMO_v7_dev
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/lim3.card

    r3186 r3219  
    1515 
    1616[ParametersFiles] 
    17 List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref , namelist_ice_ref ), \ 
    18         (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_cfg             , namelist_ice_cfg ), \ 
    19         (${SUBMIT_DIR}/PARAM/file_def_nemo-lim3.xml                  , file_def_nemo-lim.xml   ), \ 
    20         (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/field_def_nemo-lim.xml                  , field_def_nemo-lim.xml   ) 
     17List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref    , namelist_ice_ref ), \ 
     18        (${SUBMIT_DIR}/PARAM/namelist_lim3_${RESOL_OCE}_cfg                , namelist_ice_cfg ), \ 
     19        (${SUBMIT_DIR}/PARAM/file_def_nemo-lim3.xml                        , file_def_nemo-lim3.xml   ), \ 
     20        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml   , field_def_nemo-lim.xml   ) 
    2121 
    2222 
     
    2828 
    2929[OutputFiles] 
    30 List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod ), \ 
    31         (${config_UserChoices_JobName}_1d_icemod.nc, ${R_OUT_ICE_O_D}/${PREFIX}_1D_icemod.nc, Post_1D_icemod ) 
     30List=   (${config_UserChoices_JobName}_1m_icemod.nc, ${R_OUT_ICE_O_M}/${PREFIX}_1M_icemod.nc, Post_1M_icemod ) 
    3231 
    3332[Post_1M_icemod] 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/opa9.card

    r3186 r3219  
    88#-- related to NEMO_tag_revision (nemo_v3, nemo_v3_1, nemo_v3_2_beta) 
    99#-- NOTE: if you use COMMON ACCOUNT you have to de-comment it 
    10 OPA_version=v4_0_alpha 
     10#OPA_version=v4_0_alpha 
    1111R_FORCING=${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version} 
    12 mesh_mask=y 
     12mesh_mask= n 
    1313#============================================================== 
    1414 
     
    1818 
    1919[BoundaryFiles] 
    20 List=   (${opa9_UserChoices_R_FORCING}/u_10.15JUNE2009_fill.nc            , u_10.nc), \ 
    21         (${opa9_UserChoices_R_FORCING}/v_10.15JUNE2009_fill.nc            , v_10.nc), \ 
    22         (${opa9_UserChoices_R_FORCING}/t_10.15JUNE2009_fill.nc            , t_10.nc), \ 
    23         (${opa9_UserChoices_R_FORCING}/q_10.15JUNE2009_fill.nc            , q_10.nc), \ 
    24         (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        , radsw.nc), \ 
    25         (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        , radlw.nc), \ 
    26         (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     , precip.nc), \ 
    27         (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     , snow.nc), \ 
    28         (${opa9_UserChoices_R_FORCING}/slp.15JUNE2009_fill.nc             , slp.15JUNE2009_fill.nc), \ 
    29         (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bilinear_noc.nc , weights_core_orca2_bilinear_noc.nc), \ 
    30         (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bicubic_noc.nc  , weights_core_orca2_bicubic_noc.nc) 
     20List=   (${opa9_UserChoices_R_FORCING}/u_10.15JUNE2009_fill.nc            ,         .), \ 
     21        (${opa9_UserChoices_R_FORCING}/v_10.15JUNE2009_fill.nc            ,         .), \ 
     22        (${opa9_UserChoices_R_FORCING}/t_10.15JUNE2009_fill.nc            ,         .), \ 
     23        (${opa9_UserChoices_R_FORCING}/q_10.15JUNE2009_fill.nc            ,         .), \ 
     24        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        ,         .), \ 
     25        (${opa9_UserChoices_R_FORCING}/ncar_rad.15JUNE2009_fill.nc        ,         .), \ 
     26        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     ,         .), \ 
     27        (${opa9_UserChoices_R_FORCING}/ncar_precip.15JUNE2009_fill.nc     ,         .), \ 
     28        (${opa9_UserChoices_R_FORCING}/slp.15JUNE2009_fill.nc             ,         .), \ 
     29        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bilinear_noc.nc ,         .), \ 
     30        (${opa9_UserChoices_R_FORCING}/weights_core_orca2_bicubic_noc.nc  ,         .) 
    3131 
    3232ListNonDel= (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/ahmcoef.nc, .), \ 
    33             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/bathy_level.nc, .), \ 
    34             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/bathy_meter.nc, .), \ 
    35             (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/coordinates.nc, .), \ 
     33            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/ORCA_R2_zps_domcfg.nc, .), \ 
    3634            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/potT_PHC3WOA_ORCA2_IOVI.nc, data_1m_potential_temperature_nomask.nc), \ 
    3735            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/Salt_corr_PHC3WOA09.nc, data_1m_salinity_nomask.nc), \ 
     
    5048            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/M2rowdrg.nc, .),\ 
    5149            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/mask_itf.nc, .),\ 
     50            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/eddy_viscosity_2D.nc, .),\ 
     51            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/eddy_viscosity_3D.nc, .),\ 
     52            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/calving.nc, .)     ,\ 
    5253            (${R_BC}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_OPA_version}/resto.nc, .) 
    5354 
     
    5657List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_ref                            , namelist_ref           ), \ 
    5758        (${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}${EXPTYPE}_cfg                          , namelist_cfg           ), \ 
    58         (${SUBMIT_DIR}/PARAM/file_def_${RESOL_OCE}${EXPTYPE}_cfg                          , file_def_nemo-opa.xml  ), \ 
     59        (${SUBMIT_DIR}/PARAM/file_def_nemo-opa.xml                                        , file_def_nemo-opa.xml  ), \ 
    5960        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml                  , field_def_nemo-opa.xml ), \ 
    6061        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/domain_def_nemo.xml                     , domain_def_nemo.xml    ), \ 
    61         (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/context_nemo.xml                        , context_nemo.xml       ), \ 
     62        (${SUBMIT_DIR}/PARAM/context_nemo.xml                                             , context_nemo.xml       ), \ 
    6263        (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml              , iodef.xml              ) 
    6364 
     
    7576        (${config_UserChoices_JobName}_1y_grid_V.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_V.nc     , NONE          ),\ 
    7677        (${config_UserChoices_JobName}_1y_grid_W.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_grid_W.nc     , NONE          ),\ 
    77         (${config_UserChoices_JobName}_1y_diaptr.nc    , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_diaptr.nc     , Post_1Y_diaptr),\ 
    78         (${config_UserChoices_JobName}_1m_scalar.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_scalar.nc     , NONE          ),\ 
     78        (${config_UserChoices_JobName}_1y_SBC.nc       , ${R_OUT_OCE_O_Y}/${PREFIX}_1Y_SBC.nc        , NONE          ),\ 
    7979        (${config_UserChoices_JobName}_1m_grid_T.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_T.nc     , Post_1M_grid_T),\ 
    80         (${config_UserChoices_JobName}_1m_grid_U.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_U.nc     , Post_1M_grid_U),\ 
    81         (${config_UserChoices_JobName}_1m_grid_V.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_V.nc     , Post_1M_grid_V),\ 
    82         (${config_UserChoices_JobName}_1m_grid_W.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_grid_W.nc     , Post_1M_grid_W),\ 
    83         (${config_UserChoices_JobName}_1m_diaptr.nc    , ${R_OUT_OCE_O_M}/${PREFIX}_1M_diaptr.nc     , Post_1M_diaptr),\ 
    8480        (${config_UserChoices_JobName}_5d_grid_T.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_T.nc     , NONE          ),\ 
    85         (${config_UserChoices_JobName}_5d_grid_U.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_U.nc     , NONE          ),\ 
    86         (${config_UserChoices_JobName}_5d_grid_V.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_V.nc     , NONE          ),\ 
    87         (${config_UserChoices_JobName}_5d_grid_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_5D_grid_W.nc     , NONE          ),\ 
    8881        (${config_UserChoices_JobName}_1d_grid_T.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_T.nc     , Post_1D_grid_T),\ 
    89         (${config_UserChoices_JobName}_1d_grid_U.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc     , Post_1D_grid_U),\ 
    90         (${config_UserChoices_JobName}_1d_grid_W.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_W.nc     , NONE          ),\ 
    91         (${config_UserChoices_JobName}_1d_SBC.nc       , ${R_OUT_OCE_O_D}/${PREFIX}_1D_SBC.nc        , NONE          ),\ 
    92         (${config_UserChoices_JobName}_1d_diaptr.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_diaptr.nc     , NONE          ),\ 
    93         (${config_UserChoices_JobName}_1d_scalar.nc    , ${R_OUT_OCE_O_D}/${PREFIX}_1D_scalar.nc     , NONE          ),\ 
    9482        (mesh_mask.nc     , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_mesh_mask.nc                       , NONE),\ 
    9583        (runoffs.nc       , ${R_OUT_OCE_O}/${config_UserChoices_JobName}_runoffs.nc                         , NONE),\ 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/COMP/pisces.card

    r3186 r3219  
    2727 
    2828[ParametersFiles] 
    29 List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_top_ref                          , namelist_top_ref), \ 
    30         (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref                       , namelist_pisces_ref), \ 
    31         (${SUBMIT_DIR}/PARAM/namelist_top_cfg                                               , namelist_top_cfg), \ 
    32         (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}$_cfg                              , namelist_pisces_cfg), \ 
    33         (${SUBMIT_DIR}/PARAM/file_def_nemo-pisces.xml                                       , file_def_nemo-pisces.xml   ), \ 
    34         (${MODIPSL}/modeles/NEMOGCM/CONFIG/ORCA1_LIM3_PISCES/EXP00/field_def_nemo-pisces.xml, field_def_nemo-pisces.xml  ) 
     29List=   (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_top_ref                          , namelist_top_ref          ), \ 
     30        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/namelist_pisces_ref                       , namelist_pisces_ref       ), \ 
     31        (${SUBMIT_DIR}/PARAM/namelist_top_cfg                                               , namelist_top_cfg          ), \ 
     32        (${SUBMIT_DIR}/PARAM/namelist_pisces_${RESOL_OCE}_cfg                               , namelist_pisces_cfg       ), \ 
     33        (${SUBMIT_DIR}/PARAM/file_def_nemo-pisces.xml                                       , file_def_nemo-pisces.xml  ), \ 
     34        (${MODIPSL}/modeles/NEMOGCM/CONFIG/SHARED/field_def_nemo-pisces.xml                 , field_def_nemo-pisces.xml ) 
    3535 
    3636 
     
    4444List=   (${config_UserChoices_JobName}_1y_ptrc_T.nc        , ${R_OUT_MBG_O_Y}/${PREFIX}_1Y_ptrc_T.nc    , Post_1Y_ptrc_T   ) , \ 
    4545        (${config_UserChoices_JobName}_1y_diad_T.nc        , ${R_OUT_MBG_O_Y}/${PREFIX}_1Y_diad_T.nc    , Post_1Y_diad_T   ) , \ 
    46         (${config_UserChoices_JobName}_1m_bioscalar.nc     , ${R_OUT_MBG_O_M}/${PREFIX}_1M_bioscalar.nc , Post_1M_bioscalar) , \ 
    4746        (${config_UserChoices_JobName}_1m_ptrc_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_ptrc_T.nc    , Post_1M_ptrc_T   ) , \ 
    48         (${config_UserChoices_JobName}_1m_diad_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc    , Post_1M_diad_T   ) , \ 
    49         (${config_UserChoices_JobName}_1d_bioscalar.nc     , ${R_OUT_MBG_O_D}/${PREFIX}_1D_bioscalar.nc , Post_1D_bioscalar) 
    50  
     47        (${config_UserChoices_JobName}_1m_diad_T.nc        , ${R_OUT_MBG_O_M}/${PREFIX}_1M_diad_T.nc    , Post_1M_diad_T   )  
    5148 
    5249 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/EXPERIMENTS/ORCA2_LIM3_PISCES/clim/config.card

    r3186 r3219  
    3131# config.card configuration options : 
    3232#R_BC=$WORKDIR/../../gzi/rgzi002/IGCM/BC 
    33 R_BC=/workgpfs/rech/gzi/rgzi011 
     33R_BC=/workgpfs/rech/gzi/rgzi011/IGCM/BC 
    3434#R_INIT=$WORKDIR/../../gzi/rgzi002/IGCM/BC 
    3535#======================================================================== 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-lim3.xml

    r3186 r3219  
    2828      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files --> 
    2929 
    30       </file_group> 
    31  
    32       <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->    
    33          
    34  
    35         <file id="file6" name_suffix="_icemod" description="ice variables" enabled=".true." > 
     30        <file id="file36" name_suffix="_icemod" description="ice variables" enabled=".true." > 
    3631          <field field_ref="snowthic_cea"    name="snthic" /> 
    3732          <field field_ref="icethic_cea"     name="sithic" /> 
     
    121116        </file> 
    122117 
    123         <file id="file7" name_suffix="_scalar" description="scalar variables" enabled=".true." > 
     118        <file id="file37" name_suffix="_scalar" description="scalar variables" enabled=".true." > 
    124119          <field field_ref="voltot"       name="scvoltot"   /> 
    125120          <field field_ref="sshtot"       name="scsshtot"   /> 
     
    141136        </file> 
    142137 
    143         <file id="file8" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." > 
     138        <file id="file38" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." > 
    144139          <!-- global contents --> 
    145140          <field field_ref="ibgvol_tot"    name="ibgvol_tot"   /> 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-opa.xml

    r3186 r3219  
    2323      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->      
    2424 
    25       <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."/> <!-- 1d files --> 
    26        
     25      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE.">  <!-- 1d files --> 
     26        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
     27          <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       /> 
     28          <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          /> 
     29          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                /> 
     30          <field field_ref="sst"          name="tosstd"   long_name="sea_surface_temperature_standard_deviation"         operation="average" freq_op="1d" > sqrt( @sst2 - @sst * @sst ) </field> 
     31          <field field_ref="ssh"          name="zosstd"   long_name="sea_surface_height_above_geoid_standard_deviation"  operation="average" freq_op="1d" > sqrt( @ssh2 - @ssh * @ssh ) </field> 
     32          <field field_ref="sst"          name="sstdcy"   long_name="amplitude of sst diurnal cycle" operation="average" freq_op="1d" > @sstmax - @sstmin </field> 
     33          <field field_ref="mldr10_1"     /> 
     34          <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle" operation="average" freq_op="1d" > @mldr10_1max - @mldr10_1min </field> 
     35        </file> 
     36   </file_group> 
     37 
     38       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files --> 
     39         <file id="file2" name_suffix="_grid_T" description="ocean T grid variables" > 
     40          <field field_ref="e3t"  /> 
     41          <field field_ref="toce"         name="thetao"   long_name="sea_water_potential_temperature"      operation="average" freq_op="5d" > @toce_e3t / @e3t </field> 
     42          <field field_ref="soce"         name="so"       long_name="sea_water_salinity"                   operation="average" freq_op="5d" > @soce_e3t / @e3t </field> 
     43          <field field_ref="hdiv"         name="hdivtr"   long_name="horizontal divergence transport"      operation="average" freq_op="5d" > @hdiv * @e3t </field> 
     44          <field field_ref="mldr10_1"     name="mldr10_1"/> 
     45          <field field_ref="ssh"          name="zos"      long_name="sea_surface_height_above_geoid"                /> 
     46          <field field_ref="qsr"          name="rsntds"      long_name="surface_net_downward_shortwave_flux" /> 
     47          <field field_ref="wspd"         name="windsp"  /> 
     48          <field field_ref="empmr"        name="wfo"      long_name="water_flux_into_sea_water"                     /> 
     49          <field field_ref="empbmr"       name="wfob"     long_name="water_flux_into_sea_water at prev time-step"    /> 
     50          <field field_ref="runoffs"      name="runoffs"  /> 
     51          <field field_ref="fmmflx"       name="fmmflx"  /> 
     52        </file> 
     53   </file_group> 
     54 
    2755      <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files --> 
     56 
    2857      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files --> 
    29  
    30         <file id="file20" name_suffix="_ptrc_T" description="pisces sms variables" > 
     58  
     59       <file id="file3" name_suffix="_grid_T" description="ocean T grid variables" > 
     60          <field field_ref="e3t"      /> 
     61          <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field> 
     62          <field field_ref="soce"         name="so"                                                                          operation="instant" freq_op="5d" > @soce_e3t / @e3t </field> 
     63          <field field_ref="sst"          name="tos"   /> 
     64          <field field_ref="sss"          name="sos"   /> 
     65          <field field_ref="ssh"          name="zos"   /> 
     66          <field field_ref="sst"          name="tosstd"       long_name="sea surface temperature standard deviation"         operation="instant" freq_op="5d" > sqrt( @sst2 - @sst * @sst ) </field> 
     67          <field field_ref="ssh"          name="zosstd"       long_name="sea surface height above geoid standard deviation"  operation="instant" freq_op="5d" > sqrt( @ssh2 - @ssh * @ssh ) </field> 
     68          <field field_ref="sst"          name="sstdcy"       long_name="amplitude of sst diurnal cycle"                     operation="average" freq_op="1d" > @sstmax - @sstmin </field> 
     69          <field field_ref="mldkz5"   /> 
     70          <field field_ref="mldr10_1" /> 
     71          <field field_ref="mldr10_1"     name="mldr10_1dcy"  long_name="amplitude of mldr10_1 diurnal cycle"                operation="average" freq_op="1d" > @mldr10_1max - @mldr10_1min </field> 
     72          <field field_ref="sbt"      /> 
     73          <field field_ref="heatc"        name="heatc" /> 
     74          <field field_ref="saltc"        name="saltc" /> 
     75        </file> 
     76 
     77 
     78        <file id="file4" name_suffix="_ptrc_T" description="pisces sms variables" > 
    3179          <field field_ref="DIC"      /> 
    3280          <field field_ref="Alkalini" /> 
     
    4088        </file> 
    4189 
    42         <file id="file21" name_suffix="_diad_T" description="additional pisces diagnostics" > 
     90        <file id="file5" name_suffix="_diad_T" description="additional pisces diagnostics" > 
    4391          <field field_ref="Cflx"     /> 
    4492          <field field_ref="Dpco2"    /> 
     
    4997      <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->    
    5098         
    51         <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
     99        <file id="file10" name_suffix="_grid_T" description="ocean T grid variables" > 
    52100          <field field_ref="e3t"      /> 
    53101          <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field> 
     
    67115        </file> 
    68116 
    69         <file id="file2" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc --> 
     117        <file id="file11" name_suffix="_SBC" description="surface fluxes variables" > <!-- time step automaticaly defined based on nn_fsbc --> 
    70118          <field field_ref="empmr"        name="wfo"      /> 
    71119          <field field_ref="qsr_oce"      name="qsr_oce"  /> 
     
    86134        </file> 
    87135 
    88         <file id="file3" name_suffix="_grid_U" description="ocean U grid variables" > 
     136        <file id="file12" name_suffix="_grid_U" description="ocean U grid variables" > 
    89137          <field field_ref="e3u" /> 
    90138          <field field_ref="ssu"          name="uos"      /> 
     
    98146        </file> 
    99147         
    100         <file id="file4" name_suffix="_grid_V" description="ocean V grid variables" > 
     148        <file id="file13" name_suffix="_grid_V" description="ocean V grid variables" > 
    101149          <field field_ref="e3v" /> 
    102150          <field field_ref="ssv"          name="vos"      /> 
     
    110158        </file> 
    111159         
    112         <file id="file5" name_suffix="_grid_W" description="ocean W grid variables" > 
     160        <file id="file14" name_suffix="_grid_W" description="ocean W grid variables" > 
    113161          <field field_ref="e3w" /> 
    114162          <field field_ref="woce"         name="wo"       /> 
     
    124172        </file> 
    125173 
    126         <file id="file7" name_suffix="_scalar" description="scalar variables" enabled=".true." > 
     174        <file id="file15" name_suffix="_scalar" description="scalar variables" enabled=".true." > 
    127175          <field field_ref="voltot"       name="scvoltot"   /> 
    128176          <field field_ref="sshtot"       name="scsshtot"   /> 
     
    144192        </file> 
    145193 
    146         <file id="file12" name_suffix="_ptrc_T" description="pisces sms variables" > 
     194        <file id="file16" name_suffix="_ptrc_T" description="pisces sms variables" > 
    147195          <field field_ref="DIC"      /> 
    148196          <field field_ref="Alkalini" /> 
     
    171219        </file> 
    172220 
    173         <file id="file13" name_suffix="_diad_T" description="additional pisces diagnostics" > 
     221        <file id="file17" name_suffix="_diad_T" description="additional pisces diagnostics" > 
    174222          <field field_ref="PH"       /> 
    175223          <field field_ref="PAR"      /> 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/file_def_nemo-pisces.xml

    r3186 r3219  
    4949      <file_group id="1y" output_freq="1y"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->    
    5050         
    51         <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
     51        <file id="file22" name_suffix="_grid_T" description="ocean T grid variables" > 
    5252          <field field_ref="e3t"      /> 
    5353          <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field> 
     
    6767        </file> 
    6868 
    69         <file id="file9" name_suffix="_bioscalar" description="pisces sms variables" > 
     69        <file id="file23" name_suffix="_bioscalar" description="pisces sms variables" > 
    7070          <field field_ref="tdenit"   name="tdenit"   unit="TgN/yr" operation="instant" > tdenit * 14. * 86400. * 365. / 1e12 </field> 
    7171          <field field_ref="tnfix"    name="tnfix"    unit="TgN/yr" operation="instant" > tnfix * 14. * 86400. * 365. / 1e12 </field> 
     
    9191        --> 
    9292 
    93         <file id="file12" name_suffix="_ptrc_T" description="pisces sms variables" > 
     93        <file id="file24" name_suffix="_ptrc_T" description="pisces sms variables" > 
    9494          <field field_ref="DIC"      /> 
    9595          <field field_ref="Alkalini" /> 
     
    118118        </file> 
    119119 
    120         <file id="file13" name_suffix="_diad_T" description="additional pisces diagnostics" > 
     120        <file id="file25" name_suffix="_diad_T" description="additional pisces diagnostics" > 
    121121          <field field_ref="PH"       /> 
    122122          <field field_ref="PAR"      /> 
  • CONFIG/UNIFORM/v6/NEMO_v7_dev/GENERAL/PARAM/namelist_top_cfg

    r3186 r3219  
    5656!          !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      ! 
    5757   sn_trcdta(1)  = 'data_DIC_nomask'        ,        -12        ,  'DIC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
    58    sn_trcdta(2)  = 'data_Alkalini_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
    59    sn_trcdta(3)  = 'data_O2_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
     58   sn_trcdta(2)  = 'data_ALK_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
     59   sn_trcdta(3)  = 'data_OXY_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
    6060   sn_trcdta(5)  = 'data_PO4_nomask'        ,        -1         ,  'PO4'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
    61    sn_trcdta(7)  = 'data_Si_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
     61   sn_trcdta(7)  = 'data_SIL_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
    6262   sn_trcdta(10) = 'data_DOC_nomask'        ,        -12        ,  'DOC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
    63    sn_trcdta(14) = 'data_Fer_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
     63   sn_trcdta(14) = 'data_FER_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , '' 
    6464   sn_trcdta(23) = 'data_NO3_nomask'        ,        -1         ,  'NO3'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , '' 
    6565   rn_trfac(1)   =   1.0e-06  !  multiplicative factor 
Note: See TracChangeset for help on using the changeset viewer.