Changeset 15644

Timestamp:

2022-01-14T14:56:10+01:00 (2 years ago)

Author:

jmedwards01

Message:

Passively running version (14/1/22)

Location:

NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE

Files:

• BDY/bdydta.F90 (modified) (2 diffs)
• BDY/bdytides.F90 (modified) (3 diffs)
• SBC/fldread.F90 (modified) (2 diffs)
• SBC/sbccpl.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/BDY/bdydta.F90

@@ -412 +412 @@
       bf(:,:)%lzint      = .FALSE.      ! default definition
       bf(:,:)%ltotvel    = .FALSE.      ! default definition
+      DO jbdy = 1, nb_bdy
+        bf(:,jbdy)%ibdy = jbdy
+      END DO
  
       ! Read namelists
@@ -626 +629 @@
                   bf_alias(1)%ltotvel = ln_full_vel                           ! T if u3d is full velocity
                   bf_alias(1)%lzint   = ln_zinterp                            ! T if it requires a vertical interpolation
+!                 This is needed to avoid crashes with SSH. It has been
+!                 added in 4.0.6
+                  bf_alias(1)%ibdy    = jbdy
                ENDIF
 

NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/BDY/bdytides.F90

@@ -212 +212 @@
                   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:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,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) )
+                  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 )
@@ -220 +220 @@
                   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:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) )
+                  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) )
+                  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 )
@@ -228 +228 @@
                   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:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) )
+                  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) )
+                  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 )

NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/SBC/fldread.F90

@@ -420 +420 @@
          !
          ! read before data in after arrays(as we will swap it later)
-         CALL fld_get( sdjf )
+         if (allocated(sdjf%fnow)) then
+         ! Running the code suggests this array is always allocated, but may
+         ! have zero size.
+            IF (SIZE(sdjf%fnow,1) > 0) CALL fld_get( sdjf )
+         endif
          !
          clfmt = "('   fld_init : time-interpolation for ', a, ' read previous record = ', i6, ' at time = ', f7.2, ' days')"
@@ -758 +762 @@
                
                CALL iom_getatt(knum, '_FillValue', zfv, cdvar=cdvar )
-               CALL fld_bdy_interp(zdta_read, zdta_read_z, zdta_read_dz, pdta, kgrd, kbdy, zfv, ldtotvel)
+!              kbdy can be zero and will give Oob messages with bounds
+!              checking. If it becomes negative the code will crash.
+!              Once the missing initialization of ibdy in bdydta is
+!              fixed, we no longer seem to get -1. Will leave the MAX
+!              check for now.
+               CALL fld_bdy_interp(zdta_read, zdta_read_z, zdta_read_dz, pdta, kgrd, MAX(kbdy,0), zfv, ldtotvel)
                DEALLOCATE( zdta_read, zdta_read_z, zdta_read_dz )
                

NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/SBC/sbccpl.F90

@@ -584 +584 @@
       !                                                      !    sea bed temperature    !   
       !                                                      ! ------------------------- !
-      srcv(jpr_ts_ice)%clname = 'OT_bed'    ! needed by Met Office
-      IF ( TRIM( sn_rcv_t_bed%cldes ) == 'coupled' )   srcv(jpr_ts_ice)%laction = .TRUE.
+      srcv(jpr_t_bed)%clname = 'OT_bed'    ! needed by Met Office
+      IF ( TRIM( sn_rcv_t_bed%cldes ) == 'coupled' )   srcv(jpr_t_bed)%laction = .TRUE.
 
       !                                                      ! ------------------------- !