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

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90

@@ -92 +92 @@
       !                             !  Add the geothermal heat flux trend on temperature
 
-      IF( nn_spp_geot .GT. 0) THEN
-          qgh_trd1 = qgh_trd0
-          CALL spp_gen(kt, qgh_trd0, nn_spp_geot, rn_geot_sd, jk_spp_geot)
+      IF( ln_stopack .AND. nn_spp_geot > 0) THEN
+          qgh_trd1(:,:) = qgh_trd0(:,:)
+          CALL spp_gen(kt, qgh_trd1, nn_spp_geot, rn_geot_sd, jk_spp_geot)
       ENDIF
       DO jj = 2, jpjm1
@@ -200 +200 @@
             !
          END SELECT
-         qgh_trd1 = qgh_trd0
+         qgh_trd1(:,:) = qgh_trd0(:,:)
          !
       ELSE