Changeset 12918 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_PS44/NEMOGCM/NEMO/OPA_SRC/DIA/diaopfoam.F90

Timestamp:

2020-05-13T14:39:24+02:00 (4 years ago)

Author:

petesykes

Message:

Land masking for operational diagnostics

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_PS44/NEMOGCM/NEMO/OPA_SRC/DIA/diaopfoam.F90 (modified) (2 diffs)

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

@@ -111 +111 @@
          
          CALL theta2t
-         CALL iom_put( "insitut_op" , rinsitu_t(:,:,:)                      )    ! insitu temperature
-         CALL iom_put( "toce_op"   , tsn(:,:,:,jp_tem)                     )    ! temperature
-         CALL iom_put( "soce_op"   , tsn(:,:,:,jp_sal)                     )    ! salinity
+         zw3d(:,:,:)=rinsitu_t(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:)) 
+         CALL iom_put( "insitut_op" , zw3d(:,:,:)                        )    ! insitu temperature
+         zw3d(:,:,:)=tsn(:,:,:,jp_tem)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+         CALL iom_put( "toce_op"    , zw3d(:,:,:)                        )    ! temperature
+         zw3d(:,:,:)=tsn(:,:,:,jp_sal)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+         CALL iom_put( "soce_op"    , zw3d(:,:,:)                        )    ! salinity
          IF (ln_diurnal) THEN
-            CALL iom_put( "sst_wl_op"   , x_dsst                             )    ! warm layer 
-            CALL iom_put( "sst_cs_op"   , x_csdsst                           )    ! cool skin 
+            CALL iom_put( "sst_wl_op"   , x_dsst                         )    ! warm layer 
+            CALL iom_put( "sst_cs_op"   , x_csdsst                       )    ! cool skin 
          ENDIF
          zw2d(:,:)=sshn(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
-         CALL iom_put( "ssh_op"  , zw2d(:,:)                          ) ! sea surface height
-         CALL iom_put( "uoce_op"   , un                                    )    ! i-current      
-         CALL iom_put( "voce_op"   , vn                                    )    ! j-current
-         !CALL iom_put( "woce_op"   , wn                                    )    ! k-current
+         CALL iom_put( "ssh_op"  , zw2d(:,:)                             ) ! sea surface height
+         zw3d(:,:,:)=un(:,:,:)*umask(:,:,:) + zmdi*(1.0-umask(:,:,:))
+         CALL iom_put( "uoce_op"   , zw3d                                )    ! i-current
+         zw3d(:,:,:)=vn(:,:,:)*vmask(:,:,:) + zmdi*(1.0-vmask(:,:,:))      
+         CALL iom_put( "voce_op"   , zw3d                                )    ! j-current
+         !CALL iom_put( "woce_op"   , wn                                 )    ! k-current
          CALL calc_max_cur(zwu,zwv,zwz,zmdi)
-         CALL iom_put( "maxu" , zwu                                     ) ! max u current
-         CALL iom_put( "maxv" , zwv                                     ) ! max v current
-         CALL iom_put( "maxz" , zwz                                     ) ! max current depth
+         zw2d(:,:)=zwu(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+         CALL iom_put( "maxu" , zw2d                                     ) ! max u current
+         zw2d(:,:)=zwv(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+         CALL iom_put( "maxv" , zw2d                                     ) ! max v current
+         zw2d(:,:)=zwz(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+         CALL iom_put( "maxz" , zw2d                                     ) ! max current depth
       ENDIF
    END SUBROUTINE dia_diaopfoam
@@ -340 +348 @@
 
       idex(1) = 1
-      CALL histwrite( nid_T, "votemper", kt, tsn(:,:,:,jp_tem), jpi*jpj*jpk, idex )    ! now temperature
-      CALL histwrite( nid_T, "vosaline", kt, tsn(:,:,:,jp_sal), jpi*jpj*jpk, idex )    ! now salinity
-      CALL histwrite( nid_T, "sossheig", kt, sshn             , jpi*jpj    , idex )    ! sea surface height
+      zw3d(:,:,:)=tsn(:,:,:,jp_tem)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+      CALL histwrite( nid_T, "votemper", kt, zw3d(:,:,:)      , jpi*jpj*jpk, idex )    ! now temperature
+      zw3d(:,:,:)=tsn(:,:,:,jp_sal)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+      CALL histwrite( nid_T, "vosaline", kt, zw3d(:,:,:)      , jpi*jpj*jpk, idex )    ! now salinity
+      zw2d(:,:)=sshn(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL histwrite( nid_T, "sossheig", kt, zw2d(:,:)        , jpi*jpj    , idex )    ! sea surface height
       CALL theta2t
-      CALL histwrite( nid_T, "votempis", kt, rinsitu_t(:,:,:) , jpi*jpj*jpk, idex )    ! now insitu-temperature
+      zw3d(:,:,:)=rinsitu_t(:,:,:)*tmask(:,:,:) + zmdi*(1.0-tmask(:,:,:))
+      CALL histwrite( nid_T, "votempis", kt, zw3d(:,:,:)      , jpi*jpj*jpk, idex )    ! now insitu-temperature
       CALL calc_max_cur(zwu,zwv,zwz,zmdi)
       CALL lbc_lnk( zwu, 'T', 1. )
       CALL lbc_lnk( zwv, 'T', 1. )
       CALL lbc_lnk( zwz, 'T', 1. )
-      CALL histwrite( nid_T, "maxu"    , kt, zwu              , jpi*jpj    , idex )    ! max u-current
-      CALL histwrite( nid_T, "maxv"    , kt, zwv              , jpi*jpj    , idex )    ! max v-current
-      CALL histwrite( nid_T, "maxz"    , kt, zwz              , jpi*jpj    , idex )    ! max current depth
+      zw2d(:,:)=zwu(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL histwrite( nid_T, "maxu"    , kt, zw2d             , jpi*jpj    , idex )    ! max u-current
+      zw2d(:,:)=zwv(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL histwrite( nid_T, "maxv"    , kt, zw2d             , jpi*jpj    , idex )    ! max v-current
+      zw2d(:,:)=zwz(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL histwrite( nid_T, "maxz"    , kt, zw2d             , jpi*jpj    , idex )    ! max current depth
       DO jj = 1, jpj
          DO ji = 1, jpi
             jkbot = mbkt(ji,jj)
-            z2d(ji,jj) = tsn(ji,jj,jkbot,jp_tem)
+            z2d(ji,jj) = tsn(ji,jj,jkbot,jp_tem)*tmask(ji,jj,jkbot) + zmdi*(1.0-tmask(ji,jj,jkbot))
          END DO
       END DO
       CALL histwrite( nid_T, "sbt"     , kt, z2d              , jpi*jpj    , idex )    ! sbt
       ! U file
-      CALL histwrite( nid_U, "vozocrtx", kt, un              , jpi*jpj*jpk, idex )     ! now i-velocity
+      zw3d(:,:,:)=un(:,:,:)*umask(:,:,:) + zmdi*(1.0-umask(:,:,:))
+      CALL histwrite( nid_U, "vozocrtx", kt, zw3d(:,:,:)     , jpi*jpj*jpk, idex )     ! now i-velocity
       ! V file
-      CALL histwrite( nid_V, "vomecrty", kt, vn              , jpi*jpj*jpk, idex )     ! now j-velocity
+      zw3d(:,:,:)=vn(:,:,:)*vmask(:,:,:) + zmdi*(1.0-vmask(:,:,:))
+      CALL histwrite( nid_V, "vomecrty", kt, zw3d(:,:,:)     , jpi*jpj*jpk, idex )     ! now j-velocity