Changeset 14766 for NEMO/releases/r4.0

Timestamp:

2021-04-30T11:08:19+02:00 (3 years ago)

Author:

clem

Message:

4.0-HEAD: solve ticket #2660

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/BDY/bdyice.F90 (modified) (4 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/BDY/bdyice.F90

@@ -153 +153 @@
             h_i (ji,jj,  jl) = ( h_i (ji,jj,  jl) * zwgt1 + dta%h_i(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  depth 
             h_s (ji,jj,  jl) = ( h_s (ji,jj,  jl) * zwgt1 + dta%h_s(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Snow depth
-            t_i (ji,jj,:,jl) = ( t_i (ji,jj,:,jl) * zwgt1 + dta%t_i(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  temperature
-            t_s (ji,jj,:,jl) = ( t_s (ji,jj,:,jl) * zwgt1 + dta%t_s(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Snow temperature
-            t_su(ji,jj,  jl) = ( t_su(ji,jj,  jl) * zwgt1 + dta%tsu(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Surf temperature
-            s_i (ji,jj,  jl) = ( s_i (ji,jj,  jl) * zwgt1 + dta%s_i(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  salinity
+            t_i (ji,jj,:,jl) =                              dta%t_i(i_bdy,jl)          * tmask(ji,jj,1)  ! Ice  temperature
+            t_s (ji,jj,:,jl) =                              dta%t_s(i_bdy,jl)          * tmask(ji,jj,1)  ! Snow temperature
+            t_su(ji,jj,  jl) =                              dta%tsu(i_bdy,jl)          * tmask(ji,jj,1)  ! Surf temperature
+            s_i (ji,jj,  jl) =                              dta%s_i(i_bdy,jl)          * tmask(ji,jj,1)  ! Ice  salinity
             a_ip(ji,jj,  jl) = ( a_ip(ji,jj,  jl) * zwgt1 + dta%aip(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  pond concentration
             h_ip(ji,jj,  jl) = ( h_ip(ji,jj,  jl) * zwgt1 + dta%hip(i_bdy,jl) * zwgt ) * tmask(ji,jj,1)  ! Ice  pond depth
@@ -363 +363 @@
                      !     i-1  i   i    |  !        i  i i+1 |  !          i  i i+1 |
                      !      >  ice  >    |  !        o  > ice |  !          o  >  o  |      
-                     ! => set at u_ice(i-1) !  => set to O       !  => unchanged
+                     ! => set at u_ice(i-1) !  => set to u_oce   !  => unchanged
                      IF( zflag == -1. .AND. ji > 1 .AND. ji < jpi )   THEN  
                         IF    ( vt_i(ji  ,jj) > 0. )   THEN   ;   u_ice(ji,jj) = u_ice(ji-1,jj) 
-                        ELSEIF( vt_i(ji+1,jj) > 0. )   THEN   ;   u_ice(ji,jj) = 0._wp
+                        ELSEIF( vt_i(ji+1,jj) > 0. )   THEN   ;   u_ice(ji,jj) = u_oce(ji,jj)
                         END IF
                      END IF
                      ! |    i  i+1 i+1        !  |  i   i i+1        !  | i  i i+1
                      ! |    >  ice  >         !  | ice  >  o         !  | o  >  o   
-                     ! => set at u_ice(i+1)   !     => set to O      !     =>  unchanged
+                     ! => set at u_ice(i+1)   !     => set to u_oce  !     =>  unchanged
                      IF( zflag ==  1. .AND. ji+1 < jpi+1 )   THEN
                         IF    ( vt_i(ji+1,jj) > 0. )   THEN   ;   u_ice(ji,jj) = u_ice(ji+1,jj)
-                        ELSEIF( vt_i(ji  ,jj) > 0. )   THEN   ;   u_ice(ji,jj) = 0._wp
+                        ELSEIF( vt_i(ji  ,jj) > 0. )   THEN   ;   u_ice(ji,jj) = u_oce(ji,jj)
                         END IF
                      END IF
@@ -395 +395 @@
                      !      ice   (jj  )       !       o    (jj  )       !       o    (jj  )       
                      !       ^    (jj-1)       !                         !
-                     ! => set to u_ice(jj-1)   !  =>   set to 0          !   => unchanged        
+                     ! => set to u_ice(jj-1)   !  =>   set to v_oce      !   => unchanged        
                      IF( zflag == -1. .AND. jj > 1 .AND. jj < jpj )   THEN                 
                         IF    ( vt_i(ji,jj  ) > 0. )   THEN   ;   v_ice(ji,jj) = v_ice(ji,jj-1)
-                        ELSEIF( vt_i(ji,jj+1) > 0. )   THEN   ;   v_ice(ji,jj) = 0._wp
+                        ELSEIF( vt_i(ji,jj+1) > 0. )   THEN   ;   v_ice(ji,jj) = v_oce(ji,jj)
                         END IF
                      END IF
@@ -405 +405 @@
                      !       ^    (jj  )       !       ^    (jj  )       !       ^    (jj  )
                      !   ________________      !  ____ice___(jj  )_      !  _____o____(jj  ) 
-                     ! => set to u_ice(jj+1)   !    => set to 0          !    => unchanged  
+                     ! => set to u_ice(jj+1)   !    => set to v_oce      !    => unchanged  
                      IF( zflag ==  1. .AND. jj < jpj )   THEN              
                         IF    ( vt_i(ji,jj+1) > 0. )   THEN   ;   v_ice(ji,jj) = v_ice(ji,jj+1)
-                        ELSEIF( vt_i(ji,jj  ) > 0. )   THEN   ;   v_ice(ji,jj) = 0._wp
+                        ELSEIF( vt_i(ji,jj  ) > 0. )   THEN   ;   v_ice(ji,jj) = v_oce(ji,jj)
                         END IF
                      END IF