Changeset 3491

Timestamp:

2012-10-08T16:28:28+02:00 (12 years ago)

Author:

cbricaud

Message:

add Jerome Chanut 's modications for BDY, Mercator_1 2012 task

File:

• branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (4 diffs)

branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -667 +667 @@
       !!----------------------------------------------------------------------
 #if defined key_bdy
-      USE bdy_oce, ONLY:  dta_global         ! workspace to read in global data arrays
+      USE bdy_oce, ONLY:  dta_global, dta_global2         ! workspace to read in global data arrays
 #endif 
 
@@ -681 +681 @@
       INTEGER                                 ::   ilendta  ! length of data in file
       INTEGER                                 ::   idvar    ! variable ID
-      INTEGER                                 ::   ib, ik   ! loop counters
+      INTEGER                                 ::   ib, ik, ji, jj   ! loop counters
       INTEGER                                 ::   ierr
-      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read ! work space for global data
+      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read  ! work space for global data
       !!---------------------------------------------------------------------
             
-#if defined key_bdy
-      dta_read => dta_global
-#endif
-
       ipi = SIZE( dta, 1 )
       ipj = 1
@@ -696 +692 @@
       idvar   = iom_varid( num, clvar )
       ilendta = iom_file(num)%dimsz(1,idvar)
+
+#if defined key_bdy
+      ipj = iom_file(num)%dimsz(2,idvar)
+      IF (ipj == 1) THEN ! we assume that this is a structured open boundary file
+         dta_read => dta_global
+      ELSE
+         dta_read => dta_global2
+      ENDIF
+#endif
+
+      IF ((lwp).AND.(ipi>ilendta*ipj)) CALL ctl_stop('fld_map problem with file dimension')
+
       IF(lwp) WRITE(numout,*) 'Dim size for ',TRIM(clvar),' is ', ilendta
       IF(lwp) WRITE(numout,*) 'Number of levels for ',TRIM(clvar),' is ', ipk
+
 
       SELECT CASE( ipk )
@@ -706 +715 @@
       END SELECT
       !
-      DO ib = 1, ipi
-         DO ik = 1, ipk
-            dta(ib,1,ik) =  dta_read(map(ib),1,ik)
+      IF (ipj==1) THEN
+         DO ib = 1, ipi
+            DO ik = 1, ipk
+               dta(ib,1,ik) =  dta_read(map(ib),1,ik)
+            END DO
          END DO
-      END DO
+      ELSE ! we assume that this is a structured open boundary file
+         DO ib = 1, ipi
+            jj=1+floor(REAL(map(ib)-1)/REAL(ilendta))
+            ji=map(ib)-(jj-1)*ilendta
+            DO ik = 1, ipk
+               dta(ib,1,ik) =  dta_read(ji,jj,ik)
+            END DO
+         END DO
+      ENDIF
 
    END SUBROUTINE fld_map