Changeset 10141 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90

Timestamp:

2018-09-19T17:14:46+02:00 (6 years ago)

Author:

dford

Message:

Change cpp key key_foam_medusa to a logical switch ln_foam_medusa.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_fin.F90 (modified) (3 diffs)

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

@@ -46 +46 @@
                                    f3_co3, f3_h2co3, f3_hco3,           &
                                    f3_omarg, f3_omcal, f3_pH,           &
-# if defined key_foam_medusa
-                                   mld_max, pgrow_avg,                  &
+                                   ln_foam_medusa, mld_max, pgrow_avg,  &
                                    ploss_avg, phyt_avg,                 &
-# endif
                                    za_sed_c, za_sed_ca, za_sed_fe,      &
                                    za_sed_n, za_sed_si,                 &
@@ -59 +57 @@
       USE trc,               ONLY: med_diag, nittrc000, trn 
       USE trcnam_trp,        ONLY: ln_trcadv_cen2, ln_trcadv_tvd
-# if defined key_foam_medusa
       USE zdfmxl,            ONLY: hmld
-# endif
  
       !! time (integer timestep)
@@ -120 +116 @@
 # endif      
 
-# if defined key_foam_medusa
-!!----------------------------------------------------------------------
-!! Diagnostics required for ocean colour assimilation:
-!! Mixed layer average phytoplankton growth, loss and concentration
-!! Maximum mixed layer depth
-!!----------------------------------------------------------------------
-!!
-      DO jj = 2,jpjm1
-         DO ji = 2,jpim1
-            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
+      IF ( ln_foam_medusa ) THEN
+         !!----------------------------------------------------------------------
+         !! Diagnostics required for ocean colour assimilation:
+         !! Mixed layer average phytoplankton growth, loss and concentration
+         !! Maximum mixed layer depth
+         !!----------------------------------------------------------------------
+         !!
+         DO jj = 2,jpjm1
+            DO ji = 2,jpim1
+               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
          END DO
-      END DO
-# endif
+      ENDIF
 
 #  if defined key_debug_medusa