Changeset 7906


Ignore:
Timestamp:
2017-04-13T15:43:46+02:00 (3 years ago)
Author:
jcastill
Message:

Move the variable nn_drag from the namelist namsbc_wave to namsbc, as it is used even when the wave science is deactivated (ln_wave=.false.)

Location:
branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/CONFIG/SHARED/namelist_ref

    r7905 r7906  
    273273                           !  = 1  Average and redistribute per-category fluxes, forced mode only, not yet implemented coupled 
    274274                           !  = 2  Redistribute a single flux over categories (coupled mode only) 
     275   nn_drag   = 0      !  formula to calculate momentum from the wind components 
     276                           ! = 0 UKMO SHELF formulation 
     277                           ! = 1 standard formulation with forced of coupled drag coefficient 
     278                           ! = 2 standard formulation with constant drag coefficient 
     279                           ! = 3 momentum calculated from core forcing fields 
    275280/ 
    276281!----------------------------------------------------------------------- 
     
    12911296   ln_rough    = .false.   !  Wave roughness equals the significant wave height 
    12921297   ln_zdfqiao  = .false.   !  Enhanced wave vertical mixing Qiao (2010) 
    1293    nn_drag   = 0      !  formula to calculate momentum from the wind components 
    1294                            ! = 0 UKMO SHELF formulation 
    1295                            ! = 1 standard formulation with forced of coupled drag coefficient 
    1296                            ! = 2 standard formulation with constant drag coefficient 
    1297                            ! = 3 momentum calculated from core forcing fields 
    12981298   nn_sdrift   =  0   !  Parameterization for the calculation of 3D-Stokes drift from the surface Stokes drift 
    12991299                           ! = 0 Breivik 2015 parameterization: v_z=v_0*[exp(2*k*z)/(1-8*k*z)] 
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r7905 r7906  
    8989         &             ln_blk_mfs, ln_apr_dyn, nn_ice, nn_ice_embd, ln_dm2dc   , ln_rnf   ,   & 
    9090         &             ln_ssr    , nn_isf    , nn_fwb, ln_wave    , nn_lsm     , nn_limflx,   & 
    91                        nn_components, ln_cpl , ln_wavcpl 
     91                       nn_components, ln_cpl , ln_wavcpl, nn_drag 
    9292      INTEGER  ::   ios 
    9393      INTEGER  ::   ierr, ierr0, ierr1, ierr2, ierr3, jpm 
     
    136136         WRITE(numout,*) '              components of your executable              nn_components = ', nn_components 
    137137         WRITE(numout,*) '              Multicategory heat flux formulation (LIM3) nn_limflx   = ', nn_limflx 
     138         WRITE(numout,*) '              momentum formulation                       nn_drag     = ', nn_drag 
    138139         WRITE(numout,*) '           Misc. options of sbc : ' 
    139140         WRITE(numout,*) '              Patm gradient added in ocean & ice Eqs.    ln_apr_dyn  = ', ln_apr_dyn 
  • branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

    r7905 r7906  
    350350      NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_hsw, sn_wmp, sn_wfr, sn_wnum, sn_tauoc, sn_phioc, & 
    351351                             ln_cdgw, ln_sdw, ln_stcor, ln_phioc, ln_tauoc, ln_zdfqiao, ln_rough,                 & 
    352                              nn_drag, nn_sdrift, nn_wmix 
     352                             nn_sdrift, nn_wmix 
    353353      !!--------------------------------------------------------------------- 
    354354      ! 
     
    374374         WRITE(numout,*) '        vertical mixing parametrization       nn_wmix     = ', nn_wmix  
    375375         WRITE(numout,*) '      neutral drag coefficient                ln_cdgw     = ', ln_cdgw 
    376          WRITE(numout,*) '        momentum formulation                  nn_drag     = ', nn_drag 
    377376         WRITE(numout,*) '      wave roughness length modification      ln_rough    = ', ln_rough  
    378377         WRITE(numout,*) '      Qiao vertical mixing formulation        ln_zdfqiao  = ', ln_zdfqiao 
Note: See TracChangeset for help on using the changeset viewer.