Changeset 15516

Timestamp:

2021-11-16T15:40:29+01:00 (3 years ago)

Author:

vancop

Message:

fixes in diagnostics

Location:

NEMO/branches/2020/SI3-03_VP_rheology/src/ICE

Files:

• icedyn_rhg_evp.F90 (modified) (8 diffs)
• icedyn_rhg_vp.F90 (modified) (1 diff)

NEMO/branches/2020/SI3-03_VP_rheology/src/ICE/icedyn_rhg_evp.F90

@@ -134 +134 @@
       REAL(wp) ::   zintb, zintn                                        ! dummy argument
       REAL(wp) ::   zfac_x, zfac_y
-      REAL(wp) ::   zshear, zdum1, zdum2
+      REAL(wp) ::   zdum1, zdum2
       !
       REAL(wp), DIMENSION(jpi,jpj) ::   zp_delt                         ! P/delta at T points
-      REAL(wp), DIMENSION(jpi,jpj) ::   zdeltastar_t                    ! Delta* at T-points
-      REAL(wp), DIMENSION(jpi,jpj) ::   zten_i                          ! Tension
+      REAL(wp), DIMENSION(jpi,jpj) ::   zdeltat                         ! Delta at T-points
+      REAL(wp), DIMENSION(jpi,jpj) ::   ztens, zshear                   ! Tension and shear
       REAL(wp), DIMENSION(jpi,jpj) ::   zbeta                           ! beta coef from Kimmritz 2017
       !
@@ -410 +410 @@
                zdelta = SQRT( zdiv2 + ( zdt2 + zds2 ) * z1_ecc2 )  
                
-               zdeltastar_t(ji,jj) = zdelta + rn_creepl                     ! store delta* at previous iterate (for ellipse computation)
+               zdeltat(ji,jj) = zdelta  ! store delta at previous iterate (for ellipse computation)
 
                ! P/delta at T points
@@ -758 +758 @@
             zdt2 = zdt * zdt
             
-            zten_i(ji,jj) = zdt
+            ztens(ji,jj) = zdt
             
             ! shear**2 at T points (doc eq. A16)
@@ -764 +764 @@
                &   + zds(ji,jj-1) * zds(ji,jj-1) * e1e2f(ji,jj-1) + zds(ji-1,jj-1) * zds(ji-1,jj-1) * e1e2f(ji-1,jj-1)  &
                &   ) * 0.25_wp * r1_e1e2t(ji,jj)
+
+            zshear(ji,jj) = SQRT( zds2 )
             
-            ! shear at T points
+            ! maximum shear rate at T points (includes tension, output only)
             pshear_i(ji,jj) = SQRT( zdt2 + zds2 )
 
@@ -827 +829 @@
                zfac             =   strength(ji,jj) / ( pdelta_i(ji,jj) + rn_creepl ) 
                zsig1            =   zfac * ( pdivu_i(ji,jj) - pdelta_i(ji,jj) )
-               zsig2            =   zfac * z1_ecc2 * zten_i(ji,jj)
-               zsig12           =   zfac * z1_ecc2 * pshear_i(ji,jj)
+               zsig2            =   zfac * z1_ecc2 * ztens(ji,jj)
+               zsig12           =   zfac * z1_ecc2 * zshear(ji,jj) * 0.5_wp
                
                ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008)
@@ -863 +865 @@
                !                        following Lemieux & Dupont (2020)
                zfac             =   zp_delt(ji,jj)
-               zsig1            =   zfac * ( pdivu_i(ji,jj) - zdeltastar_t(ji,jj) )
-               zsig2            =   zfac * z1_ecc2 * zten_i(ji,jj)
-               zsig12           =   zfac * z1_ecc2 * pshear_i(ji,jj)
+               zsig1            =   zfac * ( pdivu_i(ji,jj) - zdeltat(ji,jj) )
+               zsig2            =   zfac * z1_ecc2 * ztens(ji,jj)
+               zsig12           =   zfac * z1_ecc2 * zshear(ji,jj) * 0.5_wp
                
                ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008), T-point
@@ -1004 +1006 @@
 
       ! time
-      it = ( kt - 1 ) * kitermax + kiter
+      it = ( kt - nit000 ) * kitermax + kiter
       
       ! convergence
@@ -1024 +1026 @@
          istatus = NF90_PUT_VAR( ncvgid, nvarid, (/zresm/), (/it/), (/1/) )
          ! close file
-         IF( kt == nitend )   istatus = NF90_CLOSE(ncvgid)
+         IF( kt == nitend - nn_fsbc + 1 .AND. kiter == kitermax )    istatus = NF90_CLOSE( ncvgid )
       ENDIF
       

NEMO/branches/2020/SI3-03_VP_rheology/src/ICE/icedyn_rhg_vp.F90

@@ -1128 +1128 @@
 
                CALL rhg_cvg_vp( kt, i_out, i_inn, i_inn_tot, nn_nout_vp, nn_ninn_vp, nn_nvp,        &
-                      &         u_ice, v_ice, zu_b, zv_b, zu_b_outer, zv_b_outer,                   &
+                      &         u_ice, v_ice, zu_b, zv_b, zu_c, zv_c_outer                 ,        &
                       &         zmt, za_iU, za_iV, zuerr_max, zverr_max, zglob_area,                &
                       &         zrhsu, zAU, zBU, zCU, zDU, zEU, zFU,                                &