Changeset 4372
- Timestamp:
- 2014-01-24T11:42:57+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
r4328 r4372 108 108 REAL(wp) :: hramp ! depth over which Neptune vel. is ramped down 109 109 ! 110 REAL(wp), POINTER, DIMENSION(:,: ) :: ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n110 REAL(wp), POINTER, DIMENSION(:,: ) :: zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n 111 111 REAL(wp), POINTER, DIMENSION(:,:,:) :: znmask 112 112 !! … … 148 148 IF( .NOT. ln_neptsimp ) RETURN 149 149 ! ! Dynamically allocate local work arrays 150 CALL wrk_alloc( jpi, jpj , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n )150 CALL wrk_alloc( jpi, jpj , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n ) 151 151 CALL wrk_alloc( jpi, jpj, jpk, znmask ) 152 152 … … 199 199 200 200 IF( ln_smooth_neptvel ) THEN 201 CALL dyn_nept_smooth_vel( htn, ht, .TRUE. )202 !! overwrites ht with a smoothed version of htn201 CALL dyn_nept_smooth_vel( htn, zht, .TRUE. ) 202 !! overwrites zht with a smoothed version of htn 203 203 ELSE 204 ht(:,:) = htn(:,:)204 zht(:,:) = htn(:,:) 205 205 !! use unsmoothed version of htn 206 206 ENDIF 207 CALL lbc_lnk( ht, 'F', 1.0_wp )207 CALL lbc_lnk( zht, 'F', 1.0_wp ) 208 208 209 209 !! Compute tsp, a stream function for the Neptune velocity, … … 217 217 tscale(:,:) = rn_tslsp + (rn_tslse - rn_tslsp) * & 218 218 ( 0.5_wp + 0.5_wp * COS( 2.0_wp * rad * gphif(:,:) ) ) 219 tsp (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * ht(:,:)219 tsp (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * zht(:,:) 220 220 221 221 … … 333 333 !! Deallocate temporary workspace arrays, which are all local to 334 334 !! this routine, except where passed as arguments to other routines 335 CALL wrk_dealloc( jpi, jpj , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n )335 CALL wrk_dealloc( jpi, jpj , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n ) 336 336 CALL wrk_dealloc( jpi, jpj, jpk, znmask ) 337 337 !
Note: See TracChangeset
for help on using the changeset viewer.