Changeset 7906

Timestamp:

2017-04-13T15:43:46+02:00 (7 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:

• CONFIG/SHARED/namelist_ref (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) (2 diffs)

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -273 +273 @@
                            !  = 1  Average and redistribute per-category fluxes, forced mode only, not yet implemented coupled
                            !  = 2  Redistribute a single flux over categories (coupled mode only)
+   nn_drag   = 0      !  formula to calculate momentum from the wind components
+                           ! = 0 UKMO SHELF formulation
+                           ! = 1 standard formulation with forced of coupled drag coefficient
+                           ! = 2 standard formulation with constant drag coefficient
+                           ! = 3 momentum calculated from core forcing fields
 /
 !-----------------------------------------------------------------------
@@ -1291 +1296 @@
    ln_rough    = .false.   !  Wave roughness equals the significant wave height
    ln_zdfqiao  = .false.   !  Enhanced wave vertical mixing Qiao (2010)
-   nn_drag   = 0      !  formula to calculate momentum from the wind components
-                           ! = 0 UKMO SHELF formulation
-                           ! = 1 standard formulation with forced of coupled drag coefficient
-                           ! = 2 standard formulation with constant drag coefficient
-                           ! = 3 momentum calculated from core forcing fields
    nn_sdrift   =  0   !  Parameterization for the calculation of 3D-Stokes drift from the surface Stokes drift
                            ! = 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

@@ -89 +89 @@
          &             ln_blk_mfs, ln_apr_dyn, nn_ice, nn_ice_embd, ln_dm2dc   , ln_rnf   ,   &
          &             ln_ssr    , nn_isf    , nn_fwb, ln_wave    , nn_lsm     , nn_limflx,   &
-                       nn_components, ln_cpl , ln_wavcpl
+                       nn_components, ln_cpl , ln_wavcpl, nn_drag
       INTEGER  ::   ios
       INTEGER  ::   ierr, ierr0, ierr1, ierr2, ierr3, jpm
@@ -136 +136 @@
          WRITE(numout,*) '              components of your executable              nn_components = ', nn_components
          WRITE(numout,*) '              Multicategory heat flux formulation (LIM3) nn_limflx   = ', nn_limflx
+         WRITE(numout,*) '              momentum formulation                       nn_drag     = ', nn_drag
          WRITE(numout,*) '           Misc. options of sbc : '
          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

@@ -350 +350 @@
       NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_hsw, sn_wmp, sn_wfr, sn_wnum, sn_tauoc, sn_phioc, &
                              ln_cdgw, ln_sdw, ln_stcor, ln_phioc, ln_tauoc, ln_zdfqiao, ln_rough,                 &
-                             nn_drag, nn_sdrift, nn_wmix
+                             nn_sdrift, nn_wmix
       !!---------------------------------------------------------------------
       !
@@ -374 +374 @@
          WRITE(numout,*) '        vertical mixing parametrization       nn_wmix     = ', nn_wmix 
          WRITE(numout,*) '      neutral drag coefficient                ln_cdgw     = ', ln_cdgw
-         WRITE(numout,*) '        momentum formulation                  nn_drag     = ', nn_drag
          WRITE(numout,*) '      wave roughness length modification      ln_rough    = ', ln_rough 
          WRITE(numout,*) '      Qiao vertical mixing formulation        ln_zdfqiao  = ', ln_zdfqiao