- Timestamp:
- 2016-01-08T10:35:19+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4704_NOC5_MPP_BDY_UPDATE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90
- Property svn:keywords set to Id
r4683 r6225 14 14 USE dom_oce ! ocean space and time domain 15 15 USE phycst 16 USE dynspg_oce17 USE dynspg_ts18 16 USE daymod 19 17 USE tide_mod … … 23 21 USE ioipsl ! NetCDF IPSL library 24 22 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 25 USE diadimg ! To write dimg26 23 USE timing ! preformance summary 27 24 USE wrk_nemo ! working arrays … … 60 57 !!---------------------------------------------------------------------- 61 58 !! NEMO/OPA 3.5 , NEMO Consortium (2013) 62 !! $Id :$59 !! $Id$ 63 60 !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 64 61 !!---------------------------------------------------------------------- … … 137 134 DO jk=1,nb_ana 138 135 DO ji=1,jpmax_harmo 139 IF (TRIM(tname(jk)) .eq.Wave(ji)%cname_tide) THEN136 IF (TRIM(tname(jk)) == Wave(ji)%cname_tide) THEN 140 137 name(jk) = ji 141 138 EXIT … … 193 190 & +(1.-MOD(jc,2))* ft(jh) *SIN(ana_freq(jh)*ztime + vt(jh) + ut(jh))) 194 191 195 DO jj = 1, 196 DO ji = 1, 192 DO jj = 1,jpj 193 DO ji = 1,jpi 197 194 ! Elevation 198 ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj) *tmask(ji,jj,1) 199 #if defined key_dynspg_ts 200 ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)*hur(ji,jj)*umask(ji,jj,1) 201 ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)*hvr(ji,jj)*vmask(ji,jj,1) 202 #endif 195 ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj)*ssmask (ji,jj) 196 ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)*ssumask(ji,jj) 197 ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)*ssvmask(ji,jj) 203 198 END DO 204 199 END DO … … 294 289 X1 = ana_amp(ji,jj,jh,1) 295 290 X2 =-ana_amp(ji,jj,jh,2) 296 out_eta(ji,jj,jh ) = X1 * tmask (ji,jj,1)297 out_eta(ji,jj,jh+nb_ana) = X2 * tmask (ji,jj,1)291 out_eta(ji,jj,jh ) = X1 * tmask_i(ji,jj) 292 out_eta(ji,jj,jh+nb_ana) = X2 * tmask_i(ji,jj) 298 293 END DO 299 294 END DO … … 326 321 DO ji = 1, jpi 327 322 DO jh = 1, nb_ana 328 X1 329 X2 330 out_u(ji,jj, jh ) = X1 * umask(ji,jj,1)331 out_u(ji,jj,nb_ana+jh) = X2 * umask(ji,jj,1)332 END 333 END 334 END 323 X1= ana_amp(ji,jj,jh,1) 324 X2=-ana_amp(ji,jj,jh,2) 325 out_u(ji,jj, jh) = X1 * ssumask(ji,jj) 326 out_u(ji,jj,nb_ana+jh) = X2 * ssumask(ji,jj) 327 ENDDO 328 ENDDO 329 ENDDO 335 330 336 331 ! vbar: … … 362 357 X1=ana_amp(ji,jj,jh,1) 363 358 X2=-ana_amp(ji,jj,jh,2) 364 out_v(ji,jj, jh)=X1 * vmask(ji,jj,1)365 out_v(ji,jj,nb_ana+jh)=X2 * vmask(ji,jj,1)359 out_v(ji,jj, jh)=X1 * ssvmask(ji,jj) 360 out_v(ji,jj,nb_ana+jh)=X2 * ssvmask(ji,jj) 366 361 END DO 367 362 END DO … … 388 383 !!---------------------------------------------------------------------- 389 384 390 #if defined key_dimgout391 cdfile_name_T = TRIM(cexper)//'_Tidal_harmonics_gridT.dimgproc'392 cdfile_name_U = TRIM(cexper)//'_Tidal_harmonics_gridU.dimgproc'393 cdfile_name_V = TRIM(cexper)//'_Tidal_harmonics_gridV.dimgproc'394 #endif395 396 385 IF(lwp) WRITE(numout,*) ' ' 397 386 IF(lwp) WRITE(numout,*) 'dia_wri_harm : Write harmonic analysis results' 398 #if defined key_dimgout399 IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~ Output files: ', TRIM(cdfile_name_T)400 IF(lwp) WRITE(numout,*) ' ', TRIM(cdfile_name_U)401 IF(lwp) WRITE(numout,*) ' ', TRIM(cdfile_name_V)402 #endif403 387 IF(lwp) WRITE(numout,*) ' ' 404 388 … … 406 390 !///////////// 407 391 ! 408 #if defined key_dimgout409 cltext='Elevation amplitude and phase'410 CALL dia_wri_dimg(TRIM(cdfile_name_T), TRIM(cltext), out_eta, 2*nb_ana, '2')411 #else412 392 DO jh = 1, nb_ana 413 393 CALL iom_put( TRIM(tname(jh))//'x', out_eta(:,:,jh) ) 414 394 CALL iom_put( TRIM(tname(jh))//'y', out_eta(:,:,nb_ana+jh) ) 415 395 END DO 416 #endif417 396 418 397 ! B) ubar 419 398 !///////// 420 399 ! 421 #if defined key_dimgout422 cltext='ubar amplitude and phase'423 CALL dia_wri_dimg(TRIM(cdfile_name_U), TRIM(cltext), out_u, 2*nb_ana, '2')424 #else425 400 DO jh = 1, nb_ana 426 401 CALL iom_put( TRIM(tname(jh))//'x_u', out_u(:,:,jh) ) 427 402 CALL iom_put( TRIM(tname(jh))//'y_u', out_u(:,:,nb_ana+jh) ) 428 403 END DO 429 #endif430 404 431 405 ! C) vbar 432 406 !///////// 433 407 ! 434 #if defined key_dimgout435 cltext='vbar amplitude and phase'436 CALL dia_wri_dimg(TRIM(cdfile_name_V), TRIM(cltext), out_v, 2*nb_ana, '2')437 #else438 408 DO jh = 1, nb_ana 439 409 CALL iom_put( TRIM(tname(jh))//'x_v', out_v(:,:,jh ) ) 440 410 CALL iom_put( TRIM(tname(jh))//'y_v', out_v(:,:,jh+nb_ana) ) 441 411 END DO 442 #endif443 412 ! 444 413 END SUBROUTINE dia_wri_harm … … 492 461 DO jj_sd = ji_sd, ninco 493 462 zval2 = ABS(ztmp3(ji_sd,jj_sd)) 494 IF( zval2 .GE.zval1 )THEN463 IF( zval2 >= zval1 )THEN 495 464 ipivot(ji_sd) = jj_sd 496 465 zval1 = zval2
Note: See TracChangeset
for help on using the changeset viewer.