Changeset 8191 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
- Timestamp:
- 2017-06-19T18:16:30+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r7771 r8191 82 82 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zun, zvn, zwn 83 83 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrdt, ztrds ! 3D workspace 84 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrdt, ztrds ! 3D workspace 84 85 !!---------------------------------------------------------------------- 85 86 ! … … 125 126 IF( ln_diaptr ) CALL dia_ptr( zvn ) ! diagnose the effective MSF 126 127 ! 128 <<<<<<< .working 127 129 IF( l_trdtra ) THEN !* Save ta and sa trends 128 130 ALLOCATE(ztrdt( 1:jpi, 1:jpj, 1:jpk) ) … … 132 134 ENDIF 133 135 ! 136 ======= 137 IF( l_trdtra ) THEN !* Save ta and sa trends 138 CALL wrk_alloc( jpi, jpj, jpk, ztrdt, ztrds ) 139 ztrdt(:,:,:) = tsa(:,:,:,jp_tem) 140 ztrds(:,:,:) = tsa(:,:,:,jp_sal) 141 ENDIF 142 ! 143 >>>>>>> .merge-right.r7923 134 144 SELECT CASE ( nadv ) !== compute advection trend and add it to general trend ==! 135 145 CASE ( 1 ) ; CALL tra_adv_cen2 ( kt, nit000, 'TRA', zun, zvn, zwn, tsb, tsn, tsa, jpts ) ! 2nd order centered … … 162 172 END SELECT 163 173 ! 174 <<<<<<< .working 164 175 IF( l_trdtra ) THEN ! save the advective trends for further diagnostics 165 176 DO jk = 1, jpkm1 … … 172 183 DEALLOCATE (ztrds) 173 184 ENDIF 185 ======= 186 IF( l_trdtra ) THEN ! save the advective trends for further diagnostics 187 DO jk = 1, jpkm1 188 ztrdt(:,:,jk) = tsa(:,:,jk,jp_tem) - ztrdt(:,:,jk) 189 ztrds(:,:,jk) = tsa(:,:,jk,jp_sal) - ztrds(:,:,jk) 190 END DO 191 CALL trd_tra( kt, 'TRA', jp_tem, jptra_totad, ztrdt ) 192 CALL trd_tra( kt, 'TRA', jp_sal, jptra_totad, ztrds ) 193 CALL wrk_dealloc( jpi, jpj, jpk, ztrdt, ztrds ) 194 ENDIF 195 >>>>>>> .merge-right.r7923 174 196 ! ! print mean trends (used for debugging) 175 197 IF(ln_ctl) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv - Ta: ', mask1=tmask, &
Note: See TracChangeset
for help on using the changeset viewer.