Changeset 1601 for trunk/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2009-08-11T12:09:19+02:00 (15 years ago)

Author:

ctlod

Message:

Doctor naming of OPA namelist variables , see ticket: #526

File:

• trunk/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (9 diffs)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -36 +36 @@
    PUBLIC   dom_msk    ! routine called by inidom.F90
 
-   REAL(wp) ::   shlat = 2.   ! type of lateral boundary condition on velocity (namelist namlbc)
+   !                            !!* Namelist namlbc : lateral boundary condition *
+   REAL(wp) ::   rn_shlat = 2.   ! type of lateral boundary condition on velocity
    
    !! * Substitutions
@@ -77 +78 @@
       !!
       !!        The lateral friction is set through the value of fmask along
-      !!      the coast and topography. This value is defined by shlat, a
+      !!      the coast and topography. This value is defined by rn_shlat, a
       !!      namelist parameter:
-      !!         shlat = 0, free slip  (no shear along the coast)
-      !!         shlat = 2, no slip  (specified zero velocity at the coast)
-      !!         0 < shlat < 2, partial slip   | non-linear velocity profile
-      !!         2 < shlat, strong slip        | in the lateral boundary layer
+      !!         rn_shlat = 0, free slip  (no shear along the coast)
+      !!         rn_shlat = 2, no slip  (specified zero velocity at the coast)
+      !!         0 < rn_shlat < 2, partial slip   | non-linear velocity profile
+      !!         2 < rn_shlat, strong slip        | in the lateral boundary layer
       !!
       !!      N.B. If nperio not equal to 0, the land/ocean mask arrays
@@ -106 +107 @@
       !!               vmask    : land/ocean mask at v-point (=0. or 1.)
       !!               fmask    : land/ocean mask at f-point (=0. or 1.)
-      !!                          =shlat along lateral boundaries
+      !!                          =rn_shlat along lateral boundaries
       !!               bmask    : land/ocean mask at barotropic stream
       !!                          function point (=0. or 1.) and set to 0 along lateral boundaries
@@ -114 +115 @@
       INTEGER  ::   iif, iil, ii0, ii1, ii
       INTEGER  ::   ijf, ijl, ij0, ij1
-      INTEGER, DIMENSION(jpi,jpj) ::  imsk
+      INTEGER , DIMENSION(jpi,jpj) ::  imsk
       REAL(wp), DIMENSION(jpi,jpj) ::   zwf
-
-      NAMELIST/namlbc/ shlat
+      !!
+      NAMELIST/namlbc/ rn_shlat
       !!---------------------------------------------------------------------
       
@@ -128 +129 @@
          WRITE(numout,*) '~~~~~~'
          WRITE(numout,*) '   Namelist namlbc'
-         WRITE(numout,*) '      lateral momentum boundary cond. shlat = ',shlat
-      ENDIF
-
-      IF(             shlat == 0.            ) THEN   ;   IF(lwp) WRITE(numout,*) '         ocean lateral free-slip '
-        ELSEIF (      shlat == 2.            ) THEN   ;   IF(lwp) WRITE(numout,*) '         ocean lateral  no-slip '
-        ELSEIF ( 0. < shlat .AND. shlat < 2. ) THEN   ;   IF(lwp) WRITE(numout,*) '         ocean lateral  partial-slip '
-        ELSEIF ( 2. < shlat                  ) THEN   ;   IF(lwp) WRITE(numout,*) '         ocean lateral  strong-slip '
-        ELSE
-          WRITE(ctmp1,*) ' shlat is negative = ', shlat
-          CALL ctl_stop( ctmp1 )
+         WRITE(numout,*) '      lateral momentum boundary cond.    rn_shlat = ',rn_shlat
+      ENDIF
+
+      IF     (      rn_shlat == 0.               ) THEN   ;   IF(lwp) WRITE(numout,*) '   ocean lateral free-slip '
+      ELSEIF (      rn_shlat == 2.               ) THEN   ;   IF(lwp) WRITE(numout,*) '   ocean lateral  no-slip '
+      ELSEIF ( 0. < rn_shlat .AND. rn_shlat < 2. ) THEN   ;   IF(lwp) WRITE(numout,*) '   ocean lateral  partial-slip '
+      ELSEIF ( 2. < rn_shlat                     ) THEN   ;   IF(lwp) WRITE(numout,*) '   ocean lateral  strong-slip '
+      ELSE
+         WRITE(ctmp1,*) ' rn_shlat is negative = ', rn_shlat
+         CALL ctl_stop( ctmp1 )
       ENDIF
 
@@ -148 +149 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               IF( REAL( mbathy(ji,jj) - jk ) +.1 >= 0.e0 ) tmask(ji,jj,jk) = 1.e0
+               IF( REAL( mbathy(ji,jj) - jk ) +.1 >= 0.e0 )   tmask(ji,jj,jk) = 1.e0
             END DO  
          END DO  
@@ -155 +156 @@
 !!gm  ????
 #if defined key_zdfkpp
-      IF( cp_cfg == 'orca' )   THEN
-         IF( jp_cfg == 2 )   THEN
-            ! land point on Bab el Mandeb zonal section
+      IF( cp_cfg == 'orca' ) THEN
+         IF( jp_cfg == 2 )   THEN       ! land point on Bab el Mandeb zonal section
             ij0 =  87   ;   ij1 =  88
             ii0 = 160   ;   ii1 = 161
@@ -283 +283 @@
             DO ji = fs_2, fs_jpim1   ! vector opt.
                IF( fmask(ji,jj,jk) == 0. ) THEN
-                  fmask(ji,jj,jk) = shlat * MIN( 1., MAX( zwf(ji+1,jj), zwf(ji,jj+1),   &
-                     &                                    zwf(ji-1,jj), zwf(ji,jj-1)  )  )
+                  fmask(ji,jj,jk) = rn_shlat * MIN( 1., MAX( zwf(ji+1,jj), zwf(ji,jj+1),   &
+                     &                                       zwf(ji-1,jj), zwf(ji,jj-1)  )  )
                ENDIF
             END DO
@@ -290 +290 @@
          DO jj = 2, jpjm1
             IF( fmask(1,jj,jk) == 0. ) THEN
-               fmask(1  ,jj,jk) = shlat * MIN( 1., MAX( zwf(2,jj), zwf(1,jj+1), zwf(1,jj-1) ) )
+               fmask(1  ,jj,jk) = rn_shlat * MIN( 1., MAX( zwf(2,jj), zwf(1,jj+1), zwf(1,jj-1) ) )
             ENDIF
             IF( fmask(jpi,jj,jk) == 0. ) THEN
-               fmask(jpi,jj,jk) = shlat * MIN( 1., MAX( zwf(jpi,jj+1), zwf(jpim1,jj), zwf(jpi,jj-1) ) )
+               fmask(jpi,jj,jk) = rn_shlat * MIN( 1., MAX( zwf(jpi,jj+1), zwf(jpim1,jj), zwf(jpi,jj-1) ) )
             ENDIF
          END DO         
          DO ji = 2, jpim1
             IF( fmask(ji,1,jk) == 0. ) THEN
-               fmask(ji, 1 ,jk) = shlat * MIN( 1., MAX( zwf(ji+1,1), zwf(ji,2), zwf(ji-1,1) ) )
+               fmask(ji, 1 ,jk) = rn_shlat * MIN( 1., MAX( zwf(ji+1,1), zwf(ji,2), zwf(ji-1,1) ) )
             ENDIF
             IF( fmask(ji,jpj,jk) == 0. ) THEN
-               fmask(ji,jpj,jk) = shlat * MIN( 1., MAX( zwf(ji+1,jpj), zwf(ji-1,jpj), zwf(ji,jpjm1) ) )
+               fmask(ji,jpj,jk) = rn_shlat * MIN( 1., MAX( zwf(ji+1,jpj), zwf(ji-1,jpj), zwf(ji,jpjm1) ) )
             ENDIF
          END DO