Changeset 2704
- Timestamp:
- 2011-03-25T09:37:58+01:00 (14 years ago)
- Location:
- branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
r2690 r2704 74 74 !!---------------------------------------------------------------------- 75 75 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released 76 USE wrk_nemo, ONLY: ztab2d_1 => wrk_2d_ 1 , ztab2d_2 => wrk_2d_277 USE wrk_nemo, ONLY: zmask1 => wrk_3d_1 , zmask2 => wrk_3d_278 USE wrk_nemo, ONLY: ztab3d_1 => wrk_3d_ 3 , ztab3d_2 => wrk_3d_476 USE wrk_nemo, ONLY: ztab2d_1 => wrk_2d_30 , ztab2d_2 => wrk_2d_31 77 USE wrk_nemo, ONLY: zmask1 => wrk_3d_11 , zmask2 => wrk_3d_12 78 USE wrk_nemo, ONLY: ztab3d_1 => wrk_3d_13 , ztab3d_2 => wrk_3d_14 79 79 ! 80 80 REAL(wp), DIMENSION(:,:) , INTENT(in), OPTIONAL :: tab2d_1 … … 95 95 !!---------------------------------------------------------------------- 96 96 97 IF( wrk_in_use(2, 1,2) .OR. wrk_in_use(3, 1,2,3,4) ) THEN97 IF( wrk_in_use(2, 30,31) .OR. wrk_in_use(3, 11,12,13,14) ) THEN 98 98 CALL ctl_stop('prt_ctl : requested workspace arrays unavailable') ; RETURN 99 99 ENDIF … … 204 204 ENDDO 205 205 206 IF( wrk_not_released(2, 1,2) .OR. &207 wrk_not_released(3, 1 ,2,3,4) ) CALL ctl_stop('prt_ctl: failed to release workspace arrays')206 IF( wrk_not_released(2, 30,31) .OR. & 207 wrk_not_released(3, 11,12,13,14) ) CALL ctl_stop('prt_ctl: failed to release workspace arrays') 208 208 ! 209 209 END SUBROUTINE prt_ctl -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/TOP_SRC/prtctl_trc.F90
r2643 r2704 60 60 !! it must looks like: CALL prt_ctl( mask=tmask ). 61 61 !!---------------------------------------------------------------------- 62 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released63 USE wrk_nemo, ONLY: zmask => wrk_3d_1, ztab3d => wrk_3d_264 !!65 62 REAL(wp) , DIMENSION(:,:,:,:), INTENT(in), OPTIONAL :: tab4d ! 4D array 66 63 REAL(wp) , DIMENSION(:,:,:) , INTENT(in), OPTIONAL :: mask ! 3D mask to apply to the tab4d array … … 70 67 INTEGER , INTENT(in), OPTIONAL :: kdim ! k- direction for 4D arrays 71 68 !! 69 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: zmask, ztab3d 72 70 INTEGER :: overlap, jn, js, sind, eind, kdir, j_id 73 71 REAL(wp) :: zsum, zvctl … … 76 74 !!---------------------------------------------------------------------- 77 75 78 IF( wrk_in_use(3, 1,2) ) THEN 79 CALL ctl_stop('prt_ctl_trc : requested workspace arrays unavailable.') 80 RETURN 81 END IF 82 76 ALLOCATE( zmask (jpi,jpj,jpk) ) 77 ALLOCATE( ztab3d(jpi,jpj,jpk) ) 83 78 ! ! Arrays, scalars initialization 84 79 overlap = 0 … … 156 151 END DO 157 152 ! 158 IF( wrk_not_released(3, 1,2) ) CALL ctl_stop('prt_ctl_trc : failed to release workspace arrays.') 153 DEALLOCATE( zmask ) 154 DEALLOCATE( ztab3d ) 159 155 ! 160 156 END SUBROUTINE prt_ctl_trc
Note: See TracChangeset
for help on using the changeset viewer.