Changeset 8946 for branches/2017/dev_CNRS_2017/NEMOGCM/NEMO

Timestamp:

2017-12-08T08:49:34+01:00 (6 years ago)

Author:

gm

Message:

dev_CNRS_2017: minor correction in C1D case, style only in zdfosm.F90

Location:

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC

Files:

• C1D/step_c1d.F90 (modified) (2 diffs)
• ZDF/zdfosm.F90 (modified) (15 diffs)

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -105 +105 @@
       IF( ln_tradmp )   CALL tra_dmp( kstp )       ! internal damping trends- tracers
       IF(.NOT.ln_linssh)CALL tra_adv( kstp )       ! horizontal & vertical advection
-      IF( lk_zdfosm  )  CALL tra_osm( kstp )       ! OSMOSIS non-local tracer fluxes
+      IF( ln_zdfosm  )  CALL tra_osm( kstp )       ! OSMOSIS non-local tracer fluxes
                         CALL tra_zdf( kstp )       ! vertical mixing
                         CALL eos( tsn, rhd, rhop, gdept_0(:,:,:) )   ! now potential density for zdfmxl
@@ -121 +121 @@
       IF( ln_dyndmp )   CALL dyn_dmp    ( kstp )   ! internal damping trends- momentum
                         CALL dyn_cor_c1d( kstp )   ! vorticity term including Coriolis
-      IF( lk_zdfosm  )  CALL dyn_osm    ( kstp )   ! OSMOSIS non-local velocity fluxes
+      IF( ln_zdfosm  )  CALL dyn_osm    ( kstp )   ! OSMOSIS non-local velocity fluxes
                         CALL dyn_zdf    ( kstp )   ! vertical diffusion
                         CALL dyn_nxt    ( kstp )   ! lateral velocity at next time step

branches/2017/dev_CNRS_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfosm.F90

@@ -6 +6 @@
    !!=====================================================================
    !!  History : NEMO 4.0  ! A. Grant, G. Nurser
-
    !! 15/03/2017  Changed calculation of pycnocline thickness in unstable conditions and stable conditions AG
    !! 15/03/2017  Calculation of pycnocline gradients for stable conditions changed. Pycnocline gradients now depend on stability of the OSBL. A.G
@@ -30 +29 @@
    !!            (16) Calculation of Stokes drift from windspeed for PM spectrum (for testing, commented out)
    !!            (17) Modification to Langmuir velocity scale to include effects due to the Stokes penetration depth (for testing, commented out)
-   !!
    !!----------------------------------------------------------------------
+
    !!----------------------------------------------------------------------
    !!   'key_zdfosm'                                             OSMOSIS scheme
@@ -42 +41 @@
    !!   dyn_osm       : compute and add to u & v trensd the non-local flux
    !!----------------------------------------------------------------------
-   USE oce !, wb => wn  ! ocean dynamics and active tracers
+   USE oce            ! ocean dynamics and active tracers
                       ! uses wn from previous time step (which is now wb) to calculate hbl
    USE dom_oce        ! ocean space and time domain
@@ -79 +78 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   etmean   !: averaging operator for avt
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   hbl      !: boundary layer depth
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   hbli     ! intial boundary layer depth for stable blayer
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   dstokes  ! penetration depth of the Stokes drift.
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   hbli     !: intial boundary layer depth for stable blayer
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   dstokes  !: penetration depth of the Stokes drift.
 
    !                      !!** Namelist  namzdf_osm  **
@@ -122 +121 @@
      IF( lk_mpp             )   CALL mpp_sum ( zdf_osm_alloc )
    END FUNCTION zdf_osm_alloc
+
 
    SUBROUTINE zdf_osm( kt, p_avm, p_avt )
@@ -158 +158 @@
       !!         the equation number. (LMD94, here after)
       !!----------------------------------------------------------------------
-
-      INTEGER, INTENT( in  )                    ::   kt            ! ocean time step
+      INTEGER                   , INTENT(in   ) ::   kt            ! ocean time step
       REAL(wp), DIMENSION(:,:,:), INTENT(inout) ::  p_avm, p_avt   ! momentum and tracer Kz (w-points)
       !!
@@ -252 +251 @@
       ! For debugging
       INTEGER :: ikt
-
       !!--------------------------------------------------------------------
       !
@@ -1350 +1348 @@
          IF ( iom_use("zwth_ent") ) CALL iom_put( "zwth_ent", tmask(:,:,1)*zwth_ent )               ! ML depth internal to zdf_osm routine
          IF ( iom_use("zt_ml") ) CALL iom_put( "zt_ml", tmask(:,:,1)*zt_ml )               ! average T in ML
-       END IF
-         ! Lateral boundary conditions on p_avt  (sign unchanged)
-         CALL lbc_lnk( p_avt(:,:,:), 'W', 1. )
-
+      END IF
+      ! Lateral boundary conditions on p_avt  (sign unchanged)
+      CALL lbc_lnk( p_avt(:,:,:), 'W', 1. )
+      !
    END SUBROUTINE zdf_osm
+
 
    SUBROUTINE zdf_osm_init
@@ -1507 +1506 @@
      !
    END SUBROUTINE zdf_osm_init
+
 
    SUBROUTINE osm_rst( kt, cdrw )
@@ -1600 +1600 @@
    END SUBROUTINE osm_rst
 
+
    SUBROUTINE tra_osm( kt )
       !!----------------------------------------------------------------------
@@ -1660 +1661 @@
    END SUBROUTINE tra_osm
 
+
    SUBROUTINE trc_osm( kt )          ! Dummy routine
       !!----------------------------------------------------------------------
@@ -1670 +1672 @@
       !! ** Method  :   ???
       !!----------------------------------------------------------------------
+      !
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) :: kt
       WRITE(*,*) 'trc_osm: Not written yet', kt
    END SUBROUTINE trc_osm
+
 
    SUBROUTINE dyn_osm( kt )
@@ -1684 +1688 @@
       !! ** Method  :   ???
       !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   kt   !
+      !
+      INTEGER :: ji, jj, jk   ! dummy loop indices
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) :: kt
-      INTEGER :: ji, jj, jk
       !
       IF( nn_timing == 1 )  CALL timing_start('dyn_osm')
@@ -1697 +1702 @@
       !code saving tracer trends removed, replace with trdmxl_oce
 
-      ! add non-local u and v fluxes
-      DO jk = 1, jpkm1
+      DO jk = 1, jpkm1           ! add non-local u and v fluxes
          DO jj = 2, jpjm1
             DO ji = 2, jpim1
@@ -1717 +1721 @@
    END SUBROUTINE dyn_osm
 
+   !!======================================================================
 END MODULE zdfosm
-