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 8059 for branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90 – NEMO

Ignore:
Timestamp:
2017-05-23T10:32:39+02:00 (7 years ago)
Author:
jgraham
Message:

Merged branches required for AMM15 simulations, see ticket #1904.
Merged branches include:
branches/UKMO/CO6_KD490
branches/UKMO/CO6_Restartable_Tidal_Analysis
branches/UKMO/AMM15_v3_6_STABLE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r8058 r8059  
    4444   USE in_out_manager  ! I/O manager 
    4545   USE diadimg         ! dimg direct access file format output 
     46   USE diatmb          ! Top,middle,bottom output 
     47   USE dia25h          ! 25h Mean output 
    4648   USE iom 
    4749   USE ioipsl 
    4850   USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities      
     51   USE eosbn2         ! equation of state                (eos_bn2 routine) 
     52 
    4953 
    5054#if defined key_lim2 
     
    132136      REAL(wp), POINTER, DIMENSION(:,:)   :: z2d      ! 2D workspace 
    133137      REAL(wp), POINTER, DIMENSION(:,:,:) :: z3d      ! 3D workspace 
     138      REAL(wp), POINTER, DIMENSION(:,:,:) :: zrhd , zrhop  ! 3D workspace 
    134139      !!---------------------------------------------------------------------- 
    135140      !  
     
    138143      CALL wrk_alloc( jpi , jpj      , z2d ) 
    139144      CALL wrk_alloc( jpi , jpj, jpk , z3d ) 
     145      CALL wrk_alloc( jpi , jpj, jpk , zrhd , zrhop ) 
    140146      ! 
    141147      ! Output the initial state and forcings 
     
    376382         CALL iom_put( "v_salttr", 0.5 * z2d )            !  heat transport in j-direction 
    377383      ENDIF 
     384 
     385      IF( iom_use("rhop") ) THEN 
     386         CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) )       ! now in situ and potential density 
     387         zrhop(:,:,jpk) = 0._wp 
     388         CALL iom_put( 'rhop', zrhop ) 
     389      ENDIF 
     390 
    378391      ! 
    379392      CALL wrk_dealloc( jpi , jpj      , z2d ) 
    380393      CALL wrk_dealloc( jpi , jpj, jpk , z3d ) 
     394      CALL wrk_dealloc( jpi , jpj, jpk , zrhd , zrhop ) 
     395      ! 
     396      ! If we want tmb values  
     397 
     398      IF (ln_diatmb) THEN 
     399         CALL dia_tmb 
     400      ENDIF 
     401      IF (ln_dia25h) THEN 
     402         CALL dia_25h( kt ) 
     403      ENDIF 
    381404      ! 
    382405      IF( nn_timing == 1 )   CALL timing_stop('dia_wri') 
Note: See TracChangeset for help on using the changeset viewer.