Changeset 5035

Timestamp:

2015-01-16T10:53:11+01:00 (9 years ago)

Author:

jamesharle

Message:

Update to reading in thickness variables in BDY read for bt velocity
adjustment when using interpolation on the fly.

File:

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

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

@@ -753 +753 @@
          CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1:jpk_bdy), nrec )
          SELECT CASE( igrd )                  
-            CASE(1); CALL iom_get ( num, jpdom_unknown, 'gdept', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
-            CASE(2); CALL iom_get ( num, jpdom_unknown, 'gdepu', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
-            CASE(3); CALL iom_get ( num, jpdom_unknown, 'gdepv', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
+            CASE(1)
+               CALL iom_get ( num, jpdom_unknown, 'gdept', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
+               CALL iom_get ( num, jpdom_unknown, 'e3t', dta_read_dz(1:ilendta,1:ipj,1:jpk_bdy) )
+            CASE(2)  
+               CALL iom_get ( num, jpdom_unknown, 'gdepu', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
+               CALL iom_get ( num, jpdom_unknown, 'e3u', dta_read_dz(1:ilendta,1:ipj,1:jpk_bdy) )
+            CASE(3)
+               CALL iom_get ( num, jpdom_unknown, 'gdepv', dta_read_z(1:ilendta,1:ipj,1:jpk_bdy) )
+               CALL iom_get ( num, jpdom_unknown, 'e3v', dta_read_dz(1:ilendta,1:ipj,1:jpk_bdy) )
          END SELECT
          CALL iom_getatt(num, '_FillValue', fv, cdvar=clvar )
@@ -822 +828 @@
       IF (ipj==1) THEN ! we assume that this is an un-structured open boundary file
          DO ib = 1, ipi
-            DO ik = 1, ipk                      
+            DO ik = 1, jpk_bdy
                IF( ( dta_read(map(ib),1,ik) == fv ) ) THEN
                   dta_read_z(map(ib),1,ik) = fv_alt ! safety: put fillvalue into external depth field so consistent with data
-               ENDIF
-                  dta(ib,1,ik) = fv_alt    ! put fillvalue into new field as if all goes well all wet points will be replaced
+                  dta_read_dz(map(ib),1,ik) = 0._wp ! safety: put 0._wp into external thickness factors to ensure transport is correct
+               ENDIF
+      !           dta(ib,1,ik) = fv_alt    ! put fillvalue into new field as if all goes well all wet points will be replaced
             ENDDO
          ENDDO 
@@ -853 +860 @@
             jj=1+floor(REAL(map(ib)-1)/REAL(ilendta))
             ji=map(ib)-(jj-1)*ilendta
-            DO ik = 1, ipk                      
+            DO ik = 1, jpk_bdy                      
                IF( ( dta_read(ji,jj,ik) == fv ) ) THEN
                   dta_read_z(map(ib),1,ik) = fv_alt ! safety: put fillvalue into external depth field so consistent with data
                ENDIF
-                  dta(ib,1,ik) = fv_alt    ! put fillvalue into new field as if all goes well all wet points will be replaced
+     !            dta(ib,1,ik) = fv_alt    ! put fillvalue into new field as if all goes well all wet points will be replaced
             ENDDO
          ENDDO 
@@ -885 +892 @@
 
    END SUBROUTINE fld_bdy_interp
+   SUBROUTINE fld_bdy_conserve(dta_read, dta_read_z, map, jpk_bdy, igrd, ibdy, fv, dta)
+
+   END SUBROUTINE fld_bdy_conserve
+
 #endif