Changeset 11888

Timestamp:

2019-11-12T10:09:51+01:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2197, small changes to improve code structure

File:

• NEMO/branches/UKMO/dev_r10037_GPU/src/ICE/icedyn_rhg_evp.F90 (modified) (1 diff)

NEMO/branches/UKMO/dev_r10037_GPU/src/ICE/icedyn_rhg_evp.F90

@@ -401 +401 @@
          CALL lbc_lnk( zp_delt, 'T', 1. )
 
-         DO jj = 1, jpjm1
-            DO ji = 1, jpim1
-
-               ! alpha & beta for aEVP
-               IF( ln_aEVP ) THEN
+         IF( ln_aEVP ) THEN
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1
+
+                  ! alpha & beta for aEVP
                   zalph2   = MAX( 50._wp, rpi * SQRT( 0.5_wp * zp_delt(ji,jj) * r1_e1e2t(ji,jj) * zdt_m(ji,jj) ) )
                   z1_alph2 = 1._wp / ( zalph2 + 1._wp )
                   zbeta(ji,jj) = zalph2
-               ENDIF
-               
+               
+                  ! P/delta at F points
+                  zp_delf = 0.25_wp * ( zp_delt(ji,jj) + zp_delt(ji+1,jj) + zp_delt(ji,jj+1) + zp_delt(ji+1,jj+1) )
+               
+                  ! stress at F points
+                  zs12(ji,jj)= ( zs12(ji,jj) * zalph2 + zp_delf * ( zds(ji,jj) * z1_ecc2 ) * 0.5_wp ) * z1_alph2
+
+               END DO
+            END DO
+         ELSE
+            DO jj = 1, jpjm1
+               DO ji = 1, jpim1
+
                ! P/delta at F points
                zp_delf = 0.25_wp * ( zp_delt(ji,jj) + zp_delt(ji+1,jj) + zp_delt(ji,jj+1) + zp_delt(ji+1,jj+1) )
-               
+
                ! stress at F points
                zs12(ji,jj)= ( zs12(ji,jj) * zalph2 + zp_delf * ( zds(ji,jj) * z1_ecc2 ) * 0.5_wp ) * z1_alph2
 
-            END DO
-         END DO
+               END DO
+            END DO
+         ENDIF
 
          ! --- Ice internal stresses (Appendix C of Hunke and Dukowicz, 2002) --- !