- Timestamp:
- 2011-08-23T12:20:06+02:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2011/dev_r2802_TOP_substepping/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r2715 r2830 32 32 USE trc_oce ! share passive tracers/Ocean variables 33 33 USE lib_mpp ! MPP library 34 #if defined key_top 35 USE trc, ONLY: nittrc000 !get first time step for passive tracers 36 #endif 34 37 35 38 IMPLICIT NONE … … 131 134 !!---------------------------------------------------------------------- 132 135 133 IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 1,2) ) THEN136 IF( wrk_in_use(2, 35) .OR. wrk_in_use(3, 14,15) ) THEN 134 137 CALL ctl_stop('tra_adv_cen2: requested workspace arrays unavailable') ; RETURN 135 138 ENDIF 136 139 140 #if defined key_top 141 IF( kt == nit000 .OR. (kt == nittrc000 .AND. cdtype == 'TRC')) THEN 142 #else 137 143 IF( kt == nit000 ) THEN 144 #endif 138 145 IF(lwp) WRITE(numout,*) 139 146 IF(lwp) WRITE(numout,*) 'tra_adv_cen2 : 2nd order centered advection scheme on ', cdtype … … 141 148 IF(lwp) WRITE(numout,*) 142 149 ! 143 ALLOCATE( upsmsk(jpi,jpj), STAT=ierr ) 144 IF( ierr /= 0 ) CALL ctl_stop('STOP', 'tra_adv_cen2: unable to allocate array') 150 IF (.not. ALLOCATED(upsmsk))THEN 151 ALLOCATE( upsmsk(jpi,jpj), STAT=ierr ) 152 IF( ierr /= 0 ) CALL ctl_stop('STOP', 'tra_adv_cen2: unable to allocate array') 153 ENDIF 154 145 155 ! 146 156 upsmsk(:,:) = 0._wp ! not upstream by default … … 275 285 ENDIF 276 286 ! 277 IF( wrk_not_released(2, 1) .OR. &278 wrk_not_released(3, 1 ,2) ) CALL ctl_stop('tra_adv_cen2: failed to release workspace arrays')287 IF( wrk_not_released(2, 35) .OR. & 288 wrk_not_released(3, 14,15) ) CALL ctl_stop('tra_adv_cen2: failed to release workspace arrays') 279 289 ! 280 290 END SUBROUTINE tra_adv_cen2
Note: See TracChangeset
for help on using the changeset viewer.