Changeset 6862 for branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

Timestamp:

2016-08-12T15:16:24+02:00 (8 years ago)

Author:

lovato

Message:

#1729 - trunk: removed key_bdy from the code and set usage of ln_bdy. Tested with SETTE.

File:

• branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90 (modified) (2 diffs)

branches/2016/dev_r6522_SIMPLIF_3/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -666 +666 @@
       !!                using a general mapping (for open boundaries)
       !!----------------------------------------------------------------------
-#if defined key_bdy
-      USE bdy_oce, ONLY:  dta_global, dta_global2         ! workspace to read in global data arrays
-#endif 
+      USE bdy_oce, ONLY: ln_bdy, dta_global, dta_global2         ! workspace to read in global data arrays
+
       INTEGER                   , INTENT(in ) ::   num     ! stream number
       CHARACTER(LEN=*)          , INTENT(in ) ::   clvar   ! variable name
@@ -692 +691 @@
       ilendta = iom_file(num)%dimsz(1,idvar)
 
-#if defined key_bdy
-      ipj = iom_file(num)%dimsz(2,idvar)
-      IF( map%ll_unstruc) THEN   ! unstructured open boundary data file
-         dta_read => dta_global
-      ELSE                       ! structured open boundary data file
-         dta_read => dta_global2
-      ENDIF
-#endif
+      IF ( ln_bdy ) THEN
+         ipj = iom_file(num)%dimsz(2,idvar)
+         IF( map%ll_unstruc) THEN   ! unstructured open boundary data file
+            dta_read => dta_global
+         ELSE                       ! structured open boundary data file
+            dta_read => dta_global2
+         ENDIF
+      ENDIF
 
       IF(lwp) WRITE(numout,*) 'Dim size for ',        TRIM(clvar),' is ', ilendta