Changeset 15550

Timestamp:

2021-11-28T21:02:31+01:00 (2 years ago)

Author:

clem

Message:

slightly change ice rheology (no impact since it is an option we do not use)

File:

• NEMO/trunk/src/ICE/icedyn_rhg_evp.F90 (modified) (3 diffs)

NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

@@ -179 +179 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zdiag_yatrp     ! Y-component of area transport (m2/s)
       !! -- advect fields at the rheology time step for the calculation of strength
-      !!    it seems that convergence is worse when ll_advups=true. So it not really a good idea
+      !!    it seems that convergence is worse when ll_advups=true. So it is not really a good idea
       LOGICAL  ::   ll_advups = .FALSE.
       REAL(wp) ::   zdt_ups
-      REAL(wp), ALLOCATABLE, DIMENSION(:,:)   ::   ztmp
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   za_i_ups, zv_i_ups   ! tracers advected upstream
       !!-------------------------------------------------------------------
@@ -695 +694 @@
             IF( jter == 1 ) THEN                               ! init
                ALLOCATE( za_i_ups(jpi,jpj,jpl), zv_i_ups(jpi,jpj,jpl) )
-               ALLOCATE( ztmp(jpi,jpj) )
                zdt_ups = rDt_ice / REAL( nn_nevp )
                za_i_ups(:,:,:) = a_i(:,:,:)
@@ -706 +704 @@
             CALL rhg_upstream( jter, zdt_ups, u_ice, v_ice, zv_i_ups )   ! upstream advection: v_i
             !
-            DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )    ! strength
+            DO_2D( 0, 0, 0, 0 )    ! strength
                strength(ji,jj) = rn_pstar * SUM( zv_i_ups(ji,jj,:) ) * EXP( -rn_crhg * ( 1._wp - SUM( za_i_ups(ji,jj,:) ) ) )
             END_2D
-            IF( nn_hls == 1 )  CALL lbc_lnk( 'icedyn_rhg_evp', strength, 'T', 1.0_wp )
-            !
-            DO_2D( 0, 0, 0, 0 )                                ! strength smoothing
-               IF( SUM( za_i_ups(ji,jj,:) ) > 0._wp ) THEN
-                  ztmp(ji,jj) = ( 4._wp * strength(ji,jj) + strength(ji-1,jj  ) + strength(ji+1,jj  ) &
-                     &                                    + strength(ji  ,jj-1) + strength(ji  ,jj+1) &
-                     &          ) / ( 4._wp + tmask(ji-1,jj,1) + tmask(ji+1,jj,1) + tmask(ji,jj-1,1) + tmask(ji,jj+1,1) )
-               ELSE
-                  ztmp(ji,jj) = 0._wp
-               ENDIF
-            END_2D
-            DO_2D( 0, 0, 0, 0 )
-               strength(ji,jj) = ztmp(ji,jj)
-            END_2D
             !
             IF( jter == nn_nevp ) THEN
                DEALLOCATE( za_i_ups, zv_i_ups )
-               DEALLOCATE( ztmp )
             ENDIF
          ENDIF