Changeset 4378


Ignore:
Timestamp:
2014-01-29T12:54:01+01:00 (7 years ago)
Author:
rfurner
Message:

mask values before outputing in vvl case, see ticket 1213

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r4292 r4378  
    147147 
    148148      IF( lk_vvl ) THEN 
    149          z3d(:,:,:) = tsn(:,:,:,jp_tem) * fse3t_n(:,:,:) 
     149         z3d(:,:,:) = tsn(:,:,:,jp_tem) * fse3t_n(:,:,:) * tmask(:,:,:) 
    150150         CALL iom_put( "toce" , z3d                        )   ! heat content 
    151151         CALL iom_put( "sst"  , z3d(:,:,1)                 )   ! sea surface heat content 
    152152         z3d(:,:,1) = tsn(:,:,1,jp_tem) * z3d(:,:,1) 
    153153         CALL iom_put( "sst2" , z3d(:,:,1)                 )   ! sea surface content of squared temperature 
    154          z3d(:,:,:) = tsn(:,:,:,jp_sal) * fse3t_n(:,:,:)             
     154         z3d(:,:,:) = tsn(:,:,:,jp_sal) * fse3t_n(:,:,:) * tmask(:,:,:)            
    155155         CALL iom_put( "soce" , z3d                        )   ! salinity content 
    156156         CALL iom_put( "sss"  , z3d(:,:,1)                 )   ! sea surface salinity content 
     
    166166      END IF 
    167167      IF( lk_vvl .AND. (.NOT. ln_dynadv_vec) ) THEN 
    168          CALL iom_put( "uoce" , un(:,:,:) * fse3u_n(:,:,:) )    ! i-transport 
    169          CALL iom_put( "voce" , vn(:,:,:) * fse3v_n(:,:,:) )    ! j-transport 
     168         CALL iom_put( "uoce" , un(:,:,:) * fse3u_n(:,:,:) * umask(:,:,:) )    ! i-transport 
     169         CALL iom_put( "voce" , vn(:,:,:) * fse3v_n(:,:,:) * vmask(:,:,:) )    ! j-transport 
    170170      ELSE 
    171171         CALL iom_put( "uoce" , un                         )    ! i-current 
     
    623623      ! Write fields on T grid 
    624624      IF( lk_vvl ) THEN 
    625          CALL histwrite( nid_T, "votemper", it, tsn(:,:,:,jp_tem) * fse3t_n(:,:,:) , ndim_T , ndex_T  )   ! heat content 
    626          CALL histwrite( nid_T, "vosaline", it, tsn(:,:,:,jp_sal) * fse3t_n(:,:,:) , ndim_T , ndex_T  )   ! salt content 
    627          CALL histwrite( nid_T, "sosstsst", it, tsn(:,:,1,jp_tem) * fse3t_n(:,:,1) , ndim_hT, ndex_hT )   ! sea surface heat content 
    628          CALL histwrite( nid_T, "sosaline", it, tsn(:,:,1,jp_sal) * fse3t_n(:,:,1) , ndim_hT, ndex_hT )   ! sea surface salinity content 
     625         CALL histwrite( nid_T, "votemper", it, tsn(:,:,:,jp_tem) * fse3t_n(:,:,:) * tmask(:,:,:) , ndim_T , ndex_T  )   ! heat content 
     626         CALL histwrite( nid_T, "vosaline", it, tsn(:,:,:,jp_sal) * fse3t_n(:,:,:) * tmask(:,:,:) , ndim_T , ndex_T  )   ! salt content 
     627         CALL histwrite( nid_T, "sosstsst", it, tsn(:,:,1,jp_tem) * fse3t_n(:,:,1) * tmask(:,:,1) , ndim_hT, ndex_hT )   ! sea surface heat content 
     628         CALL histwrite( nid_T, "sosaline", it, tsn(:,:,1,jp_sal) * fse3t_n(:,:,1) * tmask(:,:,1) , ndim_hT, ndex_hT )   ! sea surface salinity content 
    629629      ELSE 
    630630         CALL histwrite( nid_T, "votemper", it, tsn(:,:,:,jp_tem) , ndim_T , ndex_T  )   ! temperature 
Note: See TracChangeset for help on using the changeset viewer.