New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10499 for NEMO/trunk/src/OCE/DIA – NEMO

Ignore:
Timestamp:
2019-01-10T16:12:24+01:00 (6 years ago)
Author:
deazer
Message:

Fix ticket #2154

Location:
NEMO/trunk/src/OCE/DIA
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/DIA/dia25h.F90

    r10069 r10499  
    1313   USE in_out_manager  ! I/O units 
    1414   USE iom             ! I/0 library 
     15   USE wet_dry 
    1516 
    1617   IMPLICIT NONE 
     
    211212         CALL iom_put( "salin25h", zw3d  )   ! salinity 
    212213         zw2d(:,:) = sshn_25h(:,:)*tmask(:,:,1) + zmdi*(1.0-tmask(:,:,1)) 
    213          CALL iom_put( "ssh25h", zw2d )   ! sea surface  
     214         IF( ll_wd ) THEN 
     215            CALL iom_put( "ssh25h", zw2d+ssh_ref )   ! sea surface  
     216         ELSE 
     217            CALL iom_put( "ssh25h", zw2d )   ! sea surface 
     218         ENDIF 
    214219         ! Write velocities (instantaneous) 
    215220         zw3d(:,:,:) = un_25h(:,:,:)*umask(:,:,:) + zmdi*(1.0-umask(:,:,:)) 
  • NEMO/trunk/src/OCE/DIA/diatmb.F90

    r10069 r10499  
    1212   USE in_out_manager  ! I/O units 
    1313   USE iom             ! I/0 library 
     14   USE wet_dry 
    1415 
    1516   IMPLICIT NONE 
     
    108109      CALL dia_calctmb( tsn(:,:,:,jp_tem), zwtmb ) 
    109110      !ssh already output but here we output it masked 
    110       CALL iom_put( "sshnmasked", sshn(:,:)*tmask(:,:,1) + zmdi*(1.0 - tmask(:,:,1)) ) 
     111      IF( ll_wd ) THEN 
     112         CALL iom_put( "sshnmasked", (sshn(:,:)+ssh_ref)*tmask(:,:,1) + zmdi*(1.0 - tmask(:,:,1)) ) 
     113      ELSE 
     114         CALL iom_put( "sshnmasked", sshn(:,:)*tmask(:,:,1) + zmdi*(1.0 - tmask(:,:,1)) ) 
     115      ENDIF 
     116 
    111117      CALL iom_put( "top_temp"  , zwtmb(:,:,1) )    ! tmb Temperature 
    112118      CALL iom_put( "mid_temp"  , zwtmb(:,:,2) )    ! tmb Temperature 
Note: See TracChangeset for help on using the changeset viewer.