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 13612 – NEMO

Changeset 13612


Ignore:
Timestamp:
2020-10-14T19:18:19+02:00 (3 years ago)
Author:
clem
Message:

trunk: unwanted commit and therefore errors. Corrected now. It only affects diagnostics but prevents the model from running anyway

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icedyn_rhg_evp.F90

    r13601 r13612  
    148148      ! 
    149149      REAL(wp), DIMENSION(jpi,jpj) ::   zds                             ! shear 
     150      REAL(wp), DIMENSION(jpi,jpj) ::   zten_i                          ! tension 
    150151      REAL(wp), DIMENSION(jpi,jpj) ::   zs1, zs2, zs12                  ! stress tensor components 
    151152      REAL(wp), DIMENSION(jpi,jpj) ::   zsshdyn                         ! array used for the calculation of ice surface slope: 
     
    171172      !! --- diags 
    172173      REAL(wp) ::   zsig1, zsig2, zsig12, zfac, z1_strength 
    173       REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zsig_I, zsig_II, zsig1_p, zsig2_p, zten_i          
     174      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zsig_I, zsig_II, zsig1_p, zsig2_p          
    174175      !! --- SIMIP diags 
    175176      REAL(wp), ALLOCATABLE, DIMENSION(:,:) ::   zdiag_xmtrp_ice ! X-component of ice mass transport (kg/s) 
     
    798799             
    799800            ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008) 
    800             zsig_I (ji,jj)   =   zsig1 * 0.5_wp                              ! 1st stress invariant, aka average normal stress, aka negative pressure 
    801             zsig_II(ji,jj)   =   SQRT ( zsig2 * zsig2 * 0.25_wp + zsig12 )   ! 2nd  ''       '', aka maximum shear stress 
     801            zsig_I (ji,jj)   =   zsig1 * 0.5_wp                                           ! 1st stress invariant, aka average normal stress, aka negative pressure 
     802            zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )  ! 2nd  ''       '', aka maximum shear stress 
    802803                
    803804         END_2D          
     
    830831             
    831832            ! Stress invariants (sigma_I, sigma_II, Coon 1974, Feltham 2008), T-point 
    832             zsig_I(ji,jj)    =   zsig1 * 0.5_wp                              ! 1st stress invariant, aka average normal stress, aka negative pressure 
    833             zsig_II(ji,jj)   =   SQRT ( zsig2 * zsig2 * 0.25_wp + zsig12 )   ! 2nd  ''       '', aka maximum shear stress 
     833            zsig_I(ji,jj)    =   zsig1 * 0.5_wp                                            ! 1st stress invariant, aka average normal stress, aka negative pressure 
     834            zsig_II(ji,jj)   =   SQRT ( MAX( 0._wp, zsig2 * zsig2 * 0.25_wp + zsig12 ) )   ! 2nd  ''       '', aka maximum shear stress 
    834835             
    835836            ! Normalized  principal stresses (used to display the ellipse) 
Note: See TracChangeset for help on using the changeset viewer.