Changeset 12963

Timestamp:

2020-05-22T18:27:18+02:00 (4 years ago)

Author:

clne

Message:

Mask land in surge output fields with fill value rather than 0

Location:

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (5 diffs)
• SBC/sbcsurge.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -128 +128 @@
       INTEGER                      ::   ji, jj, jk              ! dummy loop indices
       INTEGER                      ::   jkbot                   !
-      REAL(wp)                     ::   zztmp, zztmpx, zztmpy   ! 
+      REAL(wp)                     ::   zztmp, zztmpx, zztmpy, zmdi   ! 
       !!
       REAL(wp), POINTER, DIMENSION(:,:)   :: z2d      ! 2D workspace
@@ -134 +134 @@
       !!----------------------------------------------------------------------
       ! 
+      zmdi=1.e+20 !missing data indicator for masking
+
       IF( nn_timing == 1 )   CALL timing_start('dia_wri')
       ! 
@@ -152 +154 @@
       ENDIF
 
-      CALL iom_put( "ssh" , sshn )                 ! sea surface height
+      z2d = sshn(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL iom_put( "ssh" , z2d )                 ! sea surface height
       if( iom_use('ssh2') )   CALL iom_put( "ssh2", sshn(:,:) * sshn(:,:) )   ! square of sea surface height
       
@@ -196 +199 @@
          
       CALL iom_put( "uoce", un(:,:,:)         )    ! 3D i-current
-      CALL iom_put(  "ssu", un(:,:,1)         )    ! surface i-current
+      z2d = un(:,:,1)*umask(:,:,1) + zmdi*(1.0-umask(:,:,1))
+      CALL iom_put(  "ssu", z2d         )    ! surface i-current
       IF ( iom_use("sbu") ) THEN
          DO jj = 1, jpj
@@ -213 +217 @@
       
       CALL iom_put( "voce", vn(:,:,:)         )    ! 3D j-current
-      CALL iom_put(  "ssv", vn(:,:,1)         )    ! surface j-current
+      z2d = vn(:,:,1)*vmask(:,:,1) + zmdi*(1.0-vmask(:,:,1))     
+      CALL iom_put(  "ssv", z2d         )    ! surface j-current
       IF ( iom_use("sbv") ) THEN
          DO jj = 1, jpj

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcsurge.F90

@@ -151 +151 @@
       !
       INTEGER  ::   ji, jj               ! dummy loop indices
-      REAL(wp) ::   zztmp                ! local variable
+      REAL(wp) ::   zztmp,zmdi                ! local variable
       REAL(wp) ::   z_z0, z_Cd1          ! local variable
       REAL(wp) ::   zi                   ! local variable
-      REAL(wp), DIMENSION(:,:), POINTER ::   zwnd_i, zwnd_j    ! wind speed components at T-point
+      REAL(wp), DIMENSION(:,:), POINTER ::   zwnd_i, zwnd_j, z2d    ! wind speed components at T-point
       REAL(wp), DIMENSION(:,:), POINTER ::   Cd                ! transfer coefficient for momentum      (tau)
       !!---------------------------------------------------------------------
       !
+      zmdi=1.e+20 !missing data indicator for masking
+
       IF( nn_timing == 1 )  CALL timing_start('surge_oce')
       !
-      CALL wrk_alloc( jpi,jpj, zwnd_i, zwnd_j )
+      CALL wrk_alloc( jpi,jpj, zwnd_i, zwnd_j, z2d )
       CALL wrk_alloc( jpi,jpj, Cd )
       !
@@ -218 +220 @@
       END DO
 
-      CALL iom_put( "taum_oce", taum )   ! output wind stress module
-      CALL iom_put( "uwnd", uwnd )   ! output wind stress module
-      CALL iom_put( "vwnd", vwnd )   ! output wind stress module
+      z2d = taum*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL iom_put( "taum_oce", z2d )   ! output wind stress module
+      z2d = uwnd*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL iom_put( "uwnd", z2d )   ! output wind stress module
+      z2d = vwnd*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1))
+      CALL iom_put( "vwnd", z2d )   ! output wind stress module
 
       ! ... utau, vtau at U- and V_points, resp.