Changeset 11404 for branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.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/DYN/dynldf.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

@@ -77 +77 @@
 
 #if defined key_dynldf_c3d
-         IF( kt .eq. nit000 .and. (nn_spp_ahm1+nn_spp_ahm2) .gt. 0 ) THEN
+         IF( kt == nit000 .AND. ln_stopack .AND. &
+            & ( (nn_spp_ahm1+nn_spp_ahm2) > 0 ) ) THEN
              ALLOCATE ( ahm10(jpi,jpj,jpk), ahm20(jpi,jpj,jpk) )
              ALLOCATE ( ahm30(jpi,jpj,jpk), ahm40(jpi,jpj,jpk) )
@@ -87 +88 @@
 #endif
 #if defined key_dynldf_c2d
-         IF( kt .eq. nit000 .and. (nn_spp_ahm1+nn_spp_ahm2) .gt. 0 ) THEN
+         IF( kt == nit000 .AND. ln_stopack .AND. &
+            & ( (nn_spp_ahm1+nn_spp_ahm2) > 0 ) ) THEN
              ALLOCATE ( ahm10(jpi,jpj), ahm20(jpi,jpj) )
              ALLOCATE ( ahm30(jpi,jpj), ahm40(jpi,jpj) )
@@ -98 +100 @@
 
 #if defined key_traldf_c3d || defined key_traldf_c2d
-         IF( nn_spp_ahm1 .GT. 0) THEN
-           IF( ln_dynldf_lap ) THEN
-             ahm1 = ahm10
-             CALL spp_ahm(kt,ahm1,nn_spp_ahm1,rn_ahm1_sd,jk_spp_ahm1)
-           ENDIF
-           IF( ln_dynldf_bilap ) THEN
-             ahm3 = ahm30
-             CALL spp_ahm(kt,ahm3,nn_spp_ahm1,rn_ahm1_sd,jk_spp_ahm3)
-           ENDIF
-         ENDIF
-         IF( nn_spp_ahm2 .GT. 0) THEN
-           IF( ln_dynldf_lap ) THEN
-             ahm2 = ahm20
-             CALL spp_ahm(kt,ahm2,nn_spp_ahm2,rn_ahm2_sd,jk_spp_ahm2)
-           ENDIF
-           IF( ln_dynldf_bilap ) THEN
-             ahm4 = ahm40
-             CALL spp_ahm(kt,ahm4,nn_spp_ahm2,rn_ahm2_sd,jk_spp_ahm4)
-           ENDIF
+         IF( ln_stopack ) THEN
+            IF( nn_spp_ahm1 > 0 ) THEN
+               IF( ln_dynldf_lap ) THEN
+                  ahm1 = ahm10
+                  CALL spp_ahm(kt,ahm1,nn_spp_ahm1,rn_ahm1_sd,jk_spp_ahm1)
+               ENDIF
+               IF( ln_dynldf_bilap ) THEN
+                  ahm3 = ahm30
+                  CALL spp_ahm(kt,ahm3,nn_spp_ahm1,rn_ahm1_sd,jk_spp_ahm3)
+               ENDIF
+            ENDIF
+            IF( nn_spp_ahm2 > 0 ) THEN
+               IF( ln_dynldf_lap ) THEN
+               ahm2 = ahm20
+               CALL spp_ahm(kt,ahm2,nn_spp_ahm2,rn_ahm2_sd,jk_spp_ahm2)
+               ENDIF
+               IF( ln_dynldf_bilap ) THEN
+                  ahm4 = ahm40
+                  CALL spp_ahm(kt,ahm4,nn_spp_ahm2,rn_ahm2_sd,jk_spp_ahm4)
+               ENDIF
+            ENDIF
          ENDIF
 #endif