Changeset 2814 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

Timestamp:

2011-07-27T14:41:28+02:00 (13 years ago)

Author:

davestorkey

Message:

1. Implement tidal harmonics forcing (UKMO version) in new structure.
2. Other bug fixes and updates.

File:

• branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (3 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -24 +24 @@
    IMPLICIT NONE
    PRIVATE   
+ 
+   PUBLIC   fld_map    ! routine called by tides_init
 
    TYPE, PUBLIC ::   FLD_N      !: Namelist field informations
@@ -629 +631 @@
       !!                using a general mapping (for open boundaries)
       !!----------------------------------------------------------------------
+#if defined key_obc
       USE obc_oce, ONLY:  dta_global         ! workspace to read in global data arrays
+#endif 
 
       INTEGER                   , INTENT(in ) ::   num     ! stream number
       CHARACTER(LEN=*)          , INTENT(in ) ::   clvar   ! variable name
-      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   dta     ! output field on model grid
+      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   dta   ! output field on model grid (2 dimensional)
       INTEGER                   , INTENT(in ) ::   nrec    ! record number to read (ie time slice)
       INTEGER,  DIMENSION(:)    , INTENT(in ) ::   map     ! global-to-local mapping indices
       !!
-      INTEGER                  ::   ipi      ! length of boundary data on local process
-      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                  ::   idvar    ! variable ID
-      INTEGER                  ::   ib, ik   ! loop counters
-      INTEGER                  ::   ierr
-      !!
-      CHARACTER(len=80)                   :: zfile
+      INTEGER                                 ::   ipi      ! length of boundary data on local process
+      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                                 ::   idvar    ! variable ID
+      INTEGER                                 ::   ib, ik   ! loop counters
+      INTEGER                                 ::   ierr
+      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read ! work space for global data
       !!---------------------------------------------------------------------
             
+#if defined key_obc
+      dta_read => dta_global
+#endif
+
       ipi = SIZE( dta, 1 )
       ipj = 1
@@ -655 +662 @@
       ilendta = iom_file(num)%dimsz(1,idvar)
       IF(lwp) WRITE(numout,*) 'Dim size for ',TRIM(clvar),' is ', ilendta
-
-      CALL iom_get ( num, jpdom_unknown, clvar, dta_global(1:ilendta,1:ipj,1:ipk), nrec )
+      IF(lwp) WRITE(numout,*) 'Number of levels for ',TRIM(clvar),' is ', ipk
+
+      SELECT CASE( ipk )
+      CASE(1)   
+         CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1    ), nrec )
+      CASE DEFAULT
+         CALL iom_get ( num, jpdom_unknown, clvar, dta_read(1:ilendta,1:ipj,1:ipk), nrec )
+      END SELECT
       !
       DO ib = 1, ipi
          DO ik = 1, ipk
-            dta(ib,1,ik) =  dta_global(map(ib),1,ik)
+            dta(ib,1,ik) =  dta_read(map(ib),1,ik)
          END DO
       END DO
 
    END SUBROUTINE fld_map
+
 
    SUBROUTINE fld_rot( kt, sd )