Changeset 13799 for NEMO/branches/2020/dev_r13787_SI3-10_EAP/src

Timestamp:

2020-11-16T12:04:05+01:00 (4 years ago)

Author:

acc

Message:

Branch dev_r13787_SI3-10_EAP. Tidying up. Removing some commented debug statements and applying do loop macros consistently

File:

• NEMO/branches/2020/dev_r13787_SI3-10_EAP/src/ICE/icedyn_rhg_eap.F90 (modified) (10 diffs)

NEMO/branches/2020/dev_r13787_SI3-10_EAP/src/ICE/icedyn_rhg_eap.F90

@@ -430 +430 @@
                &   + zds(ji,jj-1) * e1e2f(ji,jj-1) + zds(ji-1,jj-1) * e1e2f(ji-1,jj-1)  &
                &   ) * 0.25_wp * r1_e1e2t(ji,jj)
-            !WRITE(numout,*) 'shear output', ji, jj, zdsT
             
            ! divergence at T points (duplication to avoid communications)
@@ -447 +446 @@
 
             ! structure tensor update
-!!$               IF (mod(jter,10) == 0) THEN
                CALL calc_ffrac(zstressptmp, zstressmtmp, zstress12tmp(ji,jj), paniso_11(ji,jj), paniso_12(ji,jj), zmresult11,  zmresult12)
 
-!!$                  paniso_11(ji,jj) = (paniso_11(ji,jj)*z1_dtevp_A  + zp5kth + zmresult11) * z1dtevpkth ! implicit
-!!$                  paniso_12(ji,jj) = (paniso_12(ji,jj)*z1_dtevp_A  + zmresult12) * z1dtevpkth ! implicit
                paniso_11(ji,jj) = (paniso_11(ji,jj)  + 0.5*2.e-5*zdtevp + zmresult11*zdtevp) / (1. + 2.e-5*zdtevp) ! implicit
                paniso_12(ji,jj) = (paniso_12(ji,jj)                     + zmresult12*zdtevp) / (1. + 2.e-5*zdtevp) ! implicit
-!!$               ENDIF
 
             IF (jter == nn_nevp) THEN
@@ -479 +474 @@
 
             ! stress at T points (zkt/=0 if landfast)
-            !zs1(ji,jj) = ( zs1(ji,jj)*zalph1 + zp_delt(ji,jj) * ( zdiv*(1._wp + zkt) - zdelta(ji,jj)*(1._wp - zkt) ) ) * z1_alph1
-            !zs2(ji,jj) = ( zs2(ji,jj)*zalph2 + zp_delt(ji,jj) * ( zdt * z1_ecc2 * (1._wp + zkt) ) ) * z1_alph2
-!!$               zs1(ji,jj) = ( zs1(ji,jj) + zstressptmp * zalph1  ) * z1_alph1
-!!$               zs2(ji,jj) = ( zs2(ji,jj) + zstressmtmp * zalph1  ) * z1_alph1
             zs1(ji,jj) = ( zs1(ji,jj) * zalph1 + zstressptmp ) * z1_alph1
             zs2(ji,jj) = ( zs2(ji,jj) * zalph1 + zstressmtmp ) * z1_alph1
-            !zs1(ji,jj) = ( stressptmp * zs1(ji,jj) + zalph1  ) * z1_alph1
-            !zs2(ji,jj) = ( stressmtmp * zs2(ji,jj) + zalph1  ) * z1_alph1
-            !WRITE(numout,*) 'stress output', ji, jj, zs1(ji,jj)
          END_2D
          CALL lbc_lnk_multi( 'icedyn_rhg_eap', zstress12tmp, 'T', 1.0_wp , paniso_11, 'T', 1.0_wp , paniso_12, 'T', 1.0_wp)
@@ -514 +502 @@
             
             ! stress at F points (zkt/=0 if landfast)
-            !zs12(ji,jj)= ( zs12(ji,jj) * zalph2 + zp_delf * ( zds(ji,jj) * z1_ecc2 * (1._wp + zkt) ) * 0.5_wp ) * z1_alph2
-!!$               zs12(ji,jj) = ( zs12(ji,jj) + zstress12tmpF * zalph1  ) * z1_alph1
             zs12(ji,jj) = ( zs12(ji,jj) * zalph1 + zstress12tmpF ) * z1_alph1
-            !zs12(ji,jj) = ( stress12tmpF * zs12(ji,jj) + zalph1  ) * z1_alph1
 
          END_2D
@@ -598 +583 @@
             !
 #if defined key_agrif
-!!            CALL agrif_interp_ice( 'V', jter, nn_nevp )
+!!          CALL agrif_interp_ice( 'V', jter, nn_nevp )
             CALL agrif_interp_ice( 'V' )
 #endif
@@ -650 +635 @@
             !
 #if defined key_agrif
-!!            CALL agrif_interp_ice( 'U', jter, nn_nevp )
+!!          CALL agrif_interp_ice( 'U', jter, nn_nevp )
             CALL agrif_interp_ice( 'U' )
 #endif
@@ -704 +689 @@
             !
 #if defined key_agrif
-!!            CALL agrif_interp_ice( 'U', jter, nn_nevp )
+!!          CALL agrif_interp_ice( 'U', jter, nn_nevp )
             CALL agrif_interp_ice( 'U' )
 #endif
@@ -756 +741 @@
             !
 #if defined key_agrif
-!!            CALL agrif_interp_ice( 'V', jter, nn_nevp )
+!!          CALL agrif_interp_ice( 'V', jter, nn_nevp )
             CALL agrif_interp_ice( 'V' )
 #endif
@@ -1277 +1262 @@
       zsig22  = pstrength*(zstemp22r + kfriction*zstemp22s) * zinvsin
 
-      !WRITE(numout,*) 'principal axis stress inside loop', sig11, sig12, sig22
-
       ! Back - rotation of the stress from principal axes into general coordinates
 
@@ -1438 +1421 @@
             !
             IF( MIN( id1, id2, id3, id4, id5 ) > 0 ) THEN      ! fields exist
-               CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i  )
-               CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i  )
-               CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i )
-               CALL iom_get( numrir, jpdom_autoglo, 'aniso_11'  , aniso_11   )
-               CALL iom_get( numrir, jpdom_autoglo, 'aniso_12'  , aniso_12   )
+               CALL iom_get( numrir, jpdom_auto, 'stress1_i' , stress1_i , cd_type = 'T' )
+               CALL iom_get( numrir, jpdom_auto, 'stress2_i' , stress2_i , cd_type = 'T' )
+               CALL iom_get( numrir, jpdom_auto, 'stress12_i', stress12_i, cd_type = 'F' )
+               CALL iom_get( numrir, jpdom_auto, 'aniso_11'  , aniso_11  , cd_type = 'T' )
+               CALL iom_get( numrir, jpdom_auto, 'aniso_12'  , aniso_12  , cd_type = 'T' )
             ELSE                                     ! start rheology from rest
                IF(lwp) WRITE(numout,*)