Changeset 4372

Timestamp:

2014-01-24T11:42:57+01:00 (10 years ago)

Author:

jchanut

Message:

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

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) (5 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90

@@ -108 +108 @@
       REAL(wp) :: hramp                         ! depth over which Neptune vel. is ramped down
       !
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n      
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n      
       REAL(wp), POINTER, DIMENSION(:,:,:) :: znmask
       !!
@@ -148 +148 @@
       IF( .NOT. ln_neptsimp ) RETURN
       !                                 ! Dynamically allocate local work arrays
-      CALL wrk_alloc( jpi, jpj     , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n  ) 
+      CALL wrk_alloc( jpi, jpj     , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n  ) 
       CALL wrk_alloc( jpi, jpj, jpk, znmask                                          ) 
 
@@ -199 +199 @@
 
       IF( ln_smooth_neptvel ) THEN
-         CALL dyn_nept_smooth_vel( htn, ht, .TRUE. )
-      !! overwrites ht with a smoothed version of htn
+         CALL dyn_nept_smooth_vel( htn, zht, .TRUE. )
+      !! overwrites zht with a smoothed version of htn
       ELSE
-         ht(:,:) = htn(:,:)
+         zht(:,:) = htn(:,:)
       !! use unsmoothed version of htn
       ENDIF
-      CALL lbc_lnk( ht, 'F', 1.0_wp )
+      CALL lbc_lnk( zht, 'F', 1.0_wp )
 
       !! Compute tsp, a stream function for the Neptune velocity,
@@ -217 +217 @@
       tscale(:,:) = rn_tslsp + (rn_tslse - rn_tslsp) *   &
                    ( 0.5_wp + 0.5_wp * COS( 2.0_wp * rad * gphif(:,:) )  )
-      tsp   (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * ht(:,:)
+      tsp   (:,:) = -2.0_wp * omega * SIN( rad * gphif(:,:) ) * tscale(:,:) * tscale(:,:) * zht(:,:)
 
 
@@ -333 +333 @@
 !!    Deallocate temporary workspace arrays, which are all local to
 !!    this routine, except where passed as arguments to other routines
-      CALL wrk_dealloc( jpi, jpj     , ht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n  ) 
+      CALL wrk_dealloc( jpi, jpj     , zht, htn, tscale, tsp, hur_n, hvr_n, hu_n, hv_n  ) 
       CALL wrk_dealloc( jpi, jpj, jpk, znmask                                          ) 
       !