Changeset 2633 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF
- Timestamp:
- 2011-02-28T18:23:23+01:00 (13 years ago)
- Location:
- branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF
- Files:
-
- 7 edited
-
zdfddm.F90 (modified) (3 diffs)
-
zdfgls.F90 (modified) (3 diffs)
-
zdfkpp.F90 (modified) (3 diffs)
-
zdfmxl.F90 (modified) (3 diffs)
-
zdfric.F90 (modified) (3 diffs)
-
zdftke.F90 (modified) (3 diffs)
-
zdftmx.F90 (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90
r2616 r2633 89 89 !! References : Merryfield et al., JPO, 29, 1124-1142, 1999. 90 90 !!---------------------------------------------------------------------- 91 USE wrk_nemo, ONLY: wrk_ use, wrk_release91 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released 92 92 USE wrk_nemo, ONLY: zmsks => wrk_2d_1, & 93 93 zmskf => wrk_2d_2, & … … 104 104 !!---------------------------------------------------------------------- 105 105 106 IF( .NOT. wrk_use(2, 1,2,3,4,5) ) THEN106 IF( wrk_in_use(2, 1,2,3,4,5) ) THEN 107 107 CALL ctl_stop('zdf_ddm: Requested workspace arrays already in use.') ; RETURN 108 108 END IF … … 198 198 ENDIF 199 199 ! 200 IF( .NOT. wrk_release(2, 1,2,3,4,5) ) CALL ctl_stop('zdf_ddm: Release of workspace arrays failed')200 IF( wrk_not_released(2, 1,2,3,4,5) ) CALL ctl_stop('zdf_ddm: Release of workspace arrays failed') 201 201 ! 202 202 END SUBROUTINE zdf_ddm -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
r2616 r2633 134 134 USE oce, z_elem_c => ta ! use ta as workspace 135 135 USE oce, psi => sa ! use sa as workspace 136 USE wrk_nemo, ONLY: wrk_ use, wrk_release136 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released 137 137 USE wrk_nemo, ONLY: zdep => wrk_2d_1 138 138 USE wrk_nemo, ONLY: zflxs => wrk_2d_2 ! Turbulence fluxed induced by internal waves … … 153 153 !!-------------------------------------------------------------------- 154 154 155 IF( .NOT. wrk_use(2, 1,2,3) .OR. .NOT. wrk_use(3, 1,2,3,4,5) ) THEN155 IF( wrk_in_use(2, 1,2,3) .OR. wrk_in_use(3, 1,2,3,4,5) ) THEN 156 156 CALL ctl_stop('zdf_gls: requested workspace arrays unavailable.') ; RETURN 157 157 END IF … … 882 882 ENDIF 883 883 ! 884 IF( .NOT. wrk_release(2, 1,2,3) .OR. &885 .NOT. wrk_release(3, 1,2,3,4,5) ) CALL ctl_stop('zdf_gls: failed to release workspace arrays')884 IF( wrk_not_released(2, 1,2,3) .OR. & 885 wrk_not_released(3, 1,2,3,4,5) ) CALL ctl_stop('zdf_gls: failed to release workspace arrays') 886 886 ! 887 887 END SUBROUTINE zdf_gls -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90
r2618 r2633 214 214 USE oce , zdiffut => ta ! temp. array for diffusivities use sa as workspace 215 215 #endif 216 USE wrk_nemo, ONLY: wrk_ use, wrk_release, wrk_use_xz, wrk_release_xz216 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, wrk_in_use_xz, wrk_not_released_xz 217 217 USE wrk_nemo, ONLY: zBo => wrk_2d_1, & ! Surface buoyancy forcing, 218 218 zBosol => wrk_2d_2, & ! friction velocity … … 274 274 !!-------------------------------------------------------------------- 275 275 276 IF( .NOT. wrk_use(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR. &277 .NOT. wrk_use(2, 1,2,3,4,5,6,7,8,9,10,11) .OR. &278 .NOT. wrk_use_xz(1,2,3) ) THEN276 IF( wrk_in_use(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR. & 277 wrk_in_use(2, 1,2,3,4,5,6,7,8,9,10,11) .OR. & 278 wrk_in_use_xz(1,2,3) ) THEN 279 279 CALL ctl_stop('zdf_kpp : requested workspace arrays unavailable.') ; RETURN 280 280 END IF … … 1234 1234 ENDIF 1235 1235 1236 IF( .NOT. wrk_release(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR. &1237 .NOT. wrk_release(2, 1,2,3,4,5,6,7,8,9,10,11) .OR. &1238 .NOT. wrk_release_xz(1,2,3) ) CALL ctl_stop('zdf_kpp : failed to release workspace arrays.')1236 IF( wrk_not_released(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR. & 1237 wrk_not_released(2, 1,2,3,4,5,6,7,8,9,10,11) .OR. & 1238 wrk_not_released_xz(1,2,3) ) CALL ctl_stop('zdf_kpp : failed to release workspace arrays.') 1239 1239 ! 1240 1240 END SUBROUTINE zdf_kpp -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r2616 r2633 63 63 !! ** Action : nmln, hmld, hmlp, hmlpt 64 64 !!---------------------------------------------------------------------- 65 USE wrk_nemo, ONLY: iwrk_ use, iwrk_release65 USE wrk_nemo, ONLY: iwrk_in_use, iwrk_not_released 66 66 USE wrk_nemo, ONLY: imld => iwrk_2d_1 ! 2D workspace 67 67 !! … … 74 74 !!---------------------------------------------------------------------- 75 75 76 IF( .NOT. iwrk_use(2,1) )THEN76 IF( iwrk_in_use(2,1) )THEN 77 77 CALL ctl_stop('zdf_mxl : requested workspace array unavailable.') ; RETURN 78 78 END IF … … 112 112 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ', ovlap=1 ) 113 113 ! 114 IF( .NOT. iwrk_release(2,1) ) CALL ctl_stop('zdf_mxl : failed to release workspace array')114 IF( iwrk_not_released(2,1) ) CALL ctl_stop('zdf_mxl : failed to release workspace array') 115 115 ! 116 116 END SUBROUTINE zdf_mxl -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90
r2623 r2633 88 88 !! References : Pacanowski & Philander 1981, JPO, 1441-1451. 89 89 !!---------------------------------------------------------------------- 90 USE wrk_nemo, ONLY: wrk_ use, wrk_release90 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released 91 91 USE wrk_nemo, ONLY: zwx => wrk_2d_1 92 92 !! … … 97 97 !!---------------------------------------------------------------------- 98 98 99 IF( .NOT. wrk_use(2, 1) ) THEN99 IF(wrk_in_use(2, 1) ) THEN 100 100 CALL ctl_stop('zdf_ric : requested workspace array unavailable') ; RETURN 101 101 END IF … … 150 150 CALL lbc_lnk( avmu, 'U', 1. ) ; CALL lbc_lnk( avmv, 'V', 1. ) 151 151 ! 152 IF( .NOT. wrk_release(2, 1) ) CALL ctl_stop('zdf_ric : failed to release workspace array')152 IF(wrk_not_released(2, 1) ) CALL ctl_stop('zdf_ric : failed to release workspace array') 153 153 ! 154 154 END SUBROUTINE zdf_ric -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r2616 r2633 192 192 USE oce, zd_up => va ! use va as workspace 193 193 USE oce, zd_lw => ta ! use ta as workspace 194 USE wrk_nemo, ONLY: wrk_ use, wrk_release, iwrk_use, iwrk_release194 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, iwrk_in_use, iwrk_not_released 195 195 USE wrk_nemo, ONLY: imlc => iwrk_2d_1 ! 2D INTEGER workspace 196 196 USE wrk_nemo, ONLY: zhlc => wrk_2d_1 ! 2D REAL workspace … … 211 211 !!-------------------------------------------------------------------- 212 212 ! 213 IF( .NOT. iwrk_use(2, 1) .OR. &214 .NOT. wrk_use(2, 1) .OR. &215 .NOT. wrk_use(3, 1) )THEN213 IF( iwrk_in_use(2, 1) .OR. & 214 wrk_in_use(2, 1) .OR. & 215 wrk_in_use(3, 1) )THEN 216 216 CALL ctl_stop('tke_tke : requested workspace arrays unavailable.') ; RETURN 217 217 END IF … … 430 430 CALL lbc_lnk( en, 'W', 1. ) ! Lateral boundary conditions (sign unchanged) 431 431 ! 432 IF( .NOT. iwrk_release(2 ,1) .OR. &433 .NOT. wrk_release(2, 1) .OR. &434 .NOT. wrk_release(3, 1) ) CALL ctl_stop( 'tke_tke : failed to release workspace arrays' )432 IF( iwrk_not_released(2 ,1) .OR. & 433 wrk_not_released(2, 1) .OR. & 434 wrk_not_released(3, 1) ) CALL ctl_stop( 'tke_tke : failed to release workspace arrays' ) 435 435 ! 436 436 END SUBROUTINE tke_tke -
branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90
r2616 r2633 24 24 USE in_out_manager ! I/O manager 25 25 USE iom ! I/O Manager 26 USE wrk_nemo, ONLY: wrk_ use, wrk_release26 USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released 27 27 28 28 IMPLICIT NONE … … 111 111 !!---------------------------------------------------------------------- 112 112 113 IF( .NOT. wrk_use(2, 1))THEN113 IF(wrk_in_use(2, 1))THEN 114 114 CALL ctl_stop('zdf_tmx : requested workspace array unavailable.') ; RETURN 115 115 END IF … … 175 175 IF(ln_ctl) CALL prt_ctl(tab3d_1=zav_tide , clinfo1=' tmx - av_tide: ', tab3d_2=avt, clinfo2=' avt: ', ovlap=1, kdim=jpk) 176 176 ! 177 IF( .NOT. wrk_release(2, 1))THEN177 IF(wrk_not_released(2, 1))THEN 178 178 CALL ctl_stop('zdf_tmx : failed to release workspace array.') 179 179 END IF … … 215 215 !!---------------------------------------------------------------------- 216 216 ! 217 IF( (.NOT. wrk_use(2, 2,3,4,5)) .OR. (.NOT. wrk_use(3, 1,2,3,4,5)) )THEN217 IF( wrk_in_use(2, 2,3,4,5) .OR. wrk_in_use(3, 1,2,3,4,5) )THEN 218 218 CALL ctl_stop('tmx_itf : requested workspace arrays unavailable.') 219 219 RETURN … … 303 303 END DO 304 304 ! 305 IF( (.NOT. wrk_release(2, 2,3,4,5)) .OR. &306 (.NOT. wrk_release(3, 1,2,3,4,5)) )THEN305 IF( wrk_not_released(2, 2,3,4,5) .OR. & 306 wrk_not_released(3, 1,2,3,4,5) )THEN 307 307 CALL ctl_stop('tmx_itf : failed to release workspace arrays.') 308 308 END IF … … 361 361 !!---------------------------------------------------------------------- 362 362 363 IF( .NOT. wrk_use(2, 1,2,3,4,5) .OR. .NOT. wrk_use(3, 1) ) THEN363 IF( wrk_in_use(2, 1,2,3,4,5) .OR. wrk_in_use(3, 1) ) THEN 364 364 CALL ctl_stop('zdf_tmx_init : requested workspace arrays unavailable.') ; RETURN 365 365 END IF … … 525 525 ENDIF 526 526 ! 527 IF( .NOT. wrk_release(2, 1,2,3,4,5) .OR. &528 .NOT. wrk_release(3, 1) ) CALL ctl_stop( 'zdf_tmx_init : failed to release workspace arrays' )527 IF(wrk_not_released(2, 1,2,3,4,5) .OR. & 528 wrk_not_released(3, 1) ) CALL ctl_stop( 'zdf_tmx_init : failed to release workspace arrays' ) 529 529 ! 530 530 END SUBROUTINE zdf_tmx_init
Note: See TracChangeset
for help on using the changeset viewer.
