Changeset 8442 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90

Timestamp:

2017-08-17T13:39:18+02:00 (7 years ago)

Author:

frrh

Message:

Commit changes relating to Met Office GMED ticket 340 for the
tidying of MEDUSA related code and debugging statements in the TOP code.

Only code introduced at revision 8434 of branch
​http://fcm3/projects/NEMO.xm/log/branches/NERC/dev_r5518_GO6_split_trcbiomedusa
is included here, all previous revisions of that branch having been dealt with
under GMED ticket 339.

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90

@@ -45 +45 @@
 
    !! * Module variables
-   INTEGER ::                   &
-     ryyss,                     &  !: number of seconds per year
-     rmtss                         !: number of seconds per month
+   !! INTEGER ::                   &
+     !! ryyss,                     &  !: number of seconds per year
+     !! rmtss                         !: number of seconds per month
 
    !! AXY (10/02/09)
@@ -123 +123 @@
 
       ! Number of seconds per year and per month
-      ryyss = nyear_len(1) * rday
-      rmtss = ryyss / raamo
+      !! ryyss = nyear_len(1) * rday
+      !! rmtss = ryyss / raamo
 
       !! AXY (20/11/14): alter this to report on first MEDUSA call
@@ -173 +173 @@
                ztra  = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
                tra(ji,jj,jk,jpdet) = tra(ji,jj,jk,jpdet) + ztra
-# if defined key_trc_diabio
-               trbio(ji,jj,jk,8) = ztra
-# endif
-               IF (lk_iomput .AND. .NOT. ln_diatrc) THEN
-                     IF( med_diag%DSED%dgsave ) THEN
-                         zw2d(ji,jj) = zw2d(ji,jj) + ztra * fse3t(ji,jj,jk) * 86400.
-                      ENDIF   
-               ELSE IF( ln_diatrc )  THEN
-                    trc2d(ji,jj,8) = trc2d(ji,jj,8) + ztra * fse3t(ji,jj,jk) * 86400.
-               ENDIF    
+               IF( med_diag%DSED%dgsave ) THEN
+                   zw2d(ji,jj) = zw2d(ji,jj) + ztra * fse3t(ji,jj,jk) * 86400.
+               ENDIF   
                 
             END DO
@@ -188 +181 @@
       END DO
       !
-# if defined key_trc_diabio
-      CALL lbc_lnk (trbio(:,:,1,8), 'T', 1. )                    ! Lateral boundary conditions on trcbio
-# endif
-      IF( ln_diatrc ) CALL lbc_lnk( trc2d(:,:,8), 'T', 1. )      ! Lateral boundary conditions on trc2d
-      !!
-      IF (lk_iomput .AND. .NOT. ln_diatrc) THEN
-           IF( med_diag%DSED%dgsave ) THEN
-                CALL iom_put( "DSED"  ,  zw2d)
-                CALL wrk_dealloc( jpi, jpj,    zw2d  )
-            ENDIF
-      ELSE IF (lk_iomput .AND. ln_diatrc)  THEN    
-          CALL iom_put( "DSED",trc2d(:,:,8) )
+      IF( med_diag%DSED%dgsave ) THEN
+           CALL iom_put( "DSED"  ,  zw2d)
+           CALL wrk_dealloc( jpi, jpj,    zw2d  )
       ENDIF
       !!
@@ -229 +213 @@
                ztra  = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
                tra(ji,jj,jk,jpdtc) = tra(ji,jj,jk,jpdtc) + ztra
-!! #  if defined key_trc_diabio
-!!                trbio(ji,jj,jk,8) = ztra
-!! #  endif
-!!             IF( ln_diatrc ) &
-!!                &  trc2d(ji,jj,8) = trc2d(ji,jj,8) + ztra * fse3t(ji,jj,jk) * 86400.
             END DO
          END DO
       END DO
       !
-!! #  if defined key_trc_diabio
-!!       CALL lbc_lnk (trbio(:,:,1,8), 'T', 1. )                    ! Lateral boundary conditions on trcbio
-!! #  endif
-!!       IF( ln_diatrc ) CALL lbc_lnk( trc2d(:,:,8), 'T', 1. )      ! Lateral boundary conditions on trc2d
-!! #  if defined key_iomput
-!!       CALL iom_put( "DSED",trc2d(:,:,8) )
-!! #  endif
 
 # endif