Changeset 2093 for branches/DEV_r1986_BDY_updates/NEMO/OPA_SRC/BDY/bdytides.F90

Timestamp:

2010-09-15T09:39:38+02:00 (14 years ago)

Author:

davestorkey

Message:

Main change set.

File:

• branches/DEV_r1986_BDY_updates/NEMO/OPA_SRC/BDY/bdytides.F90 (modified) (12 diffs)

branches/DEV_r1986_BDY_updates/NEMO/OPA_SRC/BDY/bdytides.F90

@@ -7 +7 @@
    !!            2.3  !  2008-01  (J.Holt)  Add date correction. Origins POLCOMS v6.3 2007
    !!            3.0  !  2008-04  (NEMO team)  add in the reference version
+   !!            3.3  !  2010-09  (D.Storkey and E.O'Dea)  bug fixes
    !!----------------------------------------------------------------------
 #if defined key_bdy
@@ -31 +32 @@
    USE bdy_par         ! Unstructured boundary parameters
    USE bdy_oce         ! ocean open boundary conditions
+   USE daymod          ! calendar
 
    IMPLICIT NONE
@@ -41 +43 @@
    LOGICAL, PUBLIC            ::   ln_tide_date            !: =T correct tide phases and amplitude for model start date
 
-   INTEGER, PARAMETER ::   jptides_max = 15      !: Max number of tidal contituents
-   INTEGER            ::   ntide                 !: Actual number of tidal constituents
+   INTEGER, PARAMETER,PUBLIC  ::   jptides_max = 15      !: Max number of tidal contituents
+   INTEGER, PUBLIC            ::   ntide                 !: Actual number of tidal constituents
 
    CHARACTER(len=80), PUBLIC                         ::   filtide    !: Filename root for tidal input files
    CHARACTER(len= 4), PUBLIC, DIMENSION(jptides_max) ::   tide_cpt   !: Names of tidal components used.
 
-   INTEGER , DIMENSION(jptides_max) ::   nindx        !: ???
-   REAL(wp), DIMENSION(jptides_max) ::   tide_speed   !: Phase speed of tidal constituent (deg/hr)
+   INTEGER , DIMENSION(jptides_max), PUBLIC ::   nindx        !: ???
+   REAL(wp), DIMENSION(jptides_max), PUBLIC ::   tide_speed   !: Phase speed of tidal constituent (deg/hr)
    
    REAL(wp), DIMENSION(jpbdim,jptides_max)  ::   ssh1, ssh2   !: Tidal constituents : SSH
@@ -86 +88 @@
       READ  ( numnam, nambdy_tide )
       !                                               ! Count number of components specified
-      ntide = jptides_max
-      itide = 1
-      DO WHILE( tide_cpt(itide) /= '' )
-         ntide = itide
-         itide = itide + 1
-      END DO
+      ntide=jptides_max
+      do itide = 1, jptides_max
+        if ( tide_cpt(itide) == '' ) then
+           ntide = itide-1
+           exit
+        endif
+      enddo
+
       !                                               ! find constituents in standard list
       DO itide = 1, ntide
@@ -145 +149 @@
       CHARACTER(len=80) :: clfile         ! full file name for tidal input file 
       INTEGER ::   ipi, ipj, inum, idvar  ! temporary integers (netcdf read)
-      INTEGER, DIMENSION(3) :: lendta=0   ! length of data in the file (note may be different from nblendta!)
+      INTEGER, DIMENSION(6) :: lendta=0   ! length of data in the file (note may be different from nblendta!)
       REAL(wp) ::  z_arg, z_atde, z_btde, z1t, z2t           
       REAL(wp), DIMENSION(jpbdta,1) ::   zdta   ! temporary array for data fields
@@ -161 +165 @@
          IF(lwp) WRITE(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 1
+         igrd = 4
          IF( nblendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'z1' )
@@ -183 +187 @@
          IF(lwp) WRITE(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 2
+         igrd = 5
          IF( lendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'u1' )
@@ -204 +208 @@
          if(lwp) write(numout,*) 'Reading data from file ', clfile
          CALL iom_open( clfile, inum )
-         igrd = 3
+         igrd = 6
          IF( lendta(igrd) <= 0 ) THEN 
             idvar = iom_varid( inum,'v1' )
@@ -252 +256 @@
             ENDIF
             !                                         !  elevation         
-            igrd = 1
+            igrd = 4
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * ssh1(ib,itide) + z_btde * ssh2(ib,itide)
@@ -260 +264 @@
             END DO
             !                                         !  u       
-            igrd = 2
+            igrd = 5
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * u1(ib,itide) + z_btde * u2(ib,itide)
@@ -268 +272 @@
             END DO
             !                                         !  v       
-            igrd = 3
+            igrd = 6
             DO ib = 1, nblenrim(igrd)                
                z1t = z_atde * v1(ib,itide) + z_btde * v2(ib,itide)
@@ -320 +324 @@
       !
       DO itide = 1, ntide
-         igrd=1                              ! SSH on tracer grid.
+         igrd=4                              ! SSH on tracer grid.
          DO ib = 1, nblenrim(igrd)
             sshtide(ib) =sshtide(ib)+ ssh1(ib,itide)*z_cost(itide) + ssh2(ib,itide)*z_sist(itide)
             !    if(lwp) write(numout,*) 'z',ib,itide,sshtide(ib), ssh1(ib,itide),ssh2(ib,itide)
          END DO
-         igrd=2                              ! U grid
+         igrd=5                              ! U grid
          DO ib=1, nblenrim(igrd)
             utide(ib) = utide(ib)+ u1(ib,itide)*z_cost(itide) + u2(ib,itide)*z_sist(itide)
             !    if(lwp) write(numout,*) 'u',ib,itide,utide(ib), u1(ib,itide),u2(ib,itide)
          END DO
-         igrd=3                              ! V grid
+         igrd=6                              ! V grid
          DO ib=1, nblenrim(igrd)
             vtide(ib) = vtide(ib)+ v1(ib,itide)*z_cost(itide) + v2(ib,itide)*z_sist(itide)