Changeset 10241 for branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2018-10-26T18:02:18+02:00 (6 years ago)

Author:

dford

Message:

Add visibility diagnostic (can't currently be done via fabm.yaml without changing the FABM code).

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• dia25h.F90 (modified) (8 diffs)
• diaopfoam.F90 (modified) (1 diff)
• diatmb.F90 (modified) (2 diffs)

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

@@ -22 +22 @@
    USE diatmb
 #if defined key_fabm
-   USE trc, ONLY: trn
+   USE trc, ONLY: trn, visib
    USE par_fabm
    USE st2d_fabm, ONLY: fabm_st2dn
@@ -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
@@ -181 +182 @@
          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 
       ! ------------------------- !
@@ -222 +227 @@
          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
@@ -338 +344 @@
          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
@@ -378 +385 @@
             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
 
@@ -419 +427 @@
                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
 
@@ -479 +489 @@
          fabm_2d_25h(:,:,jn) = fabm_get_horizontal_diagnostic_data(model,jn)
       END DO
+      fabm_visib_25h(:,:,:) = visib(:,:,:)
 #endif
             cnt_25h = 1

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/OPA_SRC/DIA/diaopfoam.F90

@@ -109 +109 @@
          CALL iom_put( "voce_op"   , vn                                    )    ! j-current
          !CALL iom_put( "woce_op"   , wn                                    )    ! k-current
-#if defined key_spm
-         cltra = TRIM(ctrc3d(5))//"_op"
-         zw3d(:,:,:) = trc3d(:,:,:,5)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:)) ! Visibility
-         CALL iom_put( cltra, zw3d  )
-#endif
+!#if defined key_spm
+!         cltra = TRIM(ctrc3d(5))//"_op"
+!         zw3d(:,:,:) = trc3d(:,:,:,5)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:)) ! Visibility
+!         CALL iom_put( cltra, zw3d  )
+!#endif
          CALL calc_max_cur(zwu,zwv,zwz,zmdi)
          CALL iom_put( "maxu" , zwu                                     ) ! max u current

branches/UKMO/AMM15_v3_6_STABLE_package_bgc_updates/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90

@@ -12 +12 @@
    USE wrk_nemo        ! working arrays
 #if defined key_fabm
-   USE trc, ONLY: trn
+   USE trc, ONLY: trn, visib
    USE par_fabm
    USE fabm, ONLY: fabm_get_bulk_diagnostic_data
@@ -182 +182 @@
             CALL iom_put( "bot_"//TRIM(model%diagnostic_variables(jn)%name) , zwtmb(:,:,3) )
          END DO
+         CALL dia_calctmb( visib(:,:,:), zwtmb )
+         CALL iom_put( "top_visib" , zwtmb(:,:,1) )
+         CALL iom_put( "mid_visib" , zwtmb(:,:,2) )
+         CALL iom_put( "bot_visib" , zwtmb(:,:,3) )
 #endif
       ELSE