New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 5621 for branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 – NEMO

Ignore:
Timestamp:
2015-07-21T13:25:36+02:00 (9 years ago)
Author:
mathiot
Message:

UKMO_ISF: upgrade to NEMO_3.6_STABLE (r5554)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5151_UKMO_ISF/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

    r5200 r5621  
    863863      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zdept, zrhh 
    864864      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp 
     865      REAL(wp), POINTER, DIMENSION(:,:)   ::   zsshu_n, zsshv_n 
    865866      !!---------------------------------------------------------------------- 
    866867      ! 
    867868      CALL wrk_alloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
    868869      CALL wrk_alloc( jpi,jpj,jpk, zdept, zrhh ) 
     870      CALL wrk_alloc( jpi,jpj, zsshu_n, zsshv_n ) 
    869871      ! 
    870872      IF( kt == nit000 ) THEN 
     
    947949 
    948950      ! Z coordinate of U(ji,jj,1:jpkm1) and V(ji,jj,1:jpkm1) 
     951 
     952      ! Prepare zsshu_n and zsshv_n 
    949953      DO jj = 2, jpjm1 
    950954        DO ji = 2, jpim1 
    951           zu(ji,jj,1) = - ( fse3u(ji,jj,1) - sshn(ji,jj) * znad)    ! probable bug: changed from sshu_n for ztilde compilation 
    952           zv(ji,jj,1) = - ( fse3v(ji,jj,1) - sshn(ji,jj) * znad)    ! probable bug: changed from sshv_n for ztilde compilation 
     955          zsshu_n(ji,jj) = (e12u(ji,jj) * sshn(ji,jj) + e12u(ji+1, jj) * sshn(ji+1,jj)) * & 
     956                         & r1_e12u(ji,jj) * umask(ji,jj,1) * 0.5_wp  
     957          zsshv_n(ji,jj) = (e12v(ji,jj) * sshn(ji,jj) + e12v(ji+1, jj) * sshn(ji,jj+1)) * & 
     958                         & r1_e12v(ji,jj) * vmask(ji,jj,1) * 0.5_wp  
     959        END DO 
     960      END DO 
     961 
     962      DO jj = 2, jpjm1 
     963        DO ji = 2, jpim1 
     964          zu(ji,jj,1) = - ( fse3u(ji,jj,1) - zsshu_n(ji,jj) * znad)  
     965          zv(ji,jj,1) = - ( fse3v(ji,jj,1) - zsshv_n(ji,jj) * znad) 
    953966        END DO 
    954967      END DO 
     
    11121125      CALL wrk_dealloc( jpi,jpj,jpk, zhpi, zu, zv, fsp, xsp, asp, bsp, csp, dsp ) 
    11131126      CALL wrk_dealloc( jpi,jpj,jpk, zdept, zrhh ) 
     1127      CALL wrk_dealloc( jpi,jpj, zsshu_n, zsshv_n ) 
    11141128      ! 
    11151129   END SUBROUTINE hpg_prj 
Note: See TracChangeset for help on using the changeset viewer.