Changeset 2083
- Timestamp:
- 2010-09-10T14:49:11+02:00 (14 years ago)
- Location:
- branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/eosbn2.F90
r2082 r2083 516 516 pn2(ji,jj,jk) = zgde3w * zbeta * tmask(ji,jj,jk) & ! N^2 517 517 & * ( zalbet * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) ) & 518 & - ( pts(ji,jj,jk-1 njp_sal) - pts(ji,jj,jk,jp_sal) ) )518 & - ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) ) ) 519 519 #if defined key_zdfddm 520 520 ! !!bug **** caution a traiter zds=dk[S]= 0 !!!! -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_muscl.F90
r2082 r2083 175 175 ! ! trend diagnostics (contribution of upstream fluxes) 176 176 IF( l_trd ) THEN 177 CALL trd_tra( kt, cdtype, jn, jpt _trd_xad, zwx, pun, ptb(:,:,:,jn) )178 CALL trd_tra( kt, cdtype, jn, jpt _trd_yad, zwy, pvn, ptb(:,:,:,jn) )177 CALL trd_tra( kt, cdtype, jn, jptra_trd_xad, zwx, pun, ptb(:,:,:,jn) ) 178 CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, zwy, pvn, ptb(:,:,:,jn) ) 179 179 END IF 180 180 ! ! "Poleward" heat and salt transports (contribution of upstream fluxes) … … 255 255 END DO 256 256 ! ! Save the vertical advective trends for diagnostic 257 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jpt _trd_zad, zwx, pwn, ptb(:,:,:,jn) )257 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jptra_trd_zad, zwx, pwn, ptb(:,:,:,jn) ) 258 258 ! 259 259 ENDDO -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_muscl2.F90
r2082 r2083 199 199 ! ! trend diagnostics (contribution of upstream fluxes) 200 200 IF( l_trd ) THEN 201 CALL trd_tra( kt, cdtype, jn, jpt _trd_xad, zwx, pun, ptb(:,:,:,jn) )202 CALL trd_tra( kt, cdtype, jn, jpt _trd_yad, zwy, pvn, ptb(:,:,:,jn) )201 CALL trd_tra( kt, cdtype, jn, jptra_trd_xad, zwx, pun, ptb(:,:,:,jn) ) 202 CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, zwy, pvn, ptb(:,:,:,jn) ) 203 203 END IF 204 204 … … 295 295 ! ------------------------------------------------- 296 296 ! ! trend diagnostics (contribution of upstream fluxes) 297 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jpt _trd_zad, zwx, pwn, ptb(:,:,:,jn) )297 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jptra_trd_zad, zwx, pwn, ptb(:,:,:,jn) ) 298 298 ! 299 299 ENDDO -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_qck.F90
r2082 r2083 229 229 END DO 230 230 ! ! trend diagnostics (contribution of upstream fluxes) 231 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jpt _trd_xad, zwx, pun, ptn(:,:,:,jn) )231 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jptra_trd_xad, zwx, pun, ptn(:,:,:,jn) ) 232 232 ! 233 233 END DO … … 349 349 END DO 350 350 ! ! trend diagnostics (contribution of upstream fluxes) 351 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jpt _trd_yad, zwy, pvn, ptn(:,:,:,jn) )351 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, zwy, pvn, ptn(:,:,:,jn) ) 352 352 ! ! "Poleward" heat and salt transports (contribution of upstream fluxes) 353 353 IF( cdtype == 'TRA' .AND. ln_diaptr .AND. ( MOD( kt, nf_ptr ) == 0 ) ) THEN … … 410 410 END DO 411 411 ! ! Save the vertical advective trends for diagnostic 412 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jpt _trd_zad, zwz, pwn, ptn(:,:,:,jn) )412 IF( l_trd ) CALL trd_tra( kt, cdtype, jn, jptra_trd_zad, zwz, pwn, ptn(:,:,:,jn) ) 413 413 ! 414 414 END DO -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r2082 r2083 233 233 ztrdz(:,:,:) = ztrdz(:,:,:) + zwz(:,:,:) ! <<< Add to previously computed 234 234 235 CALL trd_tra( kt, cdtype, jn, jpt _trd_xad, ztrdx, pun, ptn(:,:,:,jn) )236 CALL trd_tra( kt, cdtype, jn, jpt _trd_yad, ztrdy, pvn, ptn(:,:,:,jn) )237 CALL trd_tra( kt, cdtype, jn, jpt _trd_zad, ztrdz, pwn, ptn(:,:,:,jn) )235 CALL trd_tra( kt, cdtype, jn, jptra_trd_xad, ztrdx, pun, ptn(:,:,:,jn) ) 236 CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, ztrdy, pvn, ptn(:,:,:,jn) ) 237 CALL trd_tra( kt, cdtype, jn, jptra_trd_zad, ztrdz, pwn, ptn(:,:,:,jn) ) 238 238 END IF 239 239 ! ! "Poleward" heat and salt transports (contribution of upstream fluxes) -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/traadv_ubs.F90
r2082 r2083 187 187 ! ! trend diagnostics (contribution of upstream fluxes) 188 188 IF( l_trd ) THEN 189 CALL trd_tra( kt, cdtype, jn, jpt _trd_xad, zwx, pun, ptn(:,:,:,jn) )190 CALL trd_tra( kt, cdtype, jn, jpt _trd_yad, zwy, pvn, ptn(:,:,:,jn) )189 CALL trd_tra( kt, cdtype, jn, jptra_trd_xad, zwx, pun, ptn(:,:,:,jn) ) 190 CALL trd_tra( kt, cdtype, jn, jptra_trd_yad, zwy, pvn, ptn(:,:,:,jn) ) 191 191 END IF 192 192 ! ! "Poleward" heat and salt transports (contribution of upstream fluxes) … … 279 279 END DO 280 280 END DO 281 CALL trd_tra( kt, cdtype, jn, jpt _trd_zad, zltv )281 CALL trd_tra( kt, cdtype, jn, jptra_trd_zad, zltv ) 282 282 ENDIF 283 283 ! -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/TRA/tranxt.F90
r2082 r2083 149 149 ztrds(:,:,jk) = ( tsb(:,:,jk,jp_sal) - ztrds(:,:,jk) ) * zfact 150 150 END DO 151 CALL trd_tra( kt, 'TRA', jp_tem, jpt _trd_atf, ztrdt )152 CALL trd_tra( kt, 'TRA', jp_sal, jpt _trd_atf, ztrds )151 CALL trd_tra( kt, 'TRA', jp_tem, jptra_trd_atf, ztrdt ) 152 CALL trd_tra( kt, 'TRA', jp_sal, jptra_trd_atf, ztrds ) 153 153 DEALLOCATE( ztrdt ) ; DEALLOCATE( ztrds ) 154 154 END IF -
branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/istate.F90
r2082 r2083 128 128 129 129 IF( ln_zps .AND. .NOT. lk_c1d ) & 130 CALL zps_hde( nit000, 'TRA', tsb, gtsu, gtsv, & ! Partial steps: before horizontal gradient131 & rhd, gru , grv , jpts) ! of t, s, rd at the last ocean level130 CALL zps_hde( nit000, jpts, tsb, gtsu, gtsv, & ! Partial steps: before horizontal gradient 131 & rhd, gru , grv ) ! of t, s, rd at the last ocean level 132 132 133 133 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.