Changeset 1694
- Timestamp:
- 2009-10-30T17:06:23+01:00 (14 years ago)
- Location:
- trunk/NEMO
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/LIM_SRC_2/limdyn_2.F90
r1470 r1694 158 158 ! frictional velocity at T-point 159 159 DO jj = 2, jpjm1 160 DO ji = 2, jpim1 ! NO vector opt. 160 DO ji = 2, jpim1 ! NO vector opt. because of zu_io 161 161 ust2s(ji,jj) = 0.5 * cw & 162 162 & * ( zu_io(ji,jj) * zu_io(ji,jj) + zu_io(ji-1,jj) * zu_io(ji-1,jj) & -
trunk/NEMO/LIM_SRC_2/limmsh_2.F90
r1156 r1694 157 157 158 158 DO jj = 2, jpj 159 DO ji = 2, jpi 159 DO ji = 2, jpi ! NO vector opt. 160 160 zh1p = e1t(ji ,jj ) * wght(ji,jj,2,2) & 161 161 & + e1t(ji-1,jj ) * wght(ji,jj,1,2) & … … 234 234 tmu(1,:) = 0.e0 235 235 DO jj = 2, jpj ! ice U.V-point: computed from ice T-point mask 236 DO ji = 2, jpim1 236 DO ji = 2, jpim1 ! NO vector opt. 237 237 tmu(ji,jj) = tms(ji,jj) * tms(ji-1,jj) * tms(ji,jj-1) * tms(ji-1,jj-1) 238 238 END DO -
trunk/NEMO/LIM_SRC_2/limsbc_2.F90
r1550 r1694 258 258 259 259 DO jj = 2, jpjm1 260 DO ji = 2, jpim1 260 DO ji = 2, jpim1 ! NO vector opt. 261 261 ! ... ice-cover wheighted ice-ocean stress at U and V-points (from I-point values) 262 262 zutau = 0.5 * ( ztio_u(ji+1,jj) + ztio_u(ji+1,jj+1) ) -
trunk/NEMO/LIM_SRC_2/limtrp_2.F90
r1470 r1694 109 109 zvbord = 1.0 + ( 1.0 - bound ) 110 110 DO jj = 1, jpjm1 111 DO ji = 1, jpim1 111 DO ji = 1, jpim1 ! NO vector opt. 112 112 zui_u(ji,jj) = ( u_ice(ji+1,jj ) + u_ice(ji+1,jj+1) ) / ( MAX( tmu(ji+1,jj ) + tmu(ji+1,jj+1), zvbord ) ) 113 113 zvi_v(ji,jj) = ( v_ice(ji ,jj+1) + v_ice(ji+1,jj+1) ) / ( MAX( tmu(ji ,jj+1) + tmu(ji+1,jj+1), zvbord ) ) -
trunk/NEMO/LIM_SRC_2/limwri_dimg_2.h90
r1470 r1694 95 95 zcmo(:,:, 1:jpnoumax ) = 0.e0 96 96 DO jj = 2 , jpjm1 97 DO ji = 2 , jpim1 97 DO ji = 2 , jpim1 ! NO vector opt. 98 98 zindh = MAX( zzero , SIGN( zone , hicif(ji,jj) * (1.0 - frld(ji,jj) ) - 0.10 ) ) 99 99 zinda = MAX( zzero , SIGN( zone , ( 1.0 - frld(ji,jj) ) - 0.10 ) ) … … 138 138 ! case of instantaneaous output rcmoy(:,:, 1:jpnoumax ) = 0.e0 139 139 DO jj = 2 , jpjm1 140 DO ji = 2 , jpim1 140 DO ji = 2 , jpim1 ! NO vector opt. 141 141 zindh = MAX( zzero , SIGN( zone , hicif(ji,jj) * (1.0 - frld(ji,jj) ) - 0.10 ) ) 142 142 zinda = MAX( zzero , SIGN( zone , ( 1.0 - frld(ji,jj) ) - 0.10 ) ) -
trunk/NEMO/LIM_SRC_3/limmsh.F90
r1608 r1694 104 104 tmv(:,:) = vmask(:,:,1) ! ice V-point : use surface vmask (C-grid EVP) 105 105 DO jj = 1, jpjm1 ! ice F-point : recompute fmask (due to nn_shlat) 106 DO ji = 1 , jpim1 106 DO ji = 1 , jpim1 ! NO vector opt. 107 107 tmf(ji,jj) = tms(ji,jj) * tms(ji+1,jj) * tms(ji,jj+1) * tms(ji+1,jj+1) 108 108 END DO -
trunk/NEMO/LIM_SRC_3/limwri_dimg.h90
r1469 r1694 93 93 zcmo(:,:, 1:jpnoumax ) = 0.e0 94 94 DO jj = 2 , jpjm1 95 DO ji = 2 , jpim1 95 DO ji = 2 , jpim1 ! NO vector opt. 96 96 zindh = MAX( zzero , SIGN( zone , ht_i(ji,jj,1) * (1.0 - frld(ji,jj) ) - 0.10 ) ) 97 97 zinda = MAX( zzero , SIGN( zone , ( 1.0 - frld(ji,jj) ) - 0.10 ) ) … … 136 136 ! case of instantaneaous output rcmoy(:,:, 1:jpnoumax ) = 0.e0 137 137 DO jj = 2 , jpjm1 138 DO ji = 2 , jpim1 138 DO ji = 2 , jpim1 ! NO vector opt. 139 139 zindh = MAX( zzero , SIGN( zone , ht_i(ji,jj,1) * (1.0 - frld(ji,jj) ) - 0.10 ) ) 140 140 zinda = MAX( zzero , SIGN( zone , ( 1.0 - frld(ji,jj) ) - 0.10 ) ) -
trunk/NEMO/OPA_SRC/DOM/dommsk.F90
r1601 r1694 213 213 vmask(ji,jj,jk) = tmask(ji,jj ,jk) * tmask(ji ,jj+1,jk) 214 214 END DO 215 DO ji = 1, jpim1 215 DO ji = 1, jpim1 ! NO vector opt. 216 216 fmask(ji,jj,jk) = tmask(ji,jj ,jk) * tmask(ji+1,jj ,jk) & 217 217 & * tmask(ji,jj+1,jk) * tmask(ji+1,jj+1,jk) -
trunk/NEMO/OPA_SRC/DOM/domvvl.F90
r1566 r1694 117 117 118 118 DO jj = 1, jpjm1 ! initialise before and now Sea Surface Height at u-, v-, f-points 119 DO ji = 1, jpim1 119 DO ji = 1, jpim1 ! NO vector opt. 120 120 zcoefu = 0.5 * umask(ji,jj,1) / ( e1u(ji,jj) * e2u(ji,jj) ) 121 121 zcoefv = 0.5 * vmask(ji,jj,1) / ( e1v(ji,jj) * e2v(ji,jj) ) -
trunk/NEMO/OPA_SRC/DOM/domzgr.F90
r1639 r1694 1253 1253 hbatf(:,:) = rn_sbot_min 1254 1254 DO jj = 1, jpjm1 1255 DO ji = 1, jpim1 1255 DO ji = 1, jpim1 ! NO vector opt. 1256 1256 hbatu(ji,jj) = 0.5 * ( hbatt(ji ,jj) + hbatt(ji+1,jj ) ) 1257 1257 hbatv(ji,jj) = 0.5 * ( hbatt(ji ,jj) + hbatt(ji ,jj+1) ) -
trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r1662 r1694 131 131 ftne(1,:) = 0.e0 ; ftnw(1,:) = 0.e0 ; ftse(1,:) = 0.e0 ; ftsw(1,:) = 0.e0 132 132 DO jj = 2, jpj 133 DO ji = fs_2, jpi !vector opt.133 DO ji = 2, jpi ! NO vector opt. 134 134 ftne(ji,jj) = ( ff(ji-1,jj ) + ff(ji ,jj ) + ff(ji ,jj-1) ) / 3. 135 135 ftnw(ji,jj) = ( ff(ji-1,jj-1) + ff(ji-1,jj ) + ff(ji ,jj ) ) / 3. -
trunk/NEMO/OPA_SRC/DYN/dynvor.F90
r1601 r1694 614 614 END DO 615 615 DO jj = 3, jpj 616 DO ji = fs_2, jpi ! vector opt. 616 DO ji = fs_2, jpi ! vector opt. ok because we start at jj = 3 617 617 ztne(ji,jj) = zwz(ji-1,jj ) + zwz(ji ,jj ) + zwz(ji ,jj-1) 618 618 ztnw(ji,jj) = zwz(ji-1,jj-1) + zwz(ji-1,jj ) + zwz(ji ,jj ) -
trunk/NEMO/OPA_SRC/DYN/sshwzv.F90
r1607 r1694 166 166 IF( lk_vvl ) THEN ! (required only in key_vvl case) 167 167 DO jj = 1, jpjm1 168 DO ji = 1, fs_jpim1 !Vector Opt.168 DO ji = 1, jpim1 ! NO Vector Opt. 169 169 sshu_a(ji,jj) = 0.5 * umask(ji,jj,1) / ( e1u(ji ,jj) * e2u(ji ,jj) ) & 170 170 & * ( e1t(ji ,jj) * e2t(ji ,jj) * ssha(ji ,jj) & -
trunk/NEMO/OPA_SRC/FLO/flodom.F90
r1581 r1694 104 104 # if defined key_mpp_mpi || defined key_mpp_shmem 105 105 DO ji = MAX(nldi,2), nlei 106 DO jj = MAX(nldj,2), nlej 106 DO jj = MAX(nldj,2), nlej ! NO vector opt. 107 107 # else 108 108 DO ji = 2, jpi 109 DO jj = 2, jpj 109 DO jj = 2, jpj ! NO vector opt. 110 110 # endif 111 111 ! For each float we find the indexes of the mesh … … 235 235 # if defined key_mpp_mpi || defined key_mpp_shmem 236 236 DO ji = MAX(nldi,2), nlei 237 DO jj = MAX(nldj,2), nlej 237 DO jj = MAX(nldj,2), nlej ! NO vector opt. 238 238 # else 239 239 DO ji = 2, jpi 240 DO jj = 2, jpj 240 DO jj = 2, jpj ! NO vector opt. 241 241 # endif 242 242 ! for each float we find the indexes of the mesh -
trunk/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90
r1581 r1694 259 259 icof(:,:) = icof(:,:) * tmask(:,:,1) 260 260 DO jj = 1, jpjm1 261 DO ji = 1, jpim1 261 DO ji = 1, jpim1 ! NO vector opt. 262 262 zmsk = tmask(ji,jj+1,1) + tmask(ji+1,jj+1,1) + tmask(ji,jj,1) + tmask(ji,jj+1,1) 263 263 IF( zmsk == 0. ) THEN -
trunk/NEMO/OPA_SRC/LDF/ldfdyn_c3d.h90
r1581 r1694 350 350 icof(:,:) = icof(:,:) * tmask(:,:,1) 351 351 DO jj = 1, jpjm1 352 DO ji = 1, jpim1 352 DO ji = 1, jpim1 ! NO vector opt. 353 353 zmsk = tmask(ji,jj+1,1) + tmask(ji+1,jj+1,1) + tmask(ji,jj,1) + tmask(ji,jj+1,1) 354 354 IF( zmsk == 0. ) THEN -
trunk/NEMO/OPA_SRC/SBC/sbccpl.F90
r1693 r1694 796 796 CASE( 'U' ) 797 797 DO jj = 2, jpjm1 ! (U,V) ==> I 798 DO ji = fs_2, fs_jpim1 !vector opt.798 DO ji = 2, jpim1 ! NO vector opt. 799 799 p_taui(ji,jj) = 0.5 * ( frcv(ji-1,jj ,jpr_itx1) + frcv(ji-1,jj-1,jpr_itx1) ) 800 800 p_tauj(ji,jj) = 0.5 * ( frcv(ji ,jj-1,jpr_ity1) + frcv(ji-1,jj-1,jpr_ity1) ) … … 803 803 CASE( 'F' ) 804 804 DO jj = 2, jpjm1 ! F ==> I 805 DO ji = fs_2, fs_jpim1 !vector opt.805 DO ji = 2, jpim1 ! NO vector opt. 806 806 p_taui(ji,jj) = frcv(ji-1,jj-1,jpr_itx1) 807 807 p_tauj(ji,jj) = frcv(ji-1,jj-1,jpr_ity1) … … 810 810 CASE( 'T' ) 811 811 DO jj = 2, jpjm1 ! T ==> I 812 DO ji = fs_2, fs_jpim1 !vector opt.812 DO ji = 2, jpim1 ! NO vector opt. 813 813 p_taui(ji,jj) = 0.25 * ( frcv(ji,jj ,jpr_itx1) + frcv(ji-1,jj ,jpr_itx1) & 814 814 & + frcv(ji,jj-1,jpr_itx1) + frcv(ji-1,jj-1,jpr_itx1) ) … … 836 836 CASE( 'I' ) 837 837 DO jj = 2, jpjm1 ! I ==> F 838 DO ji = fs_2, fs_jpim1 !vector opt.838 DO ji = 2, jpim1 ! NO vector opt. 839 839 p_taui(ji,jj) = frcv(ji+1,jj+1,jpr_itx1) 840 840 p_tauj(ji,jj) = frcv(ji+1,jj+1,jpr_ity1) … … 843 843 CASE( 'T' ) 844 844 DO jj = 2, jpjm1 ! T ==> F 845 DO ji = fs_2, fs_jpim1 !vector opt.845 DO ji = 2, jpim1 ! NO vector opt. 846 846 p_taui(ji,jj) = 0.25 * ( frcv(ji,jj ,jpr_itx1) + frcv(ji+1,jj ,jpr_itx1) & 847 847 & + frcv(ji,jj+1,jpr_itx1) + frcv(ji+1,jj+1,jpr_itx1) ) … … 879 879 CASE( 'I' ) 880 880 DO jj = 2, jpjm1 ! I ==> (U,V) 881 DO ji = fs_2, fs_jpim1 !vector opt.881 DO ji = 2, jpim1 ! NO vector opt. 882 882 p_taui(ji,jj) = 0.5 * ( frcv(ji+1,jj+1,jpr_itx1) + frcv(ji+1,jj ,jpr_itx1) ) 883 883 p_tauj(ji,jj) = 0.5 * ( frcv(ji+1,jj+1,jpr_ity1) + frcv(ji ,jj+1,jpr_ity1) ) … … 1134 1134 ! 1135 1135 ! j+1 j -----V---F 1136 ! surfac zvelocity always sent from T point ! |1136 ! surface velocity always sent from T point ! | 1137 1137 ! j | T U 1138 1138 ! | | … … 1162 1162 CASE( 'I' ) ! Ocean on C grid, Ice on I-point (B-grid) ==> T 1163 1163 DO jj = 2, jpjm1 1164 DO ji = fs_2, fs_jpim1 !vector opt.1164 DO ji = 2, jpim1 ! NO vector opt. 1165 1165 zotx1(ji,jj) = 0.5 * ( un(ji,jj,1) + un(ji-1,jj ,1) ) * zfr_l(ji,jj) 1166 1166 zoty1(ji,jj) = 0.5 * ( vn(ji,jj,1) + vn(ji ,jj-1,1) ) * zfr_l(ji,jj) … … 1173 1173 CASE( 'F' ) ! Ocean on C grid, Ice on F-point (B-grid) ==> T 1174 1174 DO jj = 2, jpjm1 1175 DO ji = fs_2, fs_jpim1 !vector opt.1175 DO ji = 2, jpim1 ! NO vector opt. 1176 1176 zotx1(ji,jj) = 0.5 * ( un(ji,jj,1) + un(ji-1,jj ,1) ) * zfr_l(ji,jj) 1177 1177 zoty1(ji,jj) = 0.5 * ( vn(ji,jj,1) + vn(ji ,jj-1,1) ) * zfr_l(ji,jj) … … 1197 1197 CASE( 'I' ) ! Ocean on C grid, Ice on I-point (B-grid) ==> T 1198 1198 DO jj = 2, jpjm1 1199 DO ji = fs_2, fs_jpim1 !vector opt.1199 DO ji = 2, jpim1 ! NO vector opt. 1200 1200 zotx1(ji,jj) = 0.5 * ( un(ji,jj,1) + un(ji-1,jj ,1) ) * zfr_l(ji,jj) & 1201 1201 & + 0.25 * ( u_ice(ji+1,jj+1) + u_ice(ji,jj+1) & … … 1208 1208 CASE( 'F' ) ! Ocean on C grid, Ice on F-point (B-grid) ==> T 1209 1209 DO jj = 2, jpjm1 1210 DO ji = fs_2, fs_jpim1 !vector opt.1210 DO ji = 2, jpim1 ! NO vector opt. 1211 1211 zotx1(ji,jj) = 0.5 * ( un(ji,jj,1) + un(ji-1,jj ,1) ) * zfr_l(ji,jj) & 1212 1212 & + 0.25 * ( u_ice(ji-1,jj-1) + u_ice(ji,jj-1) &
Note: See TracChangeset
for help on using the changeset viewer.