Changeset 12336


Ignore:
Timestamp:
2020-01-24T17:25:42+01:00 (9 months ago)
Author:
acc
Message:

Branch 2019/dev_r11943_MERGE_2019. A few neutral changes to loop statements so that the perl scripts to perform the upcoming DO LOOP macros substitutions will recognise a few loops that diverge from the common coding convention. These include loops where ji and jj are unnecessarily swapped in order; loops that use jpi-1 (for example) instead of jpim1 and loops with comments between the END DO statements

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIA/diaar5.F90

    r12193 r12336  
    299299          ELSE 
    300300            DO jk = 1, jpk 
    301                DO ji = 1, jpi 
    302                   DO jj = 1, jpj 
     301               DO jj = 1, jpj 
     302                  DO ji = 1, jpi 
    303303                     zpe(ji,jj) = zpe(ji,jj) + avt(ji,jj,jk) * MIN(0._wp,rn2(ji,jj,jk)) * rau0 * e3w(ji,jj,jk,Kmm) 
    304304                  END DO 
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isftbl.F90

    r12077 r12336  
    259259      ! test: this routine run with pdep = 0 should return 1 
    260260      ! 
    261       DO ji = 1, jpi 
    262          DO jj = 1, jpj 
     261      DO jj = 1, jpj 
     262         DO ji = 1, jpi 
    263263            ! comput ktop 
    264264            ikt = 2 
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/STO/stopar.F90

    r11960 r12336  
    847847      INTEGER  :: ji, jj 
    848848 
    849       DO jj = 2, jpj-1 
    850          DO ji = 2, jpi-1 
     849      DO jj = 2, jpjm1 
     850         DO ji = 2, jpim1 
    851851            psto(ji,jj) = 0.5_wp * psto(ji,jj) + 0.125_wp * & 
    852852                              &  ( psto(ji-1,jj) + psto(ji+1,jj) +  & 
  • NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ZDF/zdfiwm.F90

    r12236 r12336  
    169169            END DO 
    170170         END DO 
     171      END DO 
    171172!!gm delta(gde3w) = e3t(:,:,:,Kmm)  !!  Please verify the grid-point position w versus t-point 
    172173!!gm it seems to me that only 1/hcri_iwm  is used ==>  compute it one for all 
    173174 
    174       END DO 
    175175 
    176176      !                        !* Pycnocline-intensified mixing: distribute energy over the time-varying  
Note: See TracChangeset for help on using the changeset viewer.