- Timestamp:
- 2019-04-01T17:50:07+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/BDY/bdytides.F90
r10811 r10822 115 115 WRITE(numout,*) ' Tidal components: ' 116 116 DO itide = 1, nb_harmo 117 WRITE(numout,*) ' ', tide_ components(itide)%cname_tide117 WRITE(numout,*) ' ', tide_harmonics(itide)%cname_tide 118 118 END DO 119 119 ENDIF … … 156 156 igrd = 1 ! Everything is at T-points here 157 157 DO itide = 1, nb_harmo 158 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_z1', ztr(:,:) )159 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_z2', zti(:,:) )158 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_z1', ztr(:,:) ) 159 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_z2', zti(:,:) ) 160 160 DO ib = 1, ilen0(igrd) 161 161 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 172 172 igrd = 2 ! Everything is at U-points here 173 173 DO itide = 1, nb_harmo 174 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_u1', ztr(:,:) )175 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_u2', zti(:,:) )174 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_u1', ztr(:,:) ) 175 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_u2', zti(:,:) ) 176 176 DO ib = 1, ilen0(igrd) 177 177 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 188 188 igrd = 3 ! Everything is at V-points here 189 189 DO itide = 1, nb_harmo 190 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_v1', ztr(:,:) )191 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_ components(itide)%cname_tide)//'_v2', zti(:,:) )190 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_v1', ztr(:,:) ) 191 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_v2', zti(:,:) ) 192 192 DO ib = 1, ilen0(igrd) 193 193 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 217 217 DO itide = 1, nb_harmo 218 218 ! ! SSH fields 219 clfile = TRIM(filtide)//TRIM(tide_ components(itide)%cname_tide)//'_grid_T.nc'219 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_T.nc' 220 220 CALL iom_open( clfile, inum ) 221 221 CALL fld_map( inum, 'z1' , dta_read(1:ilen0(1),1:1,1:1) , 1, ibmap_ptr(1) ) … … 225 225 CALL iom_close( inum ) 226 226 ! ! U fields 227 clfile = TRIM(filtide)//TRIM(tide_ components(itide)%cname_tide)//'_grid_U.nc'227 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_U.nc' 228 228 CALL iom_open( clfile, inum ) 229 229 CALL fld_map( inum, 'u1' , dta_read(1:ilen0(2),1:1,1:1) , 1, ibmap_ptr(2) ) … … 233 233 CALL iom_close( inum ) 234 234 ! ! V fields 235 clfile = TRIM(filtide)//TRIM(tide_ components(itide)%cname_tide)//'_grid_V.nc'235 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_V.nc' 236 236 CALL iom_open( clfile, inum ) 237 237 CALL fld_map( inum, 'v1' , dta_read(1:ilen0(3),1:1,1:1) , 1, ibmap_ptr(3) ) … … 335 335 336 336 DO itide = 1, nb_harmo 337 z_sarg = z_arg * omega_tide(itide)337 z_sarg = z_arg * tide_harmonics(itide)%omega 338 338 z_cost(itide) = COS( z_sarg ) 339 339 z_sist(itide) = SIN( z_sarg ) … … 440 440 DO itide = 1, nb_harmo 441 441 ! 442 z_sarg = (z_arg + zoff) * omega_tide(itide)442 z_sarg = (z_arg + zoff) * tide_harmonics(itide)%omega 443 443 z_cost = zramp * COS( z_sarg ) 444 444 z_sist = zramp * SIN( z_sarg ) … … 501 501 END DO 502 502 DO ib = 1 , ilen0(igrd) 503 mod_tide(ib)=mod_tide(ib)* ftide(itide)504 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)503 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 504 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0+tide_harmonics(itide)%u 505 505 ENDDO 506 506 DO ib = 1 , ilen0(igrd) … … 540 540 END DO 541 541 DO ib = 1, ilen0(igrd) 542 mod_tide(ib)=mod_tide(ib)* ftide(itide)543 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)542 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 543 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0 + tide_harmonics(itide)%u 544 544 ENDDO 545 545 DO ib = 1, ilen0(igrd) … … 561 561 END DO 562 562 DO ib = 1, ilen0(igrd) 563 mod_tide(ib)=mod_tide(ib)* ftide(itide)564 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)563 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 564 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0 + tide_harmonics(itide)%u 565 565 ENDDO 566 566 DO ib = 1, ilen0(igrd)
Note: See TracChangeset
for help on using the changeset viewer.