Changeset 8470
- Timestamp:
- 2017-08-29T16:18:37+02:00 (7 years ago)
- Location:
- branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trcnxt.F90
r8453 r8470 130 130 ztrdt(:,:,jpk,:) = 0._wp 131 131 IF( ln_trcldf_iso ) THEN ! diagnose the "pure" Kz diffusive trend 132 CALL trd_tra( kt, 'TRC', jn, jptra_zdfp, ztrdt ) 132 DO jn = 1, jptra 133 CALL trd_tra( kt, 'TRC', jn, jptra_zdfp, ztrdt(:,:,:,jn) ) 134 ENDDO 133 135 ENDIF 134 136 ! total trend for the non-time-filtered variables. … … 151 153 END DO 152 154 END IF 153 CALL trd_tra( kt, 'TRC', jn, jptra_tot, ztrdt ) 155 DO jn = 1, jptra 156 CALL trd_tra( kt, 'TRC', jn, jptra_tot, ztrdt(:,:,:,jn) ) 157 ENDDO 154 158 IF( .NOT.lk_vvl ) THEN 155 159 ! Store now fields before applying the Asselin filter … … 172 176 ! this time step 173 177 ztrdt(:,:,:,:) = 0._wp 174 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt ) 178 DO jn = 1, jptra 179 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) ) 180 ENDDO 175 181 END IF 176 182 … … 191 197 ztrdt(:,:,jk,jn) = ( trb(:,:,jk,jn) - ztrdt(:,:,jk,jn) ) * zfact 192 198 END DO 193 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt )199 CALL trd_tra( kt, 'TRC', jn, jptra_atf, ztrdt(:,:,:,jn) ) 194 200 END DO 195 201 END IF -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trczdf.F90
r8453 r8470 103 103 DO jn = 1, jptra 104 104 DO jk = 1, jpkm1 105 ztrtrd(:,:,jk ) = ( ( tra(:,:,jk,jn)*fse3t_a(:,:,jk) - &106 trn(:,:,jk,jn)*fse3t_b(:,:,jk) ) &107 / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrtrd(:,:,jk)105 ztrtrd(:,:,jk,jn) = ( ( tra(:,:,jk,jn)*fse3t_a(:,:,jk) - & 106 trn(:,:,jk,jn)*fse3t_b(:,:,jk) ) & 107 / (fse3t_n(:,:,jk)*r2dtra(jk)) ) - ztrtrd(:,:,jk,jn) 108 108 END DO 109 109 END DO -
branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/TOP_SRC/TRP/trdtrc.F90
r8467 r8470 187 187 188 188 189 189 IF (iom_use(cltra)) THEN 190 190 # if defined key_debug_medusa 191 192 191 IF(lwp) WRITE(numout,*) ' TREND stats (min, max,sum) kt = ',kt ,' jn = ',kjn 192 CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra) 193 193 # endif 194 194 CALL iom_put( cltra, ptrtrd(:,:,:) ) 195 195 # if defined key_debug_medusa 196 197 198 199 196 ELSE 197 IF(lwp) WRITE(numout,*) & 198 ' TREND -- No output asked for ',cltra,' kt = ',kt,' jn = ',kjn 199 CALL trc_rst_dia_stat( ptrtrd(:,:,1), cltra) 200 200 # endif 201 201 ENDIF 202 202 203 203 END SUBROUTINE trd_trc_iomput
Note: See TracChangeset
for help on using the changeset viewer.