New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14058 for NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED – NEMO

Ignore:
Timestamp:
2020-12-03T16:53:41+01:00 (4 years ago)
Author:
ayoung
Message:

Updating to trunk revision 14057. No conflicts since last sette test. Ticket #2480.

Location:
NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED/axis_def_nemo.xml

    r12377 r14058  
    1414      <axis id="depthv"  long_name="Vertical V levels" unit="m" positive="down" /> 
    1515      <axis id="depthw"  long_name="Vertical W levels" unit="m" positive="down" /> 
     16      <axis id="depthf"  long_name="Vertical F levels" unit="m" positive="down" /> 
    1617      <axis id="nfloat"  long_name="Float number"      unit="-"                 /> 
    1718      <axis id="icbcla"  long_name="Iceberg class"      unit="1"               /> 
  • NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED/domain_def_nemo.xml

    r12276 r14058  
    181181     <domain id="EqW" domain_ref="grid_W" > <zoom_domain id="EqW"/> </domain> 
    182182 
     183     <!--   F grid   --> 
     184     <domain id="grid_F" long_name="grid F"/> 
     185      
    183186              <!--   zonal mean grid   --> 
    184187     <domain_group id="gznl"> 
  • NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED/field_def_nemo-oce.xml

    r14047 r14058  
    171171        <field id="tosmint_pot"  long_name="vertical integral of potential temperature times density"   standard_name="integral_wrt_depth_of_product_of_density_and_potential_temperature"  unit="(kg m2) degree_C" /> 
    172172 
    173  
     173        <field id="ht"           long_name="water column height at T point"                     standard_name="water_column_height_T"                      unit="m" /> 
    174174        <field id="ssh"          long_name="sea surface height"                                 standard_name="sea_surface_height_above_geoid"             unit="m" /> 
    175175        <field id="ssh2"         long_name="square of sea surface height"                       standard_name="square_of_sea_surface_height_above_geoid"   unit="m2" > ssh * ssh </field > 
     
    190190 
    191191        <!-- Energy - horizontal divergence --> 
     192        <field id="sKE"          long_name="surface kinetic energy"  standard_name="specific_kinetic_energy_of_sea_water"   unit="m2/s2"  grid_ref="grid_T_2D" /> 
    192193        <field id="hdiv"         long_name="horizontal divergence"                                                          unit="s-1"    grid_ref="grid_T_3D" /> 
    193194 
     
    556557 
    557558      <field_group id="grid_U"   grid_ref="grid_U_2D"> 
     559        <field id="hu"            long_name="water column height at U point"                         standard_name="water_column_height_U"       unit="m" /> 
    558560        <field id="e2u"           long_name="U-cell width in meridional direction"                   standard_name="cell_width"                  unit="m"                               /> 
    559561        <field id="e3u"           long_name="U-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_U_3D" /> 
     
    626628        <field id="e3v"          long_name="V-cell thickness"                                       standard_name="cell_thickness"              unit="m"          grid_ref="grid_V_3D" /> 
    627629        <field id="e3v_0"        long_name="Initial V-cell thickness"                               standard_name="ref_cell_thickness"          unit="m"          grid_ref="grid_V_3D" /> 
     630        <field id="hv"            long_name="water column height at V point"                        standard_name="water_column_height_V"       unit="m" /> 
    628631        <field id="vtau"         long_name="Wind Stress along j-axis"                               standard_name="surface_downward_y_stress"   unit="N/m2"                            /> 
    629632        <field id="voce"         long_name="ocean current along j-axis"                             standard_name="sea_water_y_velocity"        unit="m/s"        grid_ref="grid_V_3D" /> 
     
    734737 
    735738      <!-- F grid --> 
     739      <field_group id="grid_F" grid_ref="grid_F_2D"> 
     740   <field id="e3f"          long_name="F-cell thickness"                    standard_name="cell_thickness"        unit="m"   grid_ref="grid_F_3D" /> 
     741   <field id="e3f_0"        long_name="F-cell thickness"                    standard_name="cell_thickness"        unit="m"   grid_ref="grid_F_3D" /> 
     742        <field id="hf"           long_name="water column height at F point"    standard_name="water_column_height_F"  unit="m"                     /> 
     743        <field id="sKEf"         long_name="surface kinetic energy at F point" standard_name="specific_kinetic_energy_of_sea_water"   unit="m2/s2" /> 
     744        <field id="relvor"       long_name="relative vorticity"                standard_name="relative_vorticity"     unit="1/s"                   /> 
     745        <field id="plavor"       long_name="planetary vorticity"               standard_name="planetary_vorticity"    unit="1/s"                   /> 
     746        <field id="relpotvor"    long_name="relative potential vorticity"      standard_name="relpot_vorticity"       unit="1/m.s"                 /> 
     747        <field id="abspotvor"    long_name="absolute potential vorticity"      standard_name="abspot_vorticity"       unit="1/m.s"                 /> 
     748        <field id="Ens"          long_name="enstrophy"                         standard_name="enstrophy"              unit="1/m2.s2"               /> 
     749      </field_group>  
     750  
    736751      <!-- AGRIF sponge --> 
    737752      <field id="agrif_spf"    long_name=" AGRIF f-sponge coefficient"   unit=" " /> 
  • NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED/grid_def_nemo.xml

    r12377 r14058  
    5353         <domain domain_ref="grid_W" /> 
    5454         <axis axis_ref="depthw" /> 
     55       </grid> 
     56       <!--  --> 
     57       <grid id="grid_F_2D" > 
     58         <domain domain_ref="grid_F" /> 
     59       </grid> 
     60        <!--  --> 
     61       <grid id="grid_F_3D" > 
     62         <domain domain_ref="grid_F" /> 
     63         <axis axis_ref="depthf" /> 
    5564       </grid> 
    5665        <!--  --> 
  • NEMO/branches/2020/dev_r13723_KERNEL-01_Amy_Mike_newHPGschemes/cfgs/SHARED/namelist_ref

    r14047 r14058  
    998998   ln_dynvor_eeT = .false. !  energy conserving scheme (een using e3t) 
    999999   ln_dynvor_een = .false. !  energy & enstrophy scheme 
    1000       nn_een_e3f = 0          ! =0  e3f = mi(mj(e3t))/4 
    1001       !                       ! =1  e3f = mi(mj(e3t))/mi(mj( tmask)) 
     1000   ! 
    10021001   ln_dynvor_msk = .false. !  vorticity multiplied by fmask (=T)        ==>>> PLEASE DO NOT ACTIVATE 
    1003       !                    !  (f-point vorticity schemes only) 
     1002   !                       !  (f-point vorticity schemes only) 
     1003   ! 
     1004   nn_e3f_typ = 0          !  type of e3f (EEN, ENE, ENS, MIX only)  =0  e3f = mi(mj(e3t))/4 
     1005   !                       !                                         =1  e3f = mi(mj(e3t))/mi(mj( tmask)) 
    10041006/ 
    10051007!----------------------------------------------------------------------- 
     
    10351037   !                       !  Type of the operator : 
    10361038   ln_dynldf_OFF = .false.     !  No operator (i.e. no explicit diffusion) 
     1039   nn_dynldf_typ = 0           !  =0 div-rot (default)   ;   =1 symmetric 
    10371040   ln_dynldf_lap = .false.     !    laplacian operator 
    10381041   ln_dynldf_blp = .false.     !  bilaplacian operator 
     
    11651168   ln_mxl0     = .true.    !  surface mixing length scale = F(wind stress) (T) or not (F) 
    11661169      nn_mxlice    = 2        ! type of scaling under sea-ice 
    1167                               !    = 0 no scaling under sea-ice 
    1168                               !    = 1 scaling with constant sea-ice thickness 
    1169                               !    = 2 scaling with mean sea-ice thickness ( only with SI3 sea-ice model ) 
    1170                               !    = 3 scaling with maximum sea-ice thickness 
     1170      !                       !    = 0 no scaling under sea-ice 
     1171      !                       !    = 1 scaling with constant sea-ice thickness 
     1172      !                       !    = 2 scaling with mean sea-ice thickness ( only with SI3 sea-ice model ) 
     1173      !                       !    = 3 scaling with maximum sea-ice thickness 
    11711174      rn_mxlice   = 10.       ! max constant ice thickness value when scaling under sea-ice ( nn_mxlice=1) 
    11721175   rn_mxl0     =   0.04    !  surface  buoyancy lenght scale minimum value 
     
    11751178      rn_lc       =   0.15    !  coef. associated to Langmuir cells 
    11761179   nn_etau     =   1       !  penetration of tke below the mixed layer (ML) due to NIWs 
    1177                               !        = 0 none ; = 1 add a tke source below the ML 
    1178                               !        = 2 add a tke source just at the base of the ML 
    1179                               !        = 3 as = 1 applied on HF part of the stress           (ln_cpl=T) 
     1180   !                          !        = 0 none ; = 1 add a tke source below the ML 
     1181   !                          !        = 2 add a tke source just at the base of the ML 
     1182   !                          !        = 3 as = 1 applied on HF part of the stress           (ln_cpl=T) 
    11801183      rn_efr      =   0.05    !  fraction of surface tke value which penetrates below the ML (nn_etau=1 or 2) 
    11811184      nn_htau     =   1       !  type of exponential decrease of tke penetration below the ML 
    1182                               !        = 0  constant 10 m length scale 
    1183                               !        = 1  0.5m at the equator to 30m poleward of 40 degrees 
     1185      !                       !        = 0  constant 10 m length scale 
     1186      !                       !        = 1  0.5m at the equator to 30m poleward of 40 degrees 
    11841187   nn_eice     =   1       !  attenutaion of langmuir & surface wave breaking under ice 
    11851188   !                       !           = 0 no impact of ice cover on langmuir & surface wave breaking 
     
    13991402   ln_sstnight = .false.             ! Logical switch for calculating night-time average for SST obs 
    14001403   ln_bound_reject  = .false.        ! Logical to remove obs near boundaries in LAMs. 
     1404   ln_default_fp_indegs = .true.     ! Logical: T=> averaging footprint is in degrees, F=> in metres 
    14011405   ln_sla_fp_indegs = .true.         ! Logical for SLA: T=> averaging footprint is in degrees, F=> in metres 
    14021406   ln_sst_fp_indegs = .true.         ! Logical for SST: T=> averaging footprint is in degrees, F=> in metres 
     
    14141418   cn_gridsearchfile ='gridsearch.nc' ! Grid search file name 
    14151419   rn_gridsearchres = 0.5            ! Grid search resolution 
     1420   rn_default_avglamscl = 0.         ! Default E/W diameter of observation footprint (metres/degrees) 
     1421   rn_default_avgphiscl = 0.         ! Default N/S diameter of observation footprint (metres/degrees) 
    14161422   rn_mdtcorr  = 1.61                ! MDT  correction 
    14171423   rn_mdtcutoff = 65.0               ! MDT cutoff for computed correction 
     
    14271433   rn_sic_avgphiscl = 0.             ! N/S diameter of SIC observation footprint (metres/degrees) 
    14281434   nn_1dint = 0                      ! Type of vertical interpolation method 
    1429    nn_2dint = 0                      ! Default horizontal interpolation method 
     1435   nn_2dint_default = 0              ! Default horizontal interpolation method 
    14301436   nn_2dint_sla = 0                  ! Horizontal interpolation method for SLA 
    14311437   nn_2dint_sst = 0                  ! Horizontal interpolation method for SST 
Note: See TracChangeset for help on using the changeset viewer.