Changeset 5700 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP

Timestamp:

2015-08-18T13:10:40+02:00 (9 years ago)

Author:

jamesharle

Message:

Bug fixes for structured boundary conditions using BDY on-the-fly
interpolation. Structured boundary conditions example now matches
the unstructured equivalent.

File:

• branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (7 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -761 +761 @@
       CASE(1)        ;   
       CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1    ), nrec )
-         IF (ipj==1) THEN ! we assume that this is an un-structured open boundary file
+         IF ( map%ll_unstruc) THEN ! unstructured open boundary data file
             DO ib = 1, ipi
               DO ik = 1, ipk
@@ -803 +803 @@
 
 #if defined key_bdy
-         CALL fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl)
+         CALL fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta)
 #endif
       ELSE ! boundary data assumed to be on model grid
          
          CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1:ipk), nrec )                    
-         IF (ipj==1) THEN ! we assume that this is an un-structured open boundary file
+         IF ( map%ll_unstruc) THEN ! unstructured open boundary data file
             DO ib = 1, ipi
               DO ik = 1, ipk
@@ -829 +829 @@
    
 #if defined key_bdy
-   SUBROUTINE fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl)
+   SUBROUTINE fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta)
 
       !!---------------------------------------------------------------------
@@ -852 +852 @@
       INTEGER                                 ::   ipj        ! length of dummy dimension ( = 1 )
       INTEGER                                 ::   ipk ! number of vertical levels of dta ( 2D: ipk=1 ; 3D: ipk=jpk )
-      INTEGER                                 ::   ilendta    ! length of data in file
+      INTEGER, INTENT(in)                                 ::   ilendta    ! length of data in file
       INTEGER                                 ::   ib, ik, ikk! loop counters
       INTEGER                                 ::   ji, jj ! loop counters
@@ -859 +859 @@
       !!---------------------------------------------------------------------
      
-      WRITE(*,*) 'in bdy interp' 
 
       ipi       = SIZE( dta, 1 )
       ipj       = SIZE( dta_read, 2 )
       ipk       = SIZE( dta, 3 )
-      ilendta   = SIZE( dta_read, 1 )
       jpkm1_bdy = jpk_bdy-1
- 
+      
       fv_alt = -ABS(fv)  ! set _FillValue < 0 as we make use of MAXVAL and MAXLOC later
       
@@ -966 +964 @@
          ENDDO 
        
+
          DO ib = 1, ipi
             jj=1+floor(REAL(map%ptr(ib)-1)/REAL(ilendta))
@@ -973 +972 @@
                IF( zl < dta_read_z(ji,jj,1) ) THEN                                         ! above the first level of external data
                   dta(ib,1,ik) =  dta_read(ji,jj,1)
-               ELSEIF( zl > MAXVAL(dta_read_z(ji,ji,:),1) ) THEN                           ! below the last level of external data 
+               ELSEIF( zl > MAXVAL(dta_read_z(ji,jj,:),1) ) THEN                           ! below the last level of external data 
                   dta(ib,1,ik) =  dta_read(ji,jj,MAXLOC(dta_read_z(ji,jj,:),1))
                ELSE                                                                          ! inbetween : vertical interpolation between ikk & ikk+1