Changeset 11404 for branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/SBC

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.

Location:

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• albedo.F90 (modified) (2 diffs)
• sbcblk_core.F90 (modified) (2 diffs)
• sbcssr.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -156 +156 @@
             END DO
             
-            IF ( nn_spp_icealb > 0 ) CALL spp_gen( 1, pa_ice_cs(:,:,jl), nn_spp_icealb, rn_icealb_sd, jk_spp_alb, jl )
+            IF ( ln_stopack .AND. nn_spp_icealb > 0 ) &
+               & CALL spp_gen( 1, pa_ice_cs(:,:,jl), nn_spp_icealb, rn_icealb_sd, jk_spp_alb, jl )
                         
          END DO
@@ -214 +215 @@
             END DO
             
-            IF ( nn_spp_icealb > 0 ) CALL spp_gen( 1, pa_ice_os(:,:,jl), nn_spp_icealb, rn_icealb_sd, jk_spp_alb, jl )
+            IF ( ln_stopack .AND. nn_spp_icealb > 0 ) &
+               & CALL spp_gen( 1, pa_ice_os(:,:,jl), nn_spp_icealb, rn_icealb_sd, jk_spp_alb, jl )
             
          END DO

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90

@@ -205 +205 @@
       ENDIF
 
-      IF( nn_spp_relw > 0 ) THEN
-         rn_vfac0 = rn_vfac
+      IF( ln_stopack .AND. nn_spp_relw > 0 ) THEN
+         rn_vfac0(:,:) = rn_vfac
          CALL spp_gen(kt, rn_vfac0, nn_spp_relw, rn_relw_sd, jk_spp_relw )
       ENDIF
@@ -661 +661 @@
       DO jl = 1, jpl
          qevap_ice(:,:,jl) = 0._wp ! should be -evap_ice(:,:,jl)*( ( Tice - rt0 ) * cpic * tmask(:,:,1) )
-                                   ! But we do not have Tice => consider it at 0°C => evap=0 
+                                   ! But we do not have Tice => consider it at 0 degC => evap=0 
       END DO
 

branches/UKMO/dev_r5518_GO6_package_FOAMv14_STOPACK/NEMOGCM/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -99 +99 @@
 
                CALL wrk_alloc( jpi, jpj, rn_dqdt_s)
-               rn_dqdt_s=rn_dqdt
-
-               IF( nn_spp_dqdt > 0 ) CALL spp_gen(kt, rn_dqdt_s,nn_spp_dqdt,rn_dqdt_sd,jk_spp_dqdt )
+               rn_dqdt_s(:,:) = rn_dqdt
+
+               IF( ln_stopack .AND. nn_spp_dqdt > 0 ) &
+                  & CALL spp_gen(kt, rn_dqdt_s,nn_spp_dqdt,rn_dqdt_sd,jk_spp_dqdt )
                DO jj = 1, jpj
                   DO ji = 1, jpi
@@ -115 +116 @@
             IF( nn_sssr == 1 ) THEN                                   !* Salinity damping term (salt flux only (sfx))
                CALL wrk_alloc( jpi, jpj, zsrp)
-               zsrp = rn_deds
-               IF( nn_spp_dedt > 0 ) CALL spp_gen(kt, zsrp, nn_spp_dedt, rn_dedt_sd, jk_spp_deds )
+               zsrp(:,:) = rn_deds
+               IF( ln_stopack .AND. nn_spp_dedt > 0 ) &
+                  & CALL spp_gen(kt, zsrp, nn_spp_dedt, rn_dedt_sd, jk_spp_deds )
 !CDIR COLLAPSE
                DO jj = 1, jpj
@@ -131 +133 @@
             ELSEIF( nn_sssr == 2 ) THEN                               !* Salinity damping term (volume flux (emp) and associated heat flux (qns)
                CALL wrk_alloc( jpi, jpj, zsrp)
-               zsrp = rn_deds
-               IF( nn_spp_dedt > 0 ) CALL spp_gen(kt, zsrp, nn_spp_dedt, rn_dedt_sd, jk_spp_deds )
+               zsrp(:,:) = rn_deds
+               IF( ln_stopack .AND. nn_spp_dedt > 0 ) &
+                  & CALL spp_gen(kt, zsrp, nn_spp_dedt, rn_dedt_sd, jk_spp_deds )
                zerp_bnd = rn_sssr_bnd / rday                          !       -              -    
 !CDIR COLLAPSE