Changeset 10368 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/ZDF/zdfphy.F90

Timestamp:

2018-12-03T12:45:01+01:00 (5 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: merge with trunk@10365, see #2133

File:

• NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/ZDF/zdfphy.F90 (modified) (4 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/ZDF/zdfphy.F90

@@ -80 +80 @@
          &             ln_zdfswm,                                    &     ! surface  wave-induced mixing
          &             ln_zdfiwm,                                    &     ! internal  -      -      -
+         &             ln_zad_Aimp,                                  &     ! apdative-implicit vertical advection
          &             rn_avm0, rn_avt0, nn_avb, nn_havtb                  ! coefficients
       !!----------------------------------------------------------------------
@@ -101 +102 @@
       IF(lwp) THEN                      ! Parameter print
          WRITE(numout,*) '   Namelist namzdf : set vertical mixing mixing parameters'
+         WRITE(numout,*) '      adaptive-implicit vertical advection'
+         WRITE(numout,*) '         Courant number targeted application   ln_zad_Aimp = ', ln_zad_Aimp
          WRITE(numout,*) '      vertical closure scheme'
          WRITE(numout,*) '         constant vertical mixing coefficient    ln_zdfcst = ', ln_zdfcst
@@ -127 +130 @@
       ENDIF
 
+      IF( ln_zad_Aimp ) THEN
+         IF( zdf_phy_alloc() /= 0 )   &
+        &       CALL ctl_stop( 'STOP', 'zdf_phy_init : unable to allocate adaptive-implicit z-advection arrays' )
+         wi(:,:,:) = 0._wp
+      ENDIF
       !                          !==  Background eddy viscosity and diffusivity  ==!
       IF( nn_avb == 0 ) THEN             ! Define avmb, avtb from namelist parameter
@@ -316 +324 @@
       !
    END SUBROUTINE zdf_phy
+   INTEGER FUNCTION zdf_phy_alloc()
+      !!----------------------------------------------------------------------
+      !!                 ***  FUNCTION zdf_phy_alloc  ***
+      !!----------------------------------------------------------------------
+     ! Allocate wi array (declared in oce.F90) for use with the adaptive-implicit vertical velocity option
+     ALLOCATE(     wi(jpi,jpj,jpk), Cu_adv(jpi,jpj,jpk),  STAT= zdf_phy_alloc )
+     IF( zdf_phy_alloc /= 0 )   CALL ctl_warn('zdf_phy_alloc: failed to allocate ln_zad_Aimp=T required arrays')
+     IF( lk_mpp             )   CALL mpp_sum ( 'zdfphy', zdf_phy_alloc )
+   END FUNCTION zdf_phy_alloc
 
    !!======================================================================