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 11888 for NEMO/branches/UKMO – NEMO

Changeset 11888 for NEMO/branches/UKMO


Ignore:
Timestamp:
2019-11-12T10:09:51+01:00 (4 years ago)
Author:
andmirek
Message:

Ticket #2197, small changes to improve code structure

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/dev_r10037_GPU/src/ICE/icedyn_rhg_evp.F90

    r11467 r11888  
    401401         CALL lbc_lnk( zp_delt, 'T', 1. ) 
    402402 
    403          DO jj = 1, jpjm1 
    404             DO ji = 1, jpim1 
    405  
    406                ! alpha & beta for aEVP 
    407                IF( ln_aEVP ) THEN 
     403         IF( ln_aEVP ) THEN 
     404            DO jj = 1, jpjm1 
     405               DO ji = 1, jpim1 
     406 
     407                  ! alpha & beta for aEVP 
    408408                  zalph2   = MAX( 50._wp, rpi * SQRT( 0.5_wp * zp_delt(ji,jj) * r1_e1e2t(ji,jj) * zdt_m(ji,jj) ) ) 
    409409                  z1_alph2 = 1._wp / ( zalph2 + 1._wp ) 
    410410                  zbeta(ji,jj) = zalph2 
    411                ENDIF 
    412                 
     411                
     412                  ! P/delta at F points 
     413                  zp_delf = 0.25_wp * ( zp_delt(ji,jj) + zp_delt(ji+1,jj) + zp_delt(ji,jj+1) + zp_delt(ji+1,jj+1) ) 
     414                
     415                  ! stress at F points 
     416                  zs12(ji,jj)= ( zs12(ji,jj) * zalph2 + zp_delf * ( zds(ji,jj) * z1_ecc2 ) * 0.5_wp ) * z1_alph2 
     417 
     418               END DO 
     419            END DO 
     420         ELSE 
     421            DO jj = 1, jpjm1 
     422               DO ji = 1, jpim1 
     423 
    413424               ! P/delta at F points 
    414425               zp_delf = 0.25_wp * ( zp_delt(ji,jj) + zp_delt(ji+1,jj) + zp_delt(ji,jj+1) + zp_delt(ji+1,jj+1) ) 
    415                 
     426 
    416427               ! stress at F points 
    417428               zs12(ji,jj)= ( zs12(ji,jj) * zalph2 + zp_delf * ( zds(ji,jj) * z1_ecc2 ) * 0.5_wp ) * z1_alph2 
    418429 
    419             END DO 
    420          END DO 
     430               END DO 
     431            END DO 
     432         ENDIF 
    421433 
    422434         ! --- Ice internal stresses (Appendix C of Hunke and Dukowicz, 2002) --- ! 
Note: See TracChangeset for help on using the changeset viewer.