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

Changeset 15346


Ignore:
Timestamp:
2021-10-07T17:22:40+02:00 (3 years ago)
Author:
emmafiedler
Message:

Tidying up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.4_ice_strength/src/ICE/icedyn_rdgrft.F90

    r15344 r15346  
    345345      ! This is in general not equal to one because of divergence during transport 
    346346     ! zasum(1:npti) = pato_i(1:npti) + SUM( pa_i(1:npti,:), dim=2 ) 
    347      ! EF: to match CICE, this should be the following. What is pa_i(:,0)? Very small. 
     347     ! EF: to match CICE, this should be the following. What is pa_i(:,0)?? Very small. 
    348348      zasum(1:npti) = pato_i(1:npti) + SUM( pa_i(1:npti,1:jpl), dim=2 )    
    349349 
     
    453453      DO jl = 1, jpl 
    454454         DO ji = 1, npti 
    455             IF ( apartf(ji,jl) > 0._wp ) THEN  
    456            ! IF ( pa_i(ji,jl) > epsi10 .and. apartf(ji,jl) > 0._wp ) THEN 
     455            IF ( apartf(ji,jl) > 0._wp ) THEN 
    457456               zhmean         = MAX( SQRT( rn_hstar * zhi(ji,jl) ), zhi(ji,jl) * hrdg_hi_min ) 
    458457               hrmin  (ji,jl) = MIN( 2._wp * zhi(ji,jl), 0.5_wp * ( zhmean + zhi(ji,jl) ) ) 
     
    828827      at_i(:,:) = SUM( a_i(:,:,:), dim=3 ) 
    829828      vt_i(:,:) = SUM( v_i(:,:,:), dim=3 ) 
    830  
    831     !  ato_i(:,:) = 1._wp - at_i(:,:) 
    832  
    833     !  DO jj = 1, jpj 
    834     !    ato_i_1d   (ji) = MAX( 0._wp, 1._wp - SUM( at_i(ji,:) ) ) 
    835     !  END DO 
    836829      ! 
    837830      npti = 0   ;   nptidx(:) = 0 
     
    845838      END DO 
    846839 
    847          CALL tab_3d_2d( npti, nptidx(1:npti), a_i_2d  (1:npti,1:jpl), a_i   ) 
    848          CALL tab_3d_2d( npti, nptidx(1:npti), v_i_2d  (1:npti,1:jpl), v_i   ) 
    849          CALL tab_2d_1d( npti, nptidx(1:npti), ato_i_1d(1:npti)      , ato_i ) 
     840      CALL tab_3d_2d( npti, nptidx(1:npti), a_i_2d  (1:npti,1:jpl), a_i   ) 
     841      CALL tab_3d_2d( npti, nptidx(1:npti), v_i_2d  (1:npti,1:jpl), v_i   ) 
     842      CALL tab_2d_1d( npti, nptidx(1:npti), ato_i_1d(1:npti)      , ato_i ) 
    850843 
    851844 
     
    887880           strength_pe(ji,jl) = apartf(ji,jl) * dh2rdg           
    888881 
    889          !  strength_pe(ji,jl) = strength_pe(ji,jl) + apartf(ji,jl) * dh2rdg  !CICE format 
    890  
    891882          ELSE 
    892883 
    893884           strength_pe(ji,jl) = 0._wp 
    894           ! strength_pe(ji,jl) = strength_pe(ji,jl) + 0._wp  !CICE format 
    895885 
    896886          END IF 
     
    901891 
    902892      strength_pe_sum(:) = SUM(strength_pe(:,:), dim=2)  ! Sum over all categories 
    903      ! strength_pe_1d(:) = ???  ! CICE format, already summed so how to convert to 1D?? 
     893 
    904894 
    905895      DO ji = 1, npti   
Note: See TracChangeset for help on using the changeset viewer.