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 7351 for branches/2016/dev_INGV_UKMO_2016/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 – NEMO

Ignore:
Timestamp:
2016-11-28T17:04:10+01:00 (7 years ago)
Author:
emanuelaclementi
Message:

ticket #1805 step 3: /2016/dev_INGV_UKMO_2016 aligned to the trunk at revision 7161

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2016/dev_INGV_UKMO_2016/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

    r5836 r7351  
    1414   !!---------------------------------------------------------------------- 
    1515   !!---------------------------------------------------------------------- 
    16    !!   trc_rst :   Restart for passive tracer 
    17    !!---------------------------------------------------------------------- 
    18    !!---------------------------------------------------------------------- 
    19    !!   'key_top'                                                TOP models 
    20    !!---------------------------------------------------------------------- 
     16   !!   trc_rst        : Restart for passive tracer 
    2117   !!   trc_rst_opn    : open  restart file 
    2218   !!   trc_rst_read   : read  restart file 
     
    2723   USE iom 
    2824   USE daymod 
     25    
    2926   IMPLICIT NONE 
    3027   PRIVATE 
     
    3532   PUBLIC   trc_rst_cal 
    3633 
    37    !! * Substitutions 
    38 #  include "domzgr_substitute.h90" 
    39     
     34   !!---------------------------------------------------------------------- 
     35   !! NEMO/TOP 3.7 , NEMO Consortium (2010) 
     36   !! $Id$ 
     37   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
     38   !!---------------------------------------------------------------------- 
    4039CONTAINS 
    4140    
     
    131130      !!---------------------------------------------------------------------- 
    132131      ! 
    133       CALL iom_rstput( kt, nitrst, numrtw, 'rdttrc1', rdttrc(1) )   ! surface passive tracer time step 
     132      CALL iom_rstput( kt, nitrst, numrtw, 'rdttrc1', rdttrc )   ! passive tracer time step 
    134133      ! prognostic variables  
    135134      ! --------------------  
     
    199198         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 
    200199 
    201          IF ( jprstlib == jprstdimg ) THEN 
    202            ! eventually read netcdf file (monobloc)  for restarting on different number of processors 
    203            ! if {cn_trcrst_in}.nc exists, then set jlibalt to jpnf90  
    204            INQUIRE( FILE = TRIM(cn_trcrst_indir)//'/'//TRIM(cn_trcrst_in)//'.nc', EXIST = llok ) 
    205            IF ( llok ) THEN ; jlibalt = jpnf90  ; ELSE ; jlibalt = jprstlib ; ENDIF 
    206          ENDIF 
    207  
    208200         IF( ln_rsttr ) THEN 
    209201            CALL iom_open( TRIM(cn_trcrst_indir)//'/'//cn_trcrst_in, numrtr, kiolib = jlibalt ) 
     
    235227             ELSE 
    236228               ndastp = ndate0 - 1     ! ndate0 read in the namelist in dom_nam 
    237                adatrj = ( REAL( nittrc000-1, wp ) * rdttra(1) ) / rday 
     229               adatrj = ( REAL( nittrc000-1, wp ) * rdt ) / rday 
    238230               ! note this is wrong if time step has changed during run 
    239231            ENDIF 
     
    288280      ! 
    289281      DO jk = 1, jpk 
    290          zvol(:,:,jk) = e1e2t(:,:) * fse3t_a(:,:,jk) * tmask(:,:,jk) 
     282         zvol(:,:,jk) = e1e2t(:,:) * e3t_a(:,:,jk) * tmask(:,:,jk) 
    291283      END DO 
    292284      ! 
     
    303295         IF(lwp) WRITE(numout,9000) jn, TRIM( ctrcnm(jn) ), zmean, zmin, zmax, zdrift 
    304296      END DO 
    305       WRITE(numout,*)  
     297      IF(lwp) WRITE(numout,*)  
    3062989000  FORMAT(' tracer nb :',i2,'    name :',a10,'    mean :',e18.10,'    min :',e18.10, & 
    307299      &      '    max :',e18.10,'    drift :',e18.10, ' %') 
Note: See TracChangeset for help on using the changeset viewer.