Changeset 15691

Timestamp:

2022-02-03T16:20:13+01:00 (2 years ago)

Author:

edblockley

Message:

Update to rheology routine to fix stress/strain diagnostics

File:

• NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icedyn_rhg_evp.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GO8_package/src/ICE/icedyn_rhg_evp.F90

@@ -839 +839 @@
                ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008)
                zsig_I (ji,jj)   =   zsig1 * 0.5_wp                                           ! 1st stress invariant, aka average normal stress, aka negative pressure
-               zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )  ! 2nd  ''       '', aka maximum shear stress
+               zsig_II(ji,jj)   =   SQRT( zsig2 * zsig2 * 0.25_wp + zsig12 * zsig12 )        ! 2nd  ''       '', aka maximum shear stress
                
             END DO
@@ -873 +873 @@
 !!$               ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008), T-point
 !!$               zsig_I(ji,jj)    =   zsig1 * 0.5_wp                                           ! 1st stress invariant, aka average normal stress, aka negative pressure
-!!$               zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )  ! 2nd  ''       '', aka maximum shear stress
+!!$               zsig_II(ji,jj)   =   SQRT( zsig2 * zsig2 * 0.25_wp + zsig12 * zsig12 )        ! 2nd  ''       '', aka maximum shear stress
 !!$      
 !!$               ! Normalized  principal stresses (used to display the ellipse)
@@ -882 +882 @@
 !!$         END DO               
 !!$         !
-!!$         CALL iom_put( 'sig1_pnorm' , zsig1_p ) 
-!!$         CALL iom_put( 'sig2_pnorm' , zsig2_p ) 
+!!$         IF( iom_use('sig1_pnorm') )  CALL iom_put( 'sig1_pnorm' , zsig1_p(:,:) * zmsk00(:,:) ) 
+!!$         IF( iom_use('sig2_pnorm') )  CALL iom_put( 'sig2_pnorm' , zsig2_p(:,:) * zmsk00(:,:) ) 
 !!$      
 !!$         DEALLOCATE( zsig1_p , zsig2_p , zsig_I, zsig_II )