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 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/SBC/sbcisf.F90 – NEMO

Ignore:
Timestamp:
2020-10-22T20:49:56+02:00 (3 years ago)
Author:
clem
Message:

update to almost r4.0.4

Location:
NEMO/branches/2019/dev_r11842_SI3-10_EAP
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r11842_SI3-10_EAP

    • Property svn:externals

      •  

        old new  
        1 ^/utils/build/arch@HEAD       arch 
        2 ^/utils/build/makenemo@HEAD   makenemo 
        3 ^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        6 ^/vendors/FCM@HEAD            ext/FCM 
        7 ^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         1^/utils/build/arch@12130      arch 
         2^/utils/build/makenemo@12191  makenemo 
         3^/utils/build/mk@11662        mk 
         4^/utils/tools_r4.0-HEAD@12672 tools 
         5^/vendors/AGRIF/dev@10586     ext/AGRIF 
         6^/vendors/FCM@10134           ext/FCM 
         7^/vendors/IOIPSL@9655         ext/IOIPSL 
         8 
         9# SETTE mapping (inactive) 
         10#^/utils/CI/sette@12135        sette 

  • NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/SBC/sbcisf.F90

    r11536 r13662  
    738738      CHARACTER(len=1),           INTENT(in   ) :: cd_ptin ! point of variable in/out 
    739739      ! 
    740       INTEGER ::   ji, jj, jk                ! loop index 
    741       INTEGER ::   ikt, ikb                    ! top and bottom index of the tbl 
     740      INTEGER ::   ji, jj, jk                   ! loop index 
     741      INTEGER ::   ikt, ikb                     ! top and bottom index of the tbl 
    742742      REAL(wp) ::   ze3, zhk 
    743743      REAL(wp), DIMENSION(jpi,jpj) :: zhisf_tbl ! thickness of the tbl 
     744      REAL(wp), DIMENSION(jpi,jpj) :: zvarout 
    744745      !!---------------------------------------------------------------------- 
    745746       
    … …  
    749750      SELECT CASE ( cd_ptin ) 
    750751      CASE ( 'U' ) ! compute U in the top boundary layer at T- point  
     752         ! 
     753         zvarout(:,:)=0._wp 
     754         ! 
    751755         DO jj = 1,jpj 
    752756            DO ji = 1,jpi 
    … …  
    764768               DO jk = ikt, ikb - 1 
    765769                  ze3 = e3u_n(ji,jj,jk) 
    766                   pvarout(ji,jj) = pvarout(ji,jj) + pvarin(ji,jj,jk) / zhisf_tbl(ji,jj) * ze3 
     770                  zvarout(ji,jj) = zvarout(ji,jj) + pvarin(ji,jj,jk) / zhisf_tbl(ji,jj) * ze3 
    767771               END DO 
    768772 
    769773               ! level partially include in ice shelf boundary layer  
    770774               zhk = SUM( e3u_n(ji, jj, ikt:ikb - 1)) / zhisf_tbl(ji,jj) 
    771                pvarout(ji,jj) = pvarout(ji,jj) + pvarin(ji,jj,ikb) * (1._wp - zhk) 
     775               zvarout(ji,jj) = zvarout(ji,jj) + pvarin(ji,jj,ikb) * (1._wp - zhk) 
    772776            END DO 
    773777         END DO 
    … …  
    775779            DO ji = 2, jpi 
    776780!!gm a wet-point only average should be used here !!! 
    777                pvarout(ji,jj) = 0.5_wp * (pvarout(ji,jj) + pvarout(ji-1,jj)) 
     781               pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji-1,jj)) 
    778782            END DO 
    779783         END DO 
    … …  
    781785       
    782786      CASE ( 'V' ) ! compute V in the top boundary layer at T- point  
     787         ! 
     788         zvarout(:,:)=0._wp 
     789         ! 
    783790         DO jj = 1,jpj 
    784791            DO ji = 1,jpi 
    … …  
    796803               DO jk = ikt, ikb - 1 
    797804                  ze3 = e3v_n(ji,jj,jk) 
    798                   pvarout(ji,jj) = pvarout(ji,jj) + pvarin(ji,jj,jk) / zhisf_tbl(ji,jj) * ze3 
     805                  zvarout(ji,jj) = zvarout(ji,jj) + pvarin(ji,jj,jk) / zhisf_tbl(ji,jj) * ze3 
    799806               END DO 
    800807 
    801808               ! level partially include in ice shelf boundary layer  
    802809               zhk = SUM( e3v_n(ji, jj, ikt:ikb - 1)) / zhisf_tbl(ji,jj) 
    803                pvarout(ji,jj) = pvarout(ji,jj) + pvarin(ji,jj,ikb) * (1._wp - zhk) 
     810               zvarout(ji,jj) = zvarout(ji,jj) + pvarin(ji,jj,ikb) * (1._wp - zhk) 
    804811            END DO 
    805812         END DO 
    … …  
    807814            DO ji = 2, jpi 
    808815!!gm a wet-point only average should be used here !!! 
    809                pvarout(ji,jj) = 0.5_wp * (pvarout(ji,jj) + pvarout(ji,jj-1)) 
     816               pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji,jj-1)) 
    810817            END DO 
    811818         END DO 
Note: See TracChangeset for help on using the changeset viewer.