Changeset 11625 for NEMO/branches
- Timestamp:
- 2019-10-01T15:18:44+02:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_interp.F90
r11603 r11625 662 662 INTEGER :: N_in, N_out 663 663 ! vertical interpolation: 664 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk, n1:n2) :: ptab_child665 REAL(wp), DIMENSION(k1:k2, n1:n2-1) :: tabin664 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk,1:jpts) :: ptab_child 665 REAL(wp), DIMENSION(k1:k2,1:jpts) :: tabin 666 666 REAL(wp), DIMENSION(k1:k2) :: h_in 667 667 REAL(wp), DIMENSION(1:jpk) :: h_out … … 693 693 DO jj=j1,j2 694 694 DO ji=i1,i2 695 ptab_child(ji,jj,:,:) = 0._wp 695 696 N_in = 0 696 697 DO jk=k1,k2 !k2 = jpk of parent grid … … 706 707 h_out(jk) = e3t_a(ji,jj,jk) 707 708 ENDDO 708 IF (N_in > 0) THEN709 IF (N_in*N_out > 0) THEN 709 710 CALL reconstructandremap(tabin(1:N_in,1:jpts),h_in(1:N_in),ptab_child(ji,jj,1:N_out,1:jpts),h_out(1:N_out),N_in,N_out,jpts) 710 711 ENDIF -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_sponge.F90
r11603 r11625 329 329 ! 330 330 # if defined key_vertical 331 tabres_child(:,:,:,:) = 0.332 331 DO jj=j1,j2 333 332 DO ji=i1,i2 333 tabres_child(ji,jj,:,:) = 0._wp 334 334 N_in = 0 335 335 DO jk=k1,k2 !k2 = jpk of parent grid … … 345 345 h_out(jk) = e3t_b(ji,jj,jk) !Child grid scale factors. Could multiply by e1e2t here instead of division above 346 346 ENDDO 347 IF (N_in > 0) THEN347 IF (N_in*N_out > 0) THEN 348 348 CALL reconstructandremap(tabin(1:N_in,1:jpts),h_in(1:N_in),tabres_child(ji,jj,1:N_out,1:jpts),h_out(1:N_out),N_in,N_out,jpts) 349 349 ENDIF … … 438 438 ! 439 439 IF( before ) THEN 440 DO jk= 1,jpkm1440 DO jk=k1,k2 441 441 DO jj=j1,j2 442 442 DO ji=i1,i2 … … 591 591 592 592 IF( before ) THEN 593 DO jk= 1,jpkm1593 DO jk=k1,k2 594 594 DO jj=j1,j2 595 595 DO ji=i1,i2 -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_update.F90
r11607 r11625 288 288 REAL(wp) :: h_in(k1:k2) 289 289 REAL(wp) :: h_out(1:jpk) 290 REAL(wp) :: tabin(k1:k2, jpts)290 REAL(wp) :: tabin(k1:k2,1:jpts) 291 291 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk,1:jpts) :: tabres_child 292 292 !!--------------------------------------------- … … 330 330 h_out(N_out) = e3t_n(ji,jj,jk) 331 331 ENDDO 332 IF (N_in > 0) THEN !Remove this?332 IF (N_in*N_out > 0) THEN !Remove this? 333 333 CALL reconstructandremap(tabin(1:N_in,1:jpts),h_in(1:N_in),tabres_child(ji,jj,1:N_out,1:jpts),h_out(1:N_out),N_in,N_out,jpts) 334 334 ENDIF -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_top_interp.F90
r11610 r11625 62 62 63 63 ! vertical interpolation: 64 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk, n1:n2) :: ptab_child65 REAL(wp), DIMENSION(k1:k2, n1:n2-1) :: tabin64 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk,1:jptra) :: ptab_child 65 REAL(wp), DIMENSION(k1:k2,1:jptra) :: tabin 66 66 REAL(wp), DIMENSION(k1:k2) :: h_in 67 67 REAL(wp), DIMENSION(1:jpk) :: h_out … … 93 93 DO jj=j1,j2 94 94 DO ji=i1,i2 95 ptab_child(ji,jj,:) = 0._wp 95 96 N_in = 0 96 97 DO jk=k1,k2 !k2 = jpk of parent grid -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_top_sponge.F90
r11610 r11625 68 68 INTEGER :: ji, jj, jk, jn ! dummy loop indices 69 69 REAL(wp) :: zabe1, zabe2 70 REAL(wp), DIMENSION(i1:i2,j1:j2) :: ztu, ztv71 REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2, n1:n2) :: trbdiff70 REAL(wp), DIMENSION(i1:i2,j1:j2) :: ztu, ztv 71 REAL(wp), DIMENSION(i1:i2,j1:j2,k1:k2,1:jptra) :: trbdiff 72 72 ! vertical interpolation: 73 REAL(wp), DIMENSION(i1:i2,j1:j2,jpk, n1:n2) ::tabres_child74 REAL(wp), DIMENSION(k1:k2, n1:n2-1) :: tabin73 REAL(wp), DIMENSION(i1:i2,j1:j2,jpk,1:jptra) ::tabres_child 74 REAL(wp), DIMENSION(k1:k2,1:jptra) :: tabin 75 75 REAL(wp), DIMENSION(k1:k2) :: h_in 76 76 REAL(wp), DIMENSION(1:jpk) :: h_out -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_top_update.F90
r11610 r11625 70 70 INTEGER :: N_in, N_out 71 71 REAL(wp) :: h_diff 72 REAL(wp) :: tabin(k1:k2, n1:n2)72 REAL(wp) :: tabin(k1:k2,1:jptra) 73 73 REAL(wp), DIMENSION(i1:i2,j1:j2,1:jpk,1:jptra) :: tabres_child 74 74 !!---------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.