Changeset 4057
- Timestamp:
- 2013-10-10T17:57:42+02:00 (11 years ago)
- Location:
- branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/DYN
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
r3723 r4057 109 109 REAL(wp) :: hramp ! depth over which Neptune vel. is ramped down 110 110 ! 111 REAL(wp), POINTER, DIMENSION(:,: ) :: ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n111 REAL(wp), POINTER, DIMENSION(:,: ) :: zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n 112 112 REAL(wp), POINTER, DIMENSION(:,:,:) :: znmask 113 113 !! … … 142 142 IF( .NOT. ln_neptsimp ) RETURN 143 143 ! ! Dynamically allocate local work arrays 144 CALL wrk_alloc( jpi, jpj , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n )144 CALL wrk_alloc( jpi, jpj , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n ) 145 145 CALL wrk_alloc( jpi, jpj, jpk, znmask ) 146 146 … … 193 193 194 194 IF( ln_smooth_neptvel ) THEN 195 CALL dyn_nept_smooth_vel( htn, ht, .TRUE. )195 CALL dyn_nept_smooth_vel( htn, zht, .TRUE. ) 196 196 !! overwrites ht with a smoothed version of htn 197 197 ELSE 198 ht(:,:) = htn(:,:)198 zht(:,:) = htn(:,:) 199 199 !! use unsmoothed version of htn 200 200 ENDIF 201 CALL lbc_lnk( ht, 'F', 1.0_wp )201 CALL lbc_lnk( zht, 'F', 1.0_wp ) 202 202 203 203 !! Compute tsp, a stream function for the Neptune velocity, … … 211 211 tscale(:,:) = rn_tslsp + (rn_tslse - rn_tslsp) * & 212 212 ( 0.5_wp + 0.5_wp * COS( 2.0_wp * rad * gphif(:,:) ) ) 213 tsp (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * ht(:,:)213 tsp (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * zht(:,:) 214 214 215 215 … … 327 327 !! Deallocate temporary workspace arrays, which are all local to 328 328 !! this routine, except where passed as arguments to other routines 329 CALL wrk_dealloc( jpi, jpj , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n )329 CALL wrk_dealloc( jpi, jpj , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n ) 330 330 CALL wrk_dealloc( jpi, jpj, jpk, znmask ) 331 331 ! -
branches/2013/dev_r3867_MERCATOR1_DYN/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r3970 r4057 510 510 ! Update only tidal forcing at open boundaries 511 511 #if defined key_tide 512 #if defined key_bdy 512 513 IF ( lk_bdy .AND. lk_tide ) CALL bdy_dta_tides( kt, kit=jn, time_offset=(noffset+1) ) 514 #endif 513 515 IF ( ln_tide_pot .AND. lk_tide ) CALL upd_tide( kt, kit=jn, time_offset=noffset ) 514 516 #endif
Note: See TracChangeset
for help on using the changeset viewer.