Changeset 1606

Timestamp:

2009-08-11T15:33:19+02:00 (15 years ago)

Author:

ctlod

Message:

correct minor compilation error due to Doctor naming of OPA namelist variables, see ticket: #525

Location:

trunk/NEMO/TOP_SRC

Files:

• TRP/trcbbl.F90 (modified) (4 diffs)
• TRP/trcbbl_adv.h90 (modified) (4 diffs)
• oce_trc.F90 (modified) (1 diff)

trunk/NEMO/TOP_SRC/TRP/trcbbl.F90

@@ -260 +260 @@
       ! Sign of the local density gradient along the i- and j-slopes
       ! multiplied by the slope of the ocean bottom
-      SELECT CASE ( neos )
+      SELECT CASE ( nn_eos )
 
       CASE ( 0 )                 ! Jackett and McDougall (1994) formulation
@@ -354 +354 @@
         DO ji = 1, fs_jpim1   ! vector opt.
             ! local density gradient along i-bathymetric slope
-            zgdrho = - ( rbeta*( zsnb(ji+1,jj) - zsnb(ji,jj) )   &
-                     -  ralpha*( ztnb(ji+1,jj) - ztnb(ji,jj) ) )
+            zgdrho = - ( rn_beta*( zsnb(ji+1,jj) - zsnb(ji,jj) )   &
+                     -  rn_alpha*( ztnb(ji+1,jj) - ztnb(ji,jj) ) )
             ! sign of local i-gradient of density multiplied by the i-slope
             zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) )
@@ -365 +365 @@
         DO ji = 1, fs_jpim1   ! vector opt.
             ! local density gradient along j-bathymetric slope
-            zgdrho = - ( rbeta*( zsnb(ji,jj+1) - zsnb(ji,jj) )   &
-                     -  ralpha*( ztnb(ji,jj+1) - ztnb(ji,jj) ) )
+            zgdrho = - ( rn_beta*( zsnb(ji,jj+1) - zsnb(ji,jj) )   &
+                     -  rn_alpha*( ztnb(ji,jj+1) - ztnb(ji,jj) ) )
             ! sign of local j-gradient of density multiplied by the j-slope
             zsign = sign( 0.5, -zgdrho * ( zdep(ji,jj+1) - zdep(ji,jj) ) )
@@ -375 +375 @@
       CASE DEFAULT
 
-         WRITE(ctmp1,*) '          bad flag value for neos = ', neos
+         WRITE(ctmp1,*) '          bad flag value for nn_eos = ', nn_eos
          CALL ctl_stop( ctmp1 )
 

trunk/NEMO/TOP_SRC/TRP/trcbbl_adv.h90

@@ -134 +134 @@
       ! multiplied by the slope of the ocean bottom
 
-      SELECT CASE ( neos )
+      SELECT CASE ( nn_eos )
 
       CASE ( 0 )               ! Jackett and McDougall (1994) formulation
@@ -215 +215 @@
         DO ji = 1, fs_jpim1   ! vector opt.
        ! local density gradient along i-bathymetric slope
-            zgdrho = - ( rbeta*( zsnb(ji+1,jj) - zsnb(ji,jj) )   &
-                     -  ralpha*( ztnb(ji+1,jj) - ztnb(ji,jj) ) )
+            zgdrho = - ( rn_beta*( zsnb(ji+1,jj) - zsnb(ji,jj) )   &
+                     -  rn_alpha*( ztnb(ji+1,jj) - ztnb(ji,jj) ) )
             ! sign of local i-gradient of density multiplied by the i-slope
             zsign = SIGN( 0.5, - zgdrho * ( zdep(ji+1,jj) - zdep(ji,jj) ) )
@@ -227 +227 @@
         DO ji = 1, fs_jpim1   ! vector opt.
       ! local density gradient along j-bathymetric slope
-            zgdrho = - ( rbeta*( zsnb(ji,jj+1) - zsnb(ji,jj) )   &
-                   -    ralpha*( ztnb(ji,jj+1) - ztnb(ji,jj) ) )   
+            zgdrho = - ( rn_beta*( zsnb(ji,jj+1) - zsnb(ji,jj) )   &
+                   -    rn_alpha*( ztnb(ji,jj+1) - ztnb(ji,jj) ) )   
             ! sign of local j-gradient of density multiplied by the j-slope
             zsign = SIGN( 0.5, -zgdrho     * ( zdep(ji,jj+1) - zdep(ji,jj) ) )  
@@ -240 +240 @@
 
          IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          bad flag value for neos = ', neos
+         IF(lwp) WRITE(numout,*) '          bad flag value for nn_eos = ', nn_eos
          nstop = nstop + 1
 

trunk/NEMO/TOP_SRC/oce_trc.F90

@@ -188 +188 @@
    !* bottom boundary layer *
 # if   defined key_trabbl_dif   ||   defined key_trabbl_adv
-   USE trabbl , ONLY :   atrbbl   =>   atrbbl     !: lateral coeff. for bottom boundary layer scheme (m2/s)
+   USE trabbl , ONLY :   atrbbl   =>   rn_ahtbbl     !: lateral coeff. for bottom boundary layer scheme (m2/s)
 #  if defined key_off_tra
    USE trabbl, ONLY :   bblx   => bblx         !: ???