Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90 (modified) (5 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -434 +434 @@
       ENDIF
 
-#if ! defined key_gyre
+      IF ( cp_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration
       ! GYRE : for diagnostic fields, are needed if cyclic B.C. are present, but not for purely MPI comm. 
       ! therefore we do not call lbc_lnk in GYRE config. (closed basin, no cyclic B.C.)
-      DO jn = 1, jptra
-         IF( ln_trdtrc(jn) ) THEN
-            DO jl = 1, jpltrd_trc
-               CALL lbc_lnk( tmltrd_trc(:,:,jl,jn), 'T', 1. )        ! lateral boundary conditions
-            END DO
-         ENDIF
-      END DO
-#endif
+         DO jn = 1, jptra
+            IF( ln_trdtrc(jn) ) THEN
+               DO jl = 1, jpltrd_trc
+                  CALL lbc_lnk( tmltrd_trc(:,:,jl,jn), 'T', 1. )        ! lateral boundary conditions
+               END DO
+            ENDIF
+         END DO
+      ENDIF
       ! ======================================================================
       ! II. Cumulate the trends over the analysis window
@@ -573 +573 @@
                
          !-- Lateral boundary conditions
-#if ! defined key_gyre
-
-               CALL lbc_lnk( ztmltot(:,:,jn) , 'T', 1. )   ;   CALL lbc_lnk( ztmlres(:,:,jn) , 'T', 1. )
-               CALL lbc_lnk( ztmlatf(:,:,jn) , 'T', 1. )   ;   CALL lbc_lnk( ztmlrad(:,:,jn) , 'T', 1. )
-
-#endif
+               IF ( cp_cfg .NE. 'gyre' ) THEN
+                  CALL lbc_lnk( ztmltot(:,:,jn) , 'T', 1. )   ;   CALL lbc_lnk( ztmlres(:,:,jn) , 'T', 1. )
+                  CALL lbc_lnk( ztmlatf(:,:,jn) , 'T', 1. )   ;   CALL lbc_lnk( ztmlrad(:,:,jn) , 'T', 1. )
+               ENDIF
+
 
 #if defined key_diainstant
@@ -624 +623 @@
                   &                                               + tmltrd_rad_sumb_trc(:,:,jn)
 
-         !-- Lateral boundary conditions
-#if ! defined key_gyre         
-               CALL lbc_lnk( ztmltot2(:,:,jn), 'T', 1. )
-               CALL lbc_lnk( ztmlres2(:,:,jn), 'T', 1. )
-               DO jl = 1, jpltrd_trc
-                  CALL lbc_lnk( ztmltrd2(:,:,jl,jn), 'T', 1. )       ! will be output in the NetCDF trends file
-               END DO
-#endif
+         !-- Lateral boundary conditions 
+               IF ( cp_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration    
+                  CALL lbc_lnk( ztmltot2(:,:,jn), 'T', 1. )
+                  CALL lbc_lnk( ztmlres2(:,:,jn), 'T', 1. )
+                  DO jl = 1, jpltrd_trc
+                     CALL lbc_lnk( ztmltrd2(:,:,jl,jn), 'T', 1. )       ! will be output in the NetCDF trends file
+                  END DO
+               ENDIF
+
             ENDIF
          END DO
@@ -1009 +1009 @@
 
          !-- Lateral boundary conditions
-#if ! defined key_gyre
-         ! ES_B27_CD_WARN : lbc inutile GYRE, cf. + haut
-         DO jn = 1, jpdiabio
-           CALL lbc_lnk( ztmltrdbio2(:,:,jn), 'T', 1. )
-         ENDDO
-#endif
+         IF ( cp_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration 
+            ! ES_B27_CD_WARN : lbc inutile GYRE, cf. + haut
+            DO jn = 1, jpdiabio
+              CALL lbc_lnk( ztmltrdbio2(:,:,jn), 'T', 1. )
+            ENDDO
+         ENDIF
+
          IF( lldebug ) THEN
             !
@@ -1273 +1274 @@
       ! -----------------------------------------
       IF( ln_mskland )   THEN   ;   clop = "only(x)"   ! put 1.e+20 on land (very expensive!!)
-      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cpu time)
+      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cp time)
       ENDIF
 #  if defined key_diainstant