Changeset 10366 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

Timestamp:

2018-12-03T12:26:33+01:00 (5 years ago)

Author:

dford

Message:

Remove visibility, as now available through FABM, and switch from deprecated get_bulk to get_interior.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90 (modified) (11 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_bgc_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90

@@ -22 +22 @@
    USE diatmb
 #if defined key_fabm
-   USE trc, ONLY: trn, visib
+   USE trc, ONLY: trn
    USE par_fabm
    USE st2d_fabm, ONLY: fabm_st2dn
-   USE fabm, ONLY: fabm_get_bulk_diagnostic_data, &
+   USE fabm, ONLY: fabm_get_interior_diagnostic_data, &
       &            fabm_get_horizontal_diagnostic_data
 #endif
@@ -53 +53 @@
    REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:)   :: fabm_bottom_25h
    REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:)   :: fabm_2d_25h
-   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:)   :: fabm_visib_25h
 #endif
    INTEGER, SAVE :: cnt_25h     ! Counter for 25 hour means
@@ -182 +181 @@
          CALL ctl_stop( 'dia_25h: unable to allocate fabm_2d_25h' )   ;   RETURN
       ENDIF
-      ALLOCATE( fabm_visib_25h(jpi,jpj,jpk), STAT=ierror )
-      IF( ierror > 0 ) THEN
-         CALL ctl_stop( 'dia_25h: unable to allocate fabm_visib_25h' )   ;   RETURN
-      ENDIF
 #endif 
       ! ------------------------- !
@@ -216 +211 @@
       END DO
       DO jn = 1, jp_fabm_3d
-         fabm_3d_25h(:,:,:,jn) = fabm_get_bulk_diagnostic_data(model, jn)
+         fabm_3d_25h(:,:,:,jn) = fabm_get_interior_diagnostic_data(model, jn)
       END DO
       DO jn = 1, jp_fabm_surface
@@ -227 +222 @@
          fabm_2d_25h(:,:,jn) = fabm_get_horizontal_diagnostic_data(model,jn)
       END DO
-      fabm_visib_25h(:,:,:) = visib(:,:,:)
 #endif
 #if defined key_lim3 || defined key_lim2
@@ -333 +327 @@
       END DO
       DO jn = 1, jp_fabm_3d
-         fabm_3d_25h(:,:,:,jn) = fabm_3d_25h(:,:,:,jn) + fabm_get_bulk_diagnostic_data(model, jn)
+         fabm_3d_25h(:,:,:,jn) = fabm_3d_25h(:,:,:,jn) + fabm_get_interior_diagnostic_data(model, jn)
       END DO
       DO jn = 1, jp_fabm_surface
@@ -344 +338 @@
          fabm_2d_25h(:,:,jn) = fabm_2d_25h(:,:,jn) + fabm_get_horizontal_diagnostic_data(model,jn)
       END DO
-      fabm_visib_25h(:,:,:) = fabm_visib_25h(:,:,:) + visib(:,:,:)
 #endif
          cnt_25h = cnt_25h + 1
@@ -385 +378 @@
             fabm_bottom_25h(:,:,:)  = fabm_bottom_25h(:,:,:)  / 25.0_wp
             fabm_2d_25h(:,:,:)      = fabm_2d_25h(:,:,:)      / 25.0_wp
-            fabm_visib_25h(:,:,:)   = fabm_visib_25h(:,:,:)   / 25.0_wp
 #endif
 
@@ -427 +419 @@
                CALL iom_put( TRIM(model%horizontal_diagnostic_variables(jn)%name)//"25h", zw2d  )
             END DO
-            zw3d(:,:,:) = fabm_visib_25h(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
-            CALL iom_put( "visib25h", zw3d  )
 #endif
 
@@ -478 +468 @@
       END DO
       DO jn = 1, jp_fabm_3d
-         fabm_3d_25h(:,:,:,jn) = fabm_get_bulk_diagnostic_data(model, jn)
+         fabm_3d_25h(:,:,:,jn) = fabm_get_interior_diagnostic_data(model, jn)
       END DO
       DO jn = 1, jp_fabm_surface
@@ -489 +479 @@
          fabm_2d_25h(:,:,jn) = fabm_get_horizontal_diagnostic_data(model,jn)
       END DO
-      fabm_visib_25h(:,:,:) = visib(:,:,:)
 #endif
             cnt_25h = 1