Changeset 11404 for branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

Timestamp:

2019-08-06T11:15:02+02:00 (5 years ago)

Author:

mattmartin

Message:

Included control of the STOPACK options so that it can be switched on/off with the main ln_stopack logical.

File:

• branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -186 +186 @@
       ENDIF
       !
-      IF( nn_spp_tkelc > 0 ) THEN
-          rn_lc0 = rn_lc
-          CALL spp_gen(kt,rn_lc0,nn_spp_tkelc,rn_tkelc_sd,    jk_spp_tkelc )
-      ENDIF
-      IF( nn_spp_tkedf > 0 ) THEN
-          rn_ediff0 = rn_ediff
-          CALL spp_gen(kt,rn_ediff0,nn_spp_tkedf,rn_tkedf_sd, jk_spp_tkedf )
-      ENDIF
-      IF( nn_spp_tkeds > 0 ) THEN
-          rn_ediss0 = rn_ediss
-          CALL spp_gen(kt,rn_ediss0,nn_spp_tkeds,rn_tkeds_sd, jk_spp_tkeds )
-      ENDIF
-      IF( nn_spp_tkebb > 0 ) THEN
-          rn_ebb0 = rn_ebb
-          CALL spp_gen(kt,rn_ebb0,nn_spp_tkebb,rn_tkebb_sd,   jk_spp_tkebb )
-      ENDIF
-      IF( nn_spp_tkefr > 0 ) THEN
-          rn_efr0 = rn_efr
-          CALL spp_gen(kt,rn_efr0,nn_spp_tkefr,rn_tkefr_sd,   jk_spp_tkefr )
+      IF( ln_stopack) THEN
+         IF( nn_spp_tkelc > 0 ) THEN
+             rn_lc0 = rn_lc
+             CALL spp_gen(kt,rn_lc0,nn_spp_tkelc,rn_tkelc_sd,    jk_spp_tkelc )
+         ENDIF
+         IF( nn_spp_tkedf > 0 ) THEN
+             rn_ediff0 = rn_ediff
+             CALL spp_gen(kt,rn_ediff0,nn_spp_tkedf,rn_tkedf_sd, jk_spp_tkedf )
+         ENDIF
+         IF( nn_spp_tkeds > 0 ) THEN
+             rn_ediss0 = rn_ediss
+             CALL spp_gen(kt,rn_ediss0,nn_spp_tkeds,rn_tkeds_sd, jk_spp_tkeds )
+         ENDIF
+         IF( nn_spp_tkebb > 0 ) THEN
+             rn_ebb0 = rn_ebb
+             CALL spp_gen(kt,rn_ebb0,nn_spp_tkebb,rn_tkebb_sd,   jk_spp_tkebb )
+        ENDIF
+         IF( nn_spp_tkefr > 0 ) THEN
+             rn_efr0 = rn_efr
+             CALL spp_gen(kt,rn_efr0,nn_spp_tkefr,rn_tkefr_sd,   jk_spp_tkefr )
+         ENDIF
       ENDIF
       !
@@ -736 +738 @@
             END DO
          END DO
-         IF(nn_spp_avt > 0 ) CALL spp_gen(1 ,avt(:,:,jk),nn_spp_avt,rn_avt_sd, jk_spp_avt, jk)
-         IF(nn_spp_avm > 0 ) CALL spp_gen(1 ,avm(:,:,jk),nn_spp_avm,rn_avm_sd, jk_spp_avm, jk)
+         IF( ln_stopack) THEN
+            IF(nn_spp_avt > 0 ) CALL spp_gen(1 ,avt(:,:,jk),nn_spp_avt,rn_avt_sd, jk_spp_avt, jk)
+            IF(nn_spp_avm > 0 ) CALL spp_gen(1 ,avm(:,:,jk),nn_spp_avm,rn_avm_sd, jk_spp_avm, jk)
+         ENDIF
       END DO
       CALL lbc_lnk( avm, 'W', 1. )      ! Lateral boundary conditions (sign unchanged)