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 12353 for NEMO/branches/2019/dev_r11943_MERGE_2019/tests – NEMO

Ignore:
Timestamp:
2020-01-29T17:15:37+01:00 (4 years ago)
Author:
acc
Message:

Branch 2019/dev_r11943_MERGE_2019. Additions to the do loop macro implementation: converted a few loops previously missed because they used jpi-1 instead of jpim1 etc.; changed internal macro names in do_loop_substitute.h90 to strings that are much more unlikely to appear in any future code elsewhere and removed the key_vectopt_loop option (and all related code) since the do loop macros have suppressed this option. These changes have been fully SETTE-tested and this branch should now be ready to go back to the trunk.

Location:
NEMO/branches/2019/dev_r11943_MERGE_2019/tests
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/diawri.F90

    r11949 r12353  
    7777   INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_bT 
    7878 
    79    !! * Substitutions 
    80 #  include "vectopt_loop_substitute.h90" 
    8179   !!---------------------------------------------------------------------- 
    8280   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/usrdef_zgr.F90

    r11536 r12353  
    3030   PUBLIC   usr_def_zgr        ! called by domzgr.F90 
    3131 
    32   !! * Substitutions 
    33 #  include "vectopt_loop_substitute.h90" 
    3432   !!---------------------------------------------------------------------- 
    3533   !! NEMO/OPA 4.0 , NEMO Consortium (2016) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/BENCH/MY_SRC/zdfiwm.F90

    r11960 r12353  
    4848   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hcri_iwm   ! decay scale for low-mode critical slope dissipation (m) 
    4949 
    50    !! * Substitutions 
    51 #  include "vectopt_loop_substitute.h90" 
    5250   !!---------------------------------------------------------------------- 
    5351   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/diawri.F90

    r12252 r12353  
    7676   INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_bT 
    7777 
    78    !! * Substitutions 
    79 #  include "vectopt_loop_substitute.h90" 
    8078   !!---------------------------------------------------------------------- 
    8179   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/domvvl.F90

    r11960 r12353  
    6262   REAL(wp)        , ALLOCATABLE, SAVE, DIMENSION(:,:)   :: frq_rst_hdv                 ! retoring period for low freq. divergence 
    6363 
    64    !! * Substitutions 
    65 #  include "vectopt_loop_substitute.h90" 
    6664   !!---------------------------------------------------------------------- 
    6765   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/trazdf.F90

    r11949 r12353  
    3535   PUBLIC   tra_zdf_imp   ! called by trczdf.F90 
    3636 
    37    !! * Substitutions 
    38 #  include "vectopt_loop_substitute.h90" 
    3937   !!---------------------------------------------------------------------- 
    4038   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3131   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    33    !! * Substitutions 
    34 #  include "vectopt_loop_substitute.h90" 
    3533   !!---------------------------------------------------------------------- 
    3634   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/CANAL/MY_SRC/usrdef_zgr.F90

    r10425 r12353  
    3131   PUBLIC   usr_def_zgr        ! called by domzgr.F90 
    3232 
    33   !! * Substitutions 
    34 #  include "vectopt_loop_substitute.h90" 
    3533   !!---------------------------------------------------------------------- 
    3634   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3333   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3434 
    35    !! * Substitutions 
    36 #  include "vectopt_loop_substitute.h90" 
    3735   !!---------------------------------------------------------------------- 
    3836   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV1D/MY_SRC/usrdef_zgr.F90

    r10513 r12353  
    2525   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    2626 
    27   !! * Substitutions 
    28 #  include "vectopt_loop_substitute.h90" 
    2927   !!---------------------------------------------------------------------- 
    3028   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3333   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3434 
    35    !! * Substitutions 
    36 #  include "vectopt_loop_substitute.h90" 
    3735   !!---------------------------------------------------------------------- 
    3836   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_ADV2D/MY_SRC/usrdef_zgr.F90

    r10515 r12353  
    2525   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    2626 
    27   !! * Substitutions 
    28 #  include "vectopt_loop_substitute.h90" 
    2927   !!---------------------------------------------------------------------- 
    3028   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3333   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3434 
    35    !! * Substitutions 
    36 #  include "vectopt_loop_substitute.h90" 
    3735   !!---------------------------------------------------------------------- 
    3836   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ICE_AGRIF/MY_SRC/usrdef_zgr.F90

    r10516 r12353  
    2525   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    2626 
    27   !! * Substitutions 
    28 #  include "vectopt_loop_substitute.h90" 
    2927   !!---------------------------------------------------------------------- 
    3028   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/eosbn2.F90

    r12077 r12353  
    180180   REAL(wp) ::   BPE002 
    181181 
    182    !! * Substitutions 
    183 #  include "vectopt_loop_substitute.h90" 
    184182   !!---------------------------------------------------------------------- 
    185183   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/istate.F90

    r12077 r12353  
    4141   PUBLIC   istate_init   ! routine called by step.F90 
    4242 
    43    !! * Substitutions 
    44 #  include "vectopt_loop_substitute.h90" 
    4543   !!---------------------------------------------------------------------- 
    4644   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/sbcfwb.F90

    r12077 r12353  
    3939   REAL(wp) ::   area      ! global mean ocean surface (interior domain) 
    4040 
    41    !! * Substitutions 
    42 #  include "vectopt_loop_substitute.h90" 
    4341   !!---------------------------------------------------------------------- 
    4442   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/tradmp.F90

    r12077 r12353  
    5151   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   resto    !: restoring coeff. on T and S (s-1) 
    5252 
    53    !! * Substitutions 
    54 #  include "vectopt_loop_substitute.h90" 
    5553   !!---------------------------------------------------------------------- 
    5654   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP+/MY_SRC/usrdef_sbc.F90

    r12077 r12353  
    3232   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3333 
    34    !! * Substitutions 
    35 #  include "vectopt_loop_substitute.h90" 
    3634   !!---------------------------------------------------------------------- 
    3735   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3232   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3333 
    34    !! * Substitutions 
    35 #  include "vectopt_loop_substitute.h90" 
    3634   !!---------------------------------------------------------------------- 
    3735   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/ISOMIP/MY_SRC/usrdef_zgr.F90

    r10491 r12353  
    3030   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    3131 
    32   !! * Substitutions 
    33 #  include "vectopt_loop_substitute.h90" 
    3432   !!---------------------------------------------------------------------- 
    3533   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3131   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    33    !! * Substitutions 
    34 #  include "vectopt_loop_substitute.h90" 
    3533   !!---------------------------------------------------------------------- 
    3634   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90

    r10425 r12353  
    2727   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    2828 
    29   !! * Substitutions 
    30 #  include "vectopt_loop_substitute.h90" 
    3129   !!---------------------------------------------------------------------- 
    3230   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3131   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    33    !! * Substitutions 
    34 #  include "vectopt_loop_substitute.h90" 
    3533   !!---------------------------------------------------------------------- 
    3634   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90

    r11077 r12353  
    2929   PUBLIC   usr_def_zgr   ! called by domzgr.F90 
    3030 
    31   !! * Substitutions 
    32 #  include "vectopt_loop_substitute.h90" 
    3331   !!---------------------------------------------------------------------- 
    3432   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/STATION_ASF/MY_SRC/diawri.F90

    r12249 r12353  
    5555   INTEGER, SAVE, ALLOCATABLE, DIMENSION(:) :: ndex_hT, ndex_hU, ndex_hV 
    5656 
    57    !! * Substitutions 
    58 #  include "vectopt_loop_substitute.h90" 
    5957   !!---------------------------------------------------------------------- 
    6058   !! NEMO/SAS 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/domvvl.F90

    r12150 r12353  
    6363   REAL(wp)        , ALLOCATABLE, SAVE, DIMENSION(:,:)   :: frq_rst_hdv                 ! retoring period for low freq. divergence 
    6464 
    65    !! * Substitutions 
    66 #  include "vectopt_loop_substitute.h90" 
    6765   !!---------------------------------------------------------------------- 
    6866   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    … …  
    415413         DO jk = 1, jpkm1        ! a - first derivative: diffusive fluxes 
    416414            DO jj = 1, jpjm1 
    417                DO ji = 1, fs_jpim1   ! vector opt. 
     415               DO ji = 1, jpim1   ! vector opt. 
    418416                  un_td(ji,jj,jk) = rn_ahe3 * umask(ji,jj,jk) * e2_e1u(ji,jj)           & 
    419417                     &            * ( tilde_e3t_b(ji,jj,jk) - tilde_e3t_b(ji+1,jj  ,jk) ) 
    … …  
    433431         DO jk = 1, jpkm1        ! c - second derivative: divergence of diffusive fluxes 
    434432            DO jj = 2, jpjm1 
    435                DO ji = fs_2, fs_jpim1   ! vector opt. 
     433               DO ji = 2, jpim1   ! vector opt. 
    436434                  tilde_e3t_a(ji,jj,jk) = tilde_e3t_a(ji,jj,jk) + (   un_td(ji-1,jj  ,jk) - un_td(ji,jj,jk)    & 
    437435                     &                                          +     vn_td(ji  ,jj-1,jk) - vn_td(ji,jj,jk)    & 
    … …  
    731729         DO jk = 1, jpk 
    732730            DO jj = 1, jpjm1 
    733                DO ji = 1, fs_jpim1   ! vector opt. 
     731               DO ji = 1, jpim1   ! vector opt. 
    734732                  pe3_out(ji,jj,jk) = 0.5_wp * (  umask(ji,jj,jk) * (1.0_wp - zlnwd) + zlnwd ) * r1_e1e2u(ji,jj)   & 
    735733                     &                       * (   e1e2t(ji  ,jj) * ( pe3_in(ji  ,jj,jk) - e3t_0(ji  ,jj,jk) )     & 
    … …  
    744742         DO jk = 1, jpk 
    745743            DO jj = 1, jpjm1 
    746                DO ji = 1, fs_jpim1   ! vector opt. 
     744               DO ji = 1, jpim1   ! vector opt. 
    747745                  pe3_out(ji,jj,jk) = 0.5_wp * ( vmask(ji,jj,jk)  * (1.0_wp - zlnwd) + zlnwd ) * r1_e1e2v(ji,jj)   & 
    748746                     &                       * (   e1e2t(ji,jj  ) * ( pe3_in(ji,jj  ,jk) - e3t_0(ji,jj  ,jk) )     & 
    … …  
    757755         DO jk = 1, jpk 
    758756            DO jj = 1, jpjm1 
    759                DO ji = 1, fs_jpim1   ! vector opt. 
     757               DO ji = 1, jpim1   ! vector opt. 
    760758                  pe3_out(ji,jj,jk) = 0.5_wp * (  umask(ji,jj,jk) * umask(ji,jj+1,jk) * (1.0_wp - zlnwd) + zlnwd ) & 
    761759                     &                       *    r1_e1e2f(ji,jj)                                                  & 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3030   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3131 
    32    !! * Substitutions 
    33 #  include "vectopt_loop_substitute.h90" 
    3432   !!---------------------------------------------------------------------- 
    3533   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/VORTEX/MY_SRC/usrdef_zgr.F90

    r10425 r12353  
    2929   PUBLIC   usr_def_zgr        ! called by domzgr.F90 
    3030 
    31   !! * Substitutions 
    32 #  include "vectopt_loop_substitute.h90" 
    3331   !!---------------------------------------------------------------------- 
    3432   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_sbc.F90

    r11949 r12353  
    3131   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo 
    3232 
    33    !! * Substitutions 
    34 #  include "vectopt_loop_substitute.h90" 
    3533   !!---------------------------------------------------------------------- 
    3634   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 

  • NEMO/branches/2019/dev_r11943_MERGE_2019/tests/WAD/MY_SRC/usrdef_zgr.F90

    r10425 r12353  
    2929   PUBLIC   usr_def_zgr        ! called by domzgr.F90 
    3030 
    31    !! * Substitutions 
    32 #  include "vectopt_loop_substitute.h90" 
    3331   !!---------------------------------------------------------------------- 
    3432   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
Note: See TracChangeset for help on using the changeset viewer.