Changeset 4372


Ignore:
Timestamp:
2014-01-24T11:42:57+01:00 (7 years ago)
Author:
jchanut
Message:

fixed conflict with definition of ht(:,:) in dom_oce

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90

    r4328 r4372  
    108108      REAL(wp) :: hramp                         ! depth over which Neptune vel. is ramped down 
    109109      ! 
    110       REAL(wp), POINTER, DIMENSION(:,:  ) :: ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n       
     110      REAL(wp), POINTER, DIMENSION(:,:  ) :: zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n       
    111111      REAL(wp), POINTER, DIMENSION(:,:,:) :: znmask 
    112112      !! 
     
    148148      IF( .NOT. ln_neptsimp ) RETURN 
    149149      !                                 ! 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  )  
    151151      CALL wrk_alloc( jpi, jpj, jpk, znmask                                          )  
    152152 
     
    199199 
    200200      IF( ln_smooth_neptvel ) THEN 
    201          CALL dyn_nept_smooth_vel( htn, ht, .TRUE. ) 
    202       !! overwrites ht with a smoothed version of htn 
     201         CALL dyn_nept_smooth_vel( htn, zht, .TRUE. ) 
     202      !! overwrites zht with a smoothed version of htn 
    203203      ELSE 
    204          ht(:,:) = htn(:,:) 
     204         zht(:,:) = htn(:,:) 
    205205      !! use unsmoothed version of htn 
    206206      ENDIF 
    207       CALL lbc_lnk( ht, 'F', 1.0_wp ) 
     207      CALL lbc_lnk( zht, 'F', 1.0_wp ) 
    208208 
    209209      !! Compute tsp, a stream function for the Neptune velocity, 
     
    217217      tscale(:,:) = rn_tslsp + (rn_tslse - rn_tslsp) *   & 
    218218                   ( 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(:,:) 
    220220 
    221221 
     
    333333!!    Deallocate temporary workspace arrays, which are all local to 
    334334!!    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  )  
    336336      CALL wrk_dealloc( jpi, jpj, jpk, znmask                                          )  
    337337      ! 
Note: See TracChangeset for help on using the changeset viewer.