Changeset 15787

Timestamp:

2022-04-22T11:35:37+02:00 (2 years ago)

Author:

jmedwards01

Message:

Merged in UKMO/r14075_read_tides_fix@15779 to avoid clash in bdytides.F90.

Location:

NEMO/branches/UKMO/NEMO_4.0.4_CO9_wadcpl/src/OCE/BDY

Files:

• bdydta.F90 (modified) (2 diffs)
• bdytides.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_wadcpl/src/OCE/BDY/bdydta.F90

@@ -96 +96 @@
       INTEGER ::  jbdy, jfld, jstart, jend, ib, jl    ! dummy loop indices
       INTEGER ::  ii, ij, ik, igrd, ipl               ! local integers
+      INTEGER,   DIMENSION(jpbgrd)     ::   ilen1
       TYPE(OBC_DATA)         , POINTER ::   dta_alias        ! short cut
       TYPE(FLD), DIMENSION(:), POINTER ::   bf_alias
@@ -352 +353 @@
             DO jbdy = 1, nb_bdy      ! Tidal component added in ts loop
                IF ( nn_dyn2d_dta(jbdy) .GE. 2 ) THEN
-                  IF( ASSOCIATED(dta_bdy(jbdy)%ssh) ) dta_bdy_s(jbdy)%ssh(:) = dta_bdy(jbdy)%ssh(:)
-                  IF( ASSOCIATED(dta_bdy(jbdy)%u2d) ) dta_bdy_s(jbdy)%u2d(:) = dta_bdy(jbdy)%u2d(:)
-                  IF( ASSOCIATED(dta_bdy(jbdy)%v2d) ) dta_bdy_s(jbdy)%v2d(:) = dta_bdy(jbdy)%v2d(:)
+                  IF( cn_dyn2d(jbdy) == 'frs' ) THEN
+                     ilen1(:)=idx_bdy(jbdy)%nblen(:)
+                  ELSE
+                     ilen1(:)=idx_bdy(jbdy)%nblenrim(:)
+                  ENDIF
+
+                  IF( ASSOCIATED(dta_bdy(jbdy)%ssh) ) dta_bdy_s(jbdy)%ssh(1:ilen1(1)) = dta_bdy(jbdy)%ssh(1:ilen1(1))
+                  IF( ASSOCIATED(dta_bdy(jbdy)%u2d) ) dta_bdy_s(jbdy)%u2d(1:ilen1(2)) = dta_bdy(jbdy)%u2d(1:ilen1(2))
+                  IF( ASSOCIATED(dta_bdy(jbdy)%v2d) ) dta_bdy_s(jbdy)%v2d(1:ilen1(3)) = dta_bdy(jbdy)%v2d(1:ilen1(3))
                ENDIF
             END DO

NEMO/branches/UKMO/NEMO_4.0.4_CO9_wadcpl/src/OCE/BDY/bdytides.F90

@@ -69 +69 @@
       INTEGER                                   ::   ii, ij              ! dummy loop indices
       INTEGER                                   ::   inum, igrd
-      INTEGER                                   ::   isz                 ! bdy data size
+      INTEGER, DIMENSION(3)                     ::   ilen0               ! length of boundary data (from OBC arrays)
       INTEGER                                   ::   ios                 ! Local integer output status for namelist read
       CHARACTER(len=80)                         ::   clfile              ! full file name for tidal input file 
@@ -117 +117 @@
             IF(lwp) WRITE(numout,*) ' '
 
+            ! If FRS scheme is used, we assume that tidal is needed over the whole relaxation area      
+            IF( cn_dyn2d(ib_bdy) == 'frs' ) THEN   ;   ilen0(:) = idx_bdy(ib_bdy)%nblen   (:)
+            ELSE                                   ;   ilen0(:) = idx_bdy(ib_bdy)%nblenrim(:)
+            ENDIF
+
             ! Allocate space for tidal harmonics data - get size from BDY data arrays
             ! Allocate also slow varying data in the case of time splitting:
@@ -122 +127 @@
             ! -----------------------------------------------------------------------
             IF( ASSOCIATED(dta%ssh) ) THEN   ! we use bdy ssh on this mpi subdomain
-               isz = SIZE(dta%ssh)
-               ALLOCATE( td%ssh0( isz, nb_harmo, 2 ), td%ssh( isz, nb_harmo, 2 ), dta_bdy_s(ib_bdy)%ssh( isz ) )
+               ALLOCATE( td%ssh0( ilen0(1), nb_harmo, 2 ), td%ssh( ilen0(1), nb_harmo, 2 ), dta_bdy_s(ib_bdy)%ssh( ilen0(1) ) )
                dta_bdy_s(ib_bdy)%ssh(:) = 0._wp   ! needed?
             ENDIF
             IF( ASSOCIATED(dta%u2d) ) THEN   ! we use bdy u2d on this mpi subdomain
-               isz = SIZE(dta%u2d)
-               ALLOCATE( td%u0  ( isz, nb_harmo, 2 ), td%u  ( isz, nb_harmo, 2 ), dta_bdy_s(ib_bdy)%u2d( isz ) )
+               ALLOCATE( td%u0  ( ilen0(2), nb_harmo, 2 ), td%u  ( ilen0(2), nb_harmo, 2 ), dta_bdy_s(ib_bdy)%u2d( ilen0(2) ) )
                dta_bdy_s(ib_bdy)%u2d(:) = 0._wp   ! needed?
             ENDIF
             IF( ASSOCIATED(dta%v2d) ) THEN   ! we use bdy v2d on this mpi subdomain
-               isz = SIZE(dta%v2d)
-               ALLOCATE( td%v0  ( isz, nb_harmo, 2 ), td%v  ( isz, nb_harmo, 2 ), dta_bdy_s(ib_bdy)%v2d( isz ) )
+               ALLOCATE( td%v0  ( ilen0(3), nb_harmo, 2 ), td%v  ( ilen0(3), nb_harmo, 2 ), dta_bdy_s(ib_bdy)%v2d( ilen0(3) ) )
                dta_bdy_s(ib_bdy)%v2d(:) = 0._wp   ! needed?
             ENDIF
@@ -214 +216 @@
                   !                                                              ! SSH fields
                   IF( ASSOCIATED(dta%ssh) ) THEN   ! we use bdy ssh on this mpi subdomain
-                     isz = SIZE(dta%ssh)
                      clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_T.nc'
                      CALL iom_open( clfile, inum )
-                     CALL fld_map( inum, 'z1', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1), kbdy=ib_bdy )
-                     td%ssh0(:,itide,1) = dta_read(1:isz,1,1)
-                     CALL fld_map( inum, 'z2', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1), kbdy=ib_bdy )
-                     td%ssh0(:,itide,2) = dta_read(1:isz,1,1)
+                     CALL fld_map( inum, 'z1', dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) , kbdy=ib_bdy)
+                     td%ssh0(:,itide,1) = dta_read(1:ilen0(1),1,1)
+                     CALL fld_map( inum, 'z2', dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) , kbdy=ib_bdy)
+                     td%ssh0(:,itide,2) = dta_read(1:ilen0(1),1,1)
                      CALL iom_close( inum )
                   ENDIF
                   !                                                              ! U fields
                   IF( ASSOCIATED(dta%u2d) ) THEN   ! we use bdy u2d on this mpi subdomain
-                     isz = SIZE(dta%u2d)
                      clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_U.nc'
                      CALL iom_open( clfile, inum )
-                     CALL fld_map( inum, 'u1', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2), kbdy=ib_bdy )
-                     td%u0(:,itide,1) = dta_read(1:isz,1,1)
-                     CALL fld_map( inum, 'u2', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2), kbdy=ib_bdy )
-                     td%u0(:,itide,2) = dta_read(1:isz,1,1)
+                     CALL fld_map( inum, 'u1', dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) , kbdy=ib_bdy)
+                     td%u0(:,itide,1) = dta_read(1:ilen0(2),1,1)
+                     CALL fld_map( inum, 'u2', dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) , kbdy=ib_bdy)
+                     td%u0(:,itide,2) = dta_read(1:ilen0(2),1,1)
                      CALL iom_close( inum )
                   ENDIF
                   !                                                              ! V fields
                   IF( ASSOCIATED(dta%v2d) ) THEN   ! we use bdy v2d on this mpi subdomain
-                     isz = SIZE(dta%v2d)
                      clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_V.nc'
                      CALL iom_open( clfile, inum )
-                     CALL fld_map( inum, 'v1', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3), kbdy=ib_bdy )
-                     td%v0(:,itide,1) = dta_read(1:isz,1,1)
-                     CALL fld_map( inum, 'v2', dta_read(1:isz,1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3), kbdy=ib_bdy )
-                     td%v0(:,itide,2) = dta_read(1:isz,1,1)
+                     CALL fld_map( inum, 'v1', dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) , kbdy=ib_bdy)
+                     td%v0(:,itide,1) = dta_read(1:ilen0(3),1,1)
+                     CALL fld_map( inum, 'v2', dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) , kbdy=ib_bdy)
+                     td%v0(:,itide,2) = dta_read(1:ilen0(3),1,1)
                      CALL iom_close( inum )
                   ENDIF