- Timestamp:
- 2013-07-11T15:59:14+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90
r3851 r3970 29 29 USE iom ! IOM library 30 30 USE in_out_manager ! I/O logical units 31 ! bg jchanut tschanges 32 USE dynspg_oce, ONLY: lk_dynspg_ts ! Split-explicit free surface flag 33 ! end jchanut tschanges 34 31 35 #if defined key_lim2 32 36 USE ice_2 … … 314 318 END DO 315 319 ENDIF 316 IF( nn_dyn2d(ib_bdy) .gt. 0 .and. nn_dyn2d_dta(ib_bdy) .ge. 2 ) THEN ! update tidal harmonic forcing 317 CALL bdytide_update( kt=kt, idx=idx_bdy(ib_bdy), dta=dta_bdy(ib_bdy), & 318 & td=tides(ib_bdy), time_offset=time_offset ) 319 ENDIF 320 ! bg jchanut tschanges 321 !IF( nn_dyn2d(ib_bdy) .gt. 0 .and. nn_dyn2d_dta(ib_bdy) .ge. 2 ) THEN ! update tidal harmonic forcing 322 ! CALL bdytide_update( kt=kt, idx=idx_bdy(ib_bdy), dta=dta_bdy(ib_bdy), & 323 ! & td=tides(ib_bdy), time_offset=time_offset ) 324 !ENDIF 325 ! end jchanut tschanges 320 326 ENDIF 321 327 ENDIF … … 323 329 END IF ! nn_dta(ib_bdy) = 1 324 330 END DO ! ib_bdy 331 332 ! bg jchanut tschanges 333 #if defined key_tide 334 ! Add tides if not split-explicit free surface else this is done in ts loop 335 IF (.NOT.lk_dynspg_ts) CALL bdy_dta_tides( kt=kt, time_offset=time_offset ) 336 #endif 337 ! end jchanut tschanges 325 338 326 339 IF ( ln_apr_obc ) THEN … … 476 489 IF( nn_dyn2d(ib_bdy) .gt. 0 .and. ( nn_dyn2d_dta(ib_bdy) .eq. 1 .or. nn_dyn2d_dta(ib_bdy) .eq. 3 ) ) THEN 477 490 478 IF( nn_ tra(ib_bdy) .ne. 4 ) THEN ! runoff condition : no ssh reading491 IF( nn_dyn2d(ib_bdy) .ne. jp_frs .and. nn_tra(ib_bdy) .ne. 4 ) THEN ! runoff condition : no ssh reading 479 492 jfld = jfld + 1 480 493 blf_i(jfld) = bn_ssh … … 572 585 ! Recalculate field counts 573 586 !------------------------- 574 nb_bdy_fld_sum = 0575 587 IF( ib_bdy .eq. 1 ) THEN 588 nb_bdy_fld_sum = 0 576 589 nb_bdy_fld(ib_bdy) = jfld 577 590 nb_bdy_fld_sum = jfld … … 616 629 ALLOCATE( dta_bdy(ib_bdy)%u2d(ilen0(2)) ) 617 630 ALLOCATE( dta_bdy(ib_bdy)%v2d(ilen0(3)) ) 618 IF ( nn_dyn2d_dta(ib_bdy).eq.1.or.nn_dyn2d_dta(ib_bdy).eq.3) THEN631 IF ( nn_dyn2d(ib_bdy) .ne. jp_frs .and. (nn_dyn2d_dta(ib_bdy).eq.1.or.nn_dyn2d_dta(ib_bdy).eq.3) ) THEN 619 632 jfld = jfld + 1 620 633 dta_bdy(ib_bdy)%ssh => bf(jfld)%fnow(:,1,1)
Note: See TracChangeset
for help on using the changeset viewer.