Changeset 13354 for branches/UKMO/dev_1d_bugfixes_tocommit/NEMOGCM/NEMO/TOP_SRC/MEDUSA

Timestamp:

2020-07-30T12:08:31+02:00 (4 years ago)

Author:

jwhile

Message:

Merged in trunk

Location:

branches/UKMO/dev_1d_bugfixes_tocommit/NEMOGCM/NEMO/TOP_SRC/MEDUSA

Files:

• bio_medusa_init.F90 (modified) (2 diffs)
• plankton.F90 (modified) (2 diffs)
• sms_medusa.F90 (modified) (2 diffs)

branches/UKMO/dev_1d_bugfixes_tocommit/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_init.F90

@@ -35 +35 @@
       USE bio_medusa_mod
       USE par_oce,           ONLY: jpi, jpj, jpk
-      USE sms_medusa,        ONLY: jdms, pgrow_avg, ploss_avg, phyt_avg, mld_max
+      USE sms_medusa,        ONLY: jdms, pgrow_avg, ploss_avg, phyt_avg, mld_max, &
+         &                         pgrow_avg_3d, ploss_avg_3d, phyt_avg_3d
       USE trc,               ONLY: ln_diatrc, med_diag, nittrc000 
       USE in_out_manager,    ONLY: lwp, numout
@@ -199 +200 @@
       ploss_avg(:,:) = 0.0
       phyt_avg(:,:)  = 0.0
+      pgrow_avg_3d(:,:,:) = 0.0
+      ploss_avg_3d(:,:,:) = 0.0
+      phyt_avg_3d(:,:,:)  = 0.0
       IF( kt == nittrc000 ) THEN
          mld_max(:,:) = 0.0

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

@@ -46 +46 @@
                                    ln_foam_medusa,                         &
                                    pgrow_avg, ploss_avg, phyt_avg,         &
+                                   pgrow_avg_3d, ploss_avg_3d, phyt_avg_3d, &
                                    xkphd, xkphn, xkzme, xkzmi,             &
                                    xmetapd, xmetapn, xmetazme, xmetazmi,   &
@@ -229 +230 @@
                                      ((zphn(ji,jj) + zphd(ji,jj)) *       &
                                       fse3t(ji,jj,jk) * fq0)
+                  !!
+                  pgrow_avg_3d(ji,jj,jk) = (fprn(ji,jj) * zphn(ji,jj)) +  &
+                                           (fprd(ji,jj) * zphd(ji,jj))
+                  ploss_avg_3d(ji,jj,jk) = fgmepd(ji,jj) + fdpd(ji,jj) +  &
+                                           fdpd2(ji,jj)                +  &
+                                           fgmepn(ji,jj) + fdpn(ji,jj) +  &
+                                           fdpn2(ji,jj)  + fgmipn(ji,jj)
+                  phyt_avg_3d(ji,jj,jk)  = zphn(ji,jj) + zphd(ji,jj)
                ENDIF
             ENDDO

branches/UKMO/dev_1d_bugfixes_tocommit/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90

@@ -362 +362 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: ploss_avg  !: Mixed layer average phytoplankton loss
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: phyt_avg   !: Mixed layer average phytoplankton
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: pgrow_avg_3d  !: Mixed layer average phytoplankton growth
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: ploss_avg_3d  !: Mixed layer average phytoplankton loss
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: phyt_avg_3d   !: Mixed layer average phytoplankton
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: mld_max    !: Maximum mixed layer depth
 !!
@@ -438 +441 @@
       !* Fields for ocean colour data assimilation
       ALLOCATE( pgrow_avg(jpi,jpj)   , ploss_avg(jpi,jpj)   ,       &
+         &      pgrow_avg_3d(jpi,jpj,jpk) , ploss_avg_3d(jpi,jpj,jpk) , &
+         &      phyt_avg_3d(jpi,jpj,jpk)  ,                         &
          &      phyt_avg(jpi,jpj)    , mld_max(jpi,jpj)     ,    STAT=ierr(9) )
 #endif