- Timestamp:
- 2015-12-16T16:44:35+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90
r5930 r6069 135 135 DO jk=1,nb_ana 136 136 DO ji=1,jpmax_harmo 137 IF (TRIM(tname(jk)) .eq.Wave(ji)%cname_tide) THEN137 IF (TRIM(tname(jk)) == Wave(ji)%cname_tide) THEN 138 138 name(jk) = ji 139 139 EXIT … … 194 194 DO ji = 1,jpi 195 195 ! Elevation 196 ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj)* tmask_i(ji,jj)197 ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)* umask_i(ji,jj)198 ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)* vmask_i(ji,jj)196 ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj)*ssmask (ji,jj) 197 ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)*ssumask(ji,jj) 198 ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)*ssvmask(ji,jj) 199 199 END DO 200 200 END DO … … 324 324 X1= ana_amp(ji,jj,jh,1) 325 325 X2=-ana_amp(ji,jj,jh,2) 326 out_u(ji,jj, jh) = X1 * umask_i(ji,jj)327 out_u(ji,jj,nb_ana+jh) = X2 * umask_i(ji,jj)326 out_u(ji,jj, jh) = X1 * ssumask(ji,jj) 327 out_u(ji,jj,nb_ana+jh) = X2 * ssumask(ji,jj) 328 328 ENDDO 329 329 ENDDO … … 358 358 X1=ana_amp(ji,jj,jh,1) 359 359 X2=-ana_amp(ji,jj,jh,2) 360 out_v(ji,jj, jh)=X1 * vmask_i(ji,jj)361 out_v(ji,jj,nb_ana+jh)=X2 * vmask_i(ji,jj)360 out_v(ji,jj, jh)=X1 * ssvmask(ji,jj) 361 out_v(ji,jj,nb_ana+jh)=X2 * ssvmask(ji,jj) 362 362 END DO 363 363 END DO … … 488 488 DO jj_sd = ji_sd, ninco 489 489 zval2 = ABS(ztmp3(ji_sd,jj_sd)) 490 IF( zval2 .GE.zval1 )THEN490 IF( zval2 >= zval1 )THEN 491 491 ipivot(ji_sd) = jj_sd 492 492 zval1 = zval2
Note: See TracChangeset
for help on using the changeset viewer.