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

Ignore:
Timestamp:
2018-10-29T15:20:26+01:00 (5 years ago)
Author:
kingr
Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:
1 edited

Legend:

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

    r10249 r10251  
    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 
    48    USE diaopfoam       ! Diaopfoam output 
    4946   USE iom 
    5047   USE ioipsl 
    5148   USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities      
    52    USE eosbn2         ! equation of state                (eos_bn2 routine) 
    53  
    5449 
    5550#if defined key_lim2 
     
    137132      REAL(wp), POINTER, DIMENSION(:,:)   :: z2d      ! 2D workspace 
    138133      REAL(wp), POINTER, DIMENSION(:,:,:) :: z3d      ! 3D workspace 
    139       REAL(wp), POINTER, DIMENSION(:,:,:) :: zrhd , zrhop  ! 3D workspace 
    140134      !!---------------------------------------------------------------------- 
    141135      !  
     
    144138      CALL wrk_alloc( jpi , jpj      , z2d ) 
    145139      CALL wrk_alloc( jpi , jpj, jpk , z3d ) 
    146       CALL wrk_alloc( jpi , jpj, jpk , zrhd , zrhop ) 
    147140      ! 
    148141      ! Output the initial state and forcings 
     
    383376         CALL iom_put( "v_salttr", 0.5 * z2d )            !  heat transport in j-direction 
    384377      ENDIF 
    385  
    386       IF( iom_use("rhop") ) THEN 
    387          CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) )       ! now in situ and potential density 
    388          zrhop(:,:,jpk) = 0._wp 
    389          CALL iom_put( 'rhop', zrhop ) 
    390       ENDIF 
    391  
    392378      ! 
    393379      CALL wrk_dealloc( jpi , jpj      , z2d ) 
    394380      CALL wrk_dealloc( jpi , jpj, jpk , z3d ) 
    395       CALL wrk_dealloc( jpi , jpj, jpk , zrhd , zrhop ) 
    396       ! 
    397       ! If we want tmb values  
    398  
    399       IF (ln_diatmb) THEN 
    400          CALL dia_tmb 
    401       ENDIF 
    402       IF (ln_dia25h) THEN 
    403          CALL dia_25h( kt ) 
    404       ENDIF 
    405       IF (ln_diaopfoam) THEN 
    406          CALL dia_diaopfoam 
    407       ENDIF 
    408381      ! 
    409382      IF( nn_timing == 1 )   CALL timing_stop('dia_wri') 
     
    465438      zdt = rdt 
    466439      IF( nacc == 1 ) zdt = rdtmin 
    467       clop = "x"         ! no use of the mask value (require less cpu time, and otherwise the model crashes) 
     440      IF( ln_mskland )   THEN   ;   clop = "only(x)"   ! put 1.e+20 on land (very expensive!!) 
     441      ELSE                      ;   clop = "x"         ! no use of the mask value (require less cpu time) 
     442      ENDIF 
    468443#if defined key_diainstant 
    469444      zsto = nwrite * zdt 
     
    10451020         CALL histdef( id_i, "vovvldep", "T point depth"         , "m"      ,   &   ! t-point depth 
    10461021            &          jpi, jpj, nh_i, jpk, 1, jpk, nz_i, 32, clop, zsto, zout ) 
    1047          CALL histdef( id_i, "vovvle3t", "T point thickness"         , "m"      ,   &   ! t-point depth 
    1048             &          jpi, jpj, nh_i, jpk, 1, jpk, nz_i, 32, clop, zsto, zout ) 
    10491022      END IF 
    10501023 
     
    10771050      CALL histwrite( id_i, "sozotaux", kt, utau             , jpi*jpj    , idex )    ! i-wind stress 
    10781051      CALL histwrite( id_i, "sometauy", kt, vtau             , jpi*jpj    , idex )    ! j-wind stress 
    1079       IF( lk_vvl ) THEN 
    1080          CALL histwrite( id_i, "vovvldep", kt, fsdept_n(:,:,:), jpi*jpj*jpk, idex )!  T-cell depth        
    1081          CALL histwrite( id_i, "vovvle3t", kt, fse3t_n (:,:,:), jpi*jpj*jpk, idex )!  T-cell thickness   
    1082       END IF 
    10831052 
    10841053      ! 3. Close the file 
Note: See TracChangeset for help on using the changeset viewer.