Changeset 4740


Ignore:
Timestamp:
2014-08-13T16:58:34+02:00 (6 years ago)
Author:
timgraham
Message:

Corrected bugs in trcdmp and trcnam_trp
Modifications to nam_tradmp in configuration namelists

Location:
branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg

    r4370 r4740  
    232232!----------------------------------------------------------------------- 
    233233   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    234    nn_zdmp     =   -1      !  vertical   shape =0    damping throughout the water column 
    235    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    236234/ 
    237235!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/GYRE/EXP00/namelist_cfg

    r4370 r4740  
    219219!----------------------------------------------------------------------- 
    220220   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    221    nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column 
    222    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    223221/ 
    224222!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg

    r4370 r4740  
    227227!----------------------------------------------------------------------- 
    228228   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    229    nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column 
    230    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    231229/ 
    232230!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

    r4370 r4740  
    138138!----------------------------------------------------------------------- 
    139139   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    140    nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column 
    141    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    142140/ 
    143141!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/GYRE_XIOS/EXP00/namelist_cfg

    r4373 r4740  
    216216!----------------------------------------------------------------------- 
    217217   ln_tradmp   =  .false.  !  add a damping termn (T) or not (F) 
    218    nn_zdmp     =    1      !  vertical   shape =0    damping throughout the water column 
    219    nn_file     =    1      !  create a damping.coeff NetCDF file (=1) or not (=0) 
    220218/ 
    221219!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/SHARED/namelist_ref

    r4384 r4740  
    705705!----------------------------------------------------------------------- 
    706706   ln_tradmp   =  .true.   !  add a damping termn (T) or not (F) 
    707    nn_hdmp     =   -1      !  horizontal shape =-1, damping in Med and Red Seas only 
    708                            !                   =XX, damping poleward of XX degrees (XX>0) 
    709                            !                      + F(distance-to-coast) + Red and Med Seas 
    710707   nn_zdmp     =    0      !  vertical   shape =0    damping throughout the water column 
    711708                           !                   =1 no damping in the mixing layer (kz  criteria) 
    712709                           !                   =2 no damping in the mixed  layer (rho crieria) 
    713    rn_surf     =   50.     !  surface time scale of damping   [days] 
    714    rn_bot      =  360.     !  bottom  time scale of damping   [days] 
    715    rn_dep      =  800.     !  depth of transition between rn_surf and rn_bot [meters] 
    716    nn_file     =    0      !  create a damping.coeff NetCDF file (=1) or not (=0) 
     710   cn_resto    = 'resto.nc' ! Name of file containing restoration coefficient field (use dmp_tools to create this) 
    717711/ 
    718712 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/CONFIG/SHARED/namelist_top_ref

    r4739 r4740  
    7979                           !                   =1 no damping in the mixing layer (kz  criteria) 
    8080                           !                   =2 no damping in the mixed  layer (rho crieria) 
    81    cn_resto  = 'resto_tr.nc'    !  create a damping.coeff NetCDF file (=1) or not (=0) 
     81   cn_resto_tr  = 'resto_tr.nc'    !  create a damping.coeff NetCDF file (=1) or not (=0) 
    8282/ 
    8383!----------------------------------------------------------------------- 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90

    r4739 r4740  
    2424   USE trdtra 
    2525   USE trdmod_oce 
     26   USE iom 
    2627 
    2728   IMPLICIT NONE 
     
    302303      !!---------------------------------------------------------------------- 
    303304      ! 
    304       INTEGER, imask  !local file handle 
     305      INTEGER :: imask  !local file handle 
    305306 
    306307      IF( nn_timing == 1 )  CALL timing_start('trc_dmp_init') 
  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/TOP_SRC/TRP/trcnam_trp.F90

    r4739 r4740  
    7878      NAMELIST/namtrc_zdf/ ln_trczdf_exp  , nn_trczdf_exp 
    7979      NAMELIST/namtrc_rad/ ln_trcrad 
    80       NAMELIST/namtrc_dmp/ nn_zdmp_tr , nn_file_tr 
     80      NAMELIST/namtrc_dmp/ nn_zdmp_tr , cn_resto_tr 
    8181      !!---------------------------------------------------------------------- 
    8282 
Note: See TracChangeset for help on using the changeset viewer.