Changeset 1566 for trunk/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2009-07-31T16:34:08+02:00 (15 years ago)

Author:

rblod

Message:

Cosmetic changes: suppress useless variables and code review of the code changed when suppressing rigid-lid, see ticket #508

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -4 +4 @@
    !! Ocean initialization : domain initialization
    !!==============================================================================
-   !! History :  OPA  !  1995-12  (G. Madec)  Original code : s vertical coordinate
-   !!                 !  1997-07  (G. Madec)  lbc_lnk call
-   !!                 !  1997-04  (J.-O. Beismann) 
-   !!            8.5  !  2002-09 (A. Bozec, G. Madec)  F90: Free form and module
-   !!             -   !  2002-09 (A. de Miranda)  rigid-lid + islands
-   !!  NEMO      1.0  !  2003-08  (G. Madec)  F90: Free form and module
-   !!             -   !  2005-10  (A. Beckmann)  modifications for hybrid s-ccordinates & new stretching function
-   !!            2.0  !  2006-04  (R. Benshila, G. Madec)  add zgr_zco
-   !!            3.0  !  2008-06  (G. Madec)  insertion of domzgr_zps.h90 & conding style
+   !! History :  OPA  ! 1995-12  (G. Madec)  Original code : s vertical coordinate
+   !!                 ! 1997-07  (G. Madec)  lbc_lnk call
+   !!                 ! 1997-04  (J.-O. Beismann) 
+   !!            8.5  ! 2002-09 (A. Bozec, G. Madec)  F90: Free form and module
+   !!             -   ! 2002-09 (A. de Miranda)  rigid-lid + islands
+   !!  NEMO      1.0  ! 2003-08  (G. Madec)  F90: Free form and module
+   !!             -   ! 2005-10  (A. Beckmann)  modifications for hybrid s-ccordinates & new stretching function
+   !!            2.0  ! 2006-04  (R. Benshila, G. Madec)  add zgr_zco
+   !!            3.0  ! 2008-06  (G. Madec)  insertion of domzgr_zps.h90 & conding style
+   !!            3.2  ! 2009-07  (R. Benshila) Suppression of rigid-lid option
    !!----------------------------------------------------------------------
 
@@ -623 +624 @@
       ENDIF
 
-      ! Set to zero mbathy over islands if necessary
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) '         mbathy set to 0 over islands'
-      IF(lwp) WRITE(numout,*) '         ----------------------------'
-      !
-      mbathy(:,:) = MAX( 0, mbathy(:,:) )
-      !
       !  Boundary condition on mbathy
       IF( .NOT.lk_mpp ) THEN 
@@ -655 +649 @@
       ENDIF
 
-      ! control print
-      IF( lwp .AND. nprint == 1 ) THEN
+      IF( lwp .AND. nprint == 1 ) THEN      ! control print
          WRITE(numout,*)
          WRITE(numout,*) ' bathymetric field :   number of non-zero T-levels '
@@ -1027 +1020 @@
       REAL(wp), INTENT(in   ) ::   bb    ! Stretching coefficient
       REAL(wp)                ::   pf1   ! sigma value
-
-      !!----------------------------------------------------------------------
-      !
-      IF ( theta == 0 ) then   !uniform sigma
-         pf1 = -(pk1-0.5)/REAL(jpkm1)
-      ELSE    ! stretched sigma
+      !!----------------------------------------------------------------------
+      !
+      IF ( theta == 0 ) then      ! uniform sigma
+         pf1 = -(pk1-0.5) / REAL( jpkm1 )
+      ELSE                        ! stretched sigma
          pf1 =   (1.0-bb) * (sinh( theta*(-(pk1-0.5)/REAL(jpkm1)) ) ) / sinh(theta) + &
-                 bb * ( (tanh( theta*( (-(pk1-0.5)/REAL(jpkm1)) + 0.5) ) - tanh(0.5*theta) ) / &
-                 (2*tanh(0.5*theta) ) )
-      ENDIF
-
+            &    bb * ( (tanh( theta*( (-(pk1-0.5)/REAL(jpkm1)) + 0.5) ) - tanh(0.5*theta) ) / &
+            &    (2*tanh(0.5*theta) ) )
+      ENDIF
+      !
    END FUNCTION fssig1
 
@@ -1078 +1070 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zenv, ztmp, zmsk    ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj) ::   zri , zrj , zhbat   !  -     -
-
-      LOGICAL :: ln_s_sigma = .false. !use hybrid s_sigma coordinates & stretching function fssig1,used with ln_sco = .true.
+      !!
+      LOGICAL  :: ln_s_sigma = .false. !use hybrid s_sigma coordinates & stretching function fssig1,used with ln_sco = .true.
       REAL(wp) :: bb = 0.8   ! stretching parameter for song and haidvogel stretching, bb=0; top only, bb =1; top and bottom
       REAL(wp) :: hc = 150   ! Critical depth for s-sigma coordinates
-
+!!gm never do that !!!!   ==> Pb at compilation phase on several computer
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigw3 = 0.0d0
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   gsigt3 = 0.0d0
@@ -1093 +1085 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwu3 = 0.0d0
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   esigwv3 = 0.0d0
+!!gm end
       !!
       NAMELIST/nam_zgr_sco/ sbot_max, sbot_min, theta, thetb, r_max, ln_s_sigma, bb, hc