Ignore:
Timestamp:
2017-04-19T12:15:07+02:00 (4 years ago)
Author:
gm
Message:

#1880 (HPC-09): remove key_zdfddm + phasing with last changes of HPC08 branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

    r7779 r7931  
    163163      !                          ! ----------------------- ! 
    164164      DO jk = 2, jpkm1              !* update momentum & tracer diffusivity with tidal mixing 
    165          avt(:,:,jk) = avt(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk) 
     165         avt(:,:,jk) = avs(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk) 
    166166         avm(:,:,jk) = avm(:,:,jk) + zav_tide(:,:,jk) * wmask(:,:,jk) 
    167167         DO jj = 2, jpjm1 
     
    591591 
    592592   !! * Substitutions 
    593 #  include "zdfddm_substitute.h90" 
    594593#  include "vectopt_loop_substitute.h90" 
    595594   !!---------------------------------------------------------------------- 
     
    700699         emix_tmx(:,:,jk) = zfact(:,:) * (  EXP( ( gde3w_n(:,:,jk  ) - zhdep(:,:) ) / hcri_tmx(:,:) )                      & 
    701700            &                             - EXP( ( gde3w_n(:,:,jk-1) - zhdep(:,:) ) / hcri_tmx(:,:) )  ) * wmask(:,:,jk)   & 
     701!!gm delta(gde3w_n) = e3t_n  !!  Please verify the grid-point position w versus t-point 
    702702            &                          / ( gde3w_n(:,:,jk) - gde3w_n(:,:,jk-1) ) 
    703703      END DO 
     
    824824      IF( kt == nit000 ) THEN        !* Control print at first time-step: diagnose the energy consumed by zav_wave 
    825825         ztpc = 0._wp 
     826!!gm used of glosum 3D.... 
    826827         DO jk = 2, jpkm1 
    827828            DO jj = 1, jpj 
     
    860861         CALL iom_put( "av_ratio", zav_ratio ) 
    861862         DO jk = 2, jpkm1           !* update momentum & tracer diffusivity with wave-driven mixing 
    862             fsavs(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) * zav_ratio(:,:,jk) 
    863             avt  (:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) 
    864             avm  (:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk) 
     863            avs(:,:,jk) = avs(:,:,jk) + zav_wave(:,:,jk) * zav_ratio(:,:,jk) 
     864            avt(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) 
     865            avm(:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk) 
    865866         END DO 
    866867         ! 
    867868      ELSE                          !* update momentum & tracer diffusivity with wave-driven mixing 
    868869         DO jk = 2, jpkm1 
    869             fsavs(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) 
    870             avt  (:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) 
    871             avm  (:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk) 
     870            avs(:,:,jk) = avs(:,:,jk) + zav_wave(:,:,jk) 
     871            avt(:,:,jk) = avt(:,:,jk) + zav_wave(:,:,jk) 
     872            avm(:,:,jk) = avm(:,:,jk) + zav_wave(:,:,jk) 
    872873         END DO 
    873874      ENDIF 
     
    976977            &               'the viscous molecular value & a very small diffusive value, resp.' 
    977978      ENDIF 
    978        
    979       IF( .NOT.lk_zdfddm )   CALL ctl_stop( 'STOP', 'zdf_tmx_init_new : key_zdftmx_new requires key_zdfddm' ) 
    980        
     979             
    981980      !                             ! allocate tmx arrays 
    982981      IF( zdf_tmx_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_tmx_init : unable to allocate tmx arrays' ) 
Note: See TracChangeset for help on using the changeset viewer.