Changeset 12558

Timestamp:

2020-03-15T20:51:02+01:00 (3 years ago)

Author:

jcastill

Message:

Update vertical interpolation code for boundaries, based on later trunk version

File:

• NEMO/branches/UKMO/r12083_India_uncoupled/src/OCE/SBC/fldread.F90 (modified) (3 diffs)

NEMO/branches/UKMO/r12083_India_uncoupled/src/OCE/SBC/fldread.F90

@@ -843 +843 @@
       INTEGER                                   ::   ipi             ! length of boundary data on local process
       INTEGER                                   ::   ipkb            ! number of vertical levels in boundary data file
+      INTEGER                                   ::   ipkmax          ! number of vertical levels in boundary data file where no mask
       INTEGER                                   ::   jb, ji, jj, jk, jkb   ! loop counters
       REAL(wp)                                  ::   zcoef
@@ -864 +865 @@
          jj = idx_bdy(kbdy)%nbj(jb,kgrd)
          zh  = SUM(pdta_read_dz(jb,1,:) )
+         !
+         ! --- max jk where input data /= FillValue --- !
+         ipkmax = 1
+         DO jkb = 2, ipkb
+            IF( pdta_read(jb,1,jkb) /= pfv )   ipkmax = MAX( ipkmax, jkb )
+         END DO
          !
          ! Warnings to flag differences in the input and model topgraphy - is this useful/necessary?
@@ -926 +933 @@
             IF(     zdepth(jk) < pdta_read_z(jb,1,          1) ) THEN                ! above the first level of external data
                pdta(jb,1,jk) =  pdta_read(jb,1,1)
-            ELSEIF( zdepth(jk) > MAXVAL(pdta_read_z(jb,1,:),1) ) THEN                ! below the last level of external data 
-               pdta(jb,1,jk) =  pdta_read(jb,1,MAXLOC(pdta_read_z(jb,1,:),1))
+            ELSEIF( zdepth(jk) > pdta_read_z(jb,1,ipkmax) ) THEN                ! below the last level of external data 
+               pdta(jb,1,jk) =  pdta_read(jb,1,ipkmax)
             ELSE                                                             ! inbetween: vertical interpolation between jkb & jkb+1
-               DO jkb = 1, ipkb-1                                            ! when  gdept_n(jkb) < zdepth(jk) < gdept_n(jkb+1)
+               DO jkb = 1, ipkmax-1                                          ! when  gdept_n(jkb) < zdepth(jk) < gdept_n(jkb+1)
                   IF( ( ( zdepth(jk) - pdta_read_z(jb,1,jkb) ) * ( zdepth(jk) - pdta_read_z(jb,1,jkb+1) ) <= 0._wp ) &
                      &    .AND. ( pdta_read_z(jb,1,jkb+1) /= zfv_alt) ) THEN   ! linear interpolation between 2 levels