Changeset 8501

Timestamp:

2017-09-06T12:56:00+02:00 (6 years ago)

Author:

dford

Message:

Add omitted do loop and divide-by-zero check.

Location:

branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA

Files:

• bio_medusa_fin.F90 (modified) (1 diff)
• plankton.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90

@@ -234 +234 @@
       DO jj = 2,jpjm1
          DO ji = 2,jpim1
-            pgrow_avg(ji,jj) = pgrow_avg(ji,jj) / hmld(ji,jj)
-            ploss_avg(ji,jj) = ploss_avg(ji,jj) / hmld(ji,jj)
-            phyt_avg(ji,jj)  = phyt_avg(ji,jj)  / hmld(ji,jj)
-            IF ( hmld(ji,jj) .GT. mld_max(ji,jj) ) THEN
-               mld_max(ji,jj) = hmld(ji,jj)
+            IF ( hmld(ji,jj) .GT. 0.0 ) THEN
+               pgrow_avg(ji,jj) = pgrow_avg(ji,jj) / hmld(ji,jj)
+               ploss_avg(ji,jj) = ploss_avg(ji,jj) / hmld(ji,jj)
+               phyt_avg(ji,jj)  = phyt_avg(ji,jj)  / hmld(ji,jj)
+               IF ( hmld(ji,jj) .GT. mld_max(ji,jj) ) THEN
+                  mld_max(ji,jj) = hmld(ji,jj)
+               ENDIF
             ENDIF
          END DO

branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc_v2/NEMOGCM/NEMO/TOP_SRC/MEDUSA/plankton.F90

@@ -215 +215 @@
       !! Mixed layer averages for ocean colour assimilation
       !!
-      if (fdep1(ji,jj).le.hmld(ji,jj)) then
-         !! this level is entirely in the mixed layer
-         fq0 = 1.0
-      elseif (fsdepw(ji,jj,jk).ge.hmld(ji,jj)) then
-         !! this level is entirely below the mixed layer
-         fq0 = 0.0
-      else
-         !! this level straddles the mixed layer
-         fq0 = (hmld(ji,jj) - fsdepw(ji,jj,jk)) / fse3t(ji,jj,jk)
-      endif
-      !!
-      pgrow_avg(ji,jj) = pgrow_avg(ji,jj) +                                  &
-                         (((fprn(ji,jj) * zphn(ji,jj)) +                     &
-                           (fprd(ji,jj) * zphd(ji,jj))  ) *                  &
-                          fse3t(ji,jj,jk) * fq0)
-      ploss_avg(ji,jj) = ploss_avg(ji,jj) +  &
-                         ((fgmepd(ji,jj) + fdpd(ji,jj) + fdpd2(ji,jj) +      &
-                           fgmepn(ji,jj) + fdpn(ji,jj) + fdpn2(ji,jj) +      &
-                           fgmipn(ji,jj)                               ) *   &
-                          fse3t(ji,jj,jk) * fq0)
-      phyt_avg(ji,jj)  = phyt_avg(ji,jj)  +                                  &
-                         ((zphn(ji,jj) + zphd(ji,jj)) *                      &
-                          fse3t(ji,jj,jk) * fq0)
+      DO jj = 2,jpjm1
+         DO ji = 2,jpim1
+            IF (tmask(ji,jj,jk) == 1) THEN
+               if (fdep1(ji,jj).le.hmld(ji,jj)) then
+                  !! this level is entirely in the mixed layer
+                  fq0 = 1.0
+               elseif (fsdepw(ji,jj,jk).ge.hmld(ji,jj)) then
+                  !! this level is entirely below the mixed layer
+                  fq0 = 0.0
+               else
+                  !! this level straddles the mixed layer
+                  fq0 = (hmld(ji,jj) - fsdepw(ji,jj,jk)) / fse3t(ji,jj,jk)
+               endif
+               !!
+               pgrow_avg(ji,jj) = pgrow_avg(ji,jj) +                   &
+                                  (((fprn(ji,jj) * zphn(ji,jj)) +      &
+                                    (fprd(ji,jj) * zphd(ji,jj))  ) *   &
+                                   fse3t(ji,jj,jk) * fq0)
+               ploss_avg(ji,jj) = ploss_avg(ji,jj) +                   &
+                                  ((fgmepd(ji,jj) + fdpd(ji,jj) +      &
+                                    fdpd2(ji,jj)                +      &
+                                    fgmepn(ji,jj) + fdpn(ji,jj) +      &
+                                    fdpn2(ji,jj)  + fgmipn(ji,jj) ) *  &
+                                   fse3t(ji,jj,jk) * fq0)
+               phyt_avg(ji,jj)  = phyt_avg(ji,jj)  +                   &
+                                  ((zphn(ji,jj) + zphd(ji,jj)) *       &
+                                   fse3t(ji,jj,jk) * fq0)
+            ENDIF
+         ENDDO
+      ENDDO
 # endif