New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 15682 – NEMO

Changeset 15682


Ignore:
Timestamp:
2022-02-01T18:20:35+01:00 (2 years ago)
Author:
edblockley
Message:

Back porting rheology diagnostics fixes from trunk - for the Lemieux and Dupont now as well as Hunke and Dukowicz/SIMIP

Location:
NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology_fix/src/ICE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology_fix/src/ICE/icedyn_rhg_eap.F90

    r15679 r15682  
    939939               ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008), T-point 
    940940               zsig_I(ji,jj)    =   zsig1 * 0.5_wp                                           ! 1st stress invariant, aka average normal stress, aka negative pressure 
    941                zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )  ! 2nd  ''       '', aka maximum shear stress 
     941               zsig_II(ji,jj)   =   SQRT ( zsig2 * zsig2 * 0.25_wp + zsig12 * zsig12 )       ! 2nd  ''       '', aka maximum shear stress 
    942942       
    943943               ! Normalized  principal stresses (used to display the ellipse) 

  • NEMO/branches/UKMO/NEMO_4.0.4_EAP_rheology_fix/src/ICE/icedyn_rhg_evp.F90

    r15672 r15682  
    873873               ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008), T-point 
    874874               zsig_I(ji,jj)    =   zsig1 * 0.5_wp                                           ! 1st stress invariant, aka average normal stress, aka negative pressure 
    875                zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )  ! 2nd  ''       '', aka maximum shear stress 
     875               zsig_II(ji,jj)   =   SQRT ( zsig2 * zsig2 * 0.25_wp + zsig12 * zsig12 )       ! 2nd  ''       '', aka maximum shear stress 
    876876       
    877877               ! Normalized  principal stresses (used to display the ellipse) 
Note: See TracChangeset for help on using the changeset viewer.