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 6808 for branches/NERC/dev_r5549_BDY_ZEROGRAD/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 – NEMO

Ignore:
Timestamp:
2016-07-19T10:38:35+02:00 (8 years ago)
Author:
jamesharle
Message:

merge with trunk@6232 for consistency with SSB code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5549_BDY_ZEROGRAD/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

    r5513 r6808  
    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 
     
    2521   USE oce_trc 
    2622   USE trc 
    27    USE trcnam_trp 
    2823   USE iom 
    2924   USE daymod 
     25    
    3026   IMPLICIT NONE 
    3127   PRIVATE 
     
    3632   PUBLIC   trc_rst_cal 
    3733 
    38    !! * Substitutions 
    39 #  include "top_substitute.h90" 
    40     
     34   !!---------------------------------------------------------------------- 
     35   !! NEMO/TOP 3.7 , NEMO Consortium (2010) 
     36   !! $Id$ 
     37   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
     38   !!---------------------------------------------------------------------- 
    4139CONTAINS 
    4240    
     
    132130      !!---------------------------------------------------------------------- 
    133131      ! 
    134       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 
    135133      ! prognostic variables  
    136134      ! --------------------  
     
    200198         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~' 
    201199 
    202          IF ( jprstlib == jprstdimg ) THEN 
    203            ! eventually read netcdf file (monobloc)  for restarting on different number of processors 
    204            ! if {cn_trcrst_in}.nc exists, then set jlibalt to jpnf90  
    205            INQUIRE( FILE = TRIM(cn_trcrst_indir)//'/'//TRIM(cn_trcrst_in)//'.nc', EXIST = llok ) 
    206            IF ( llok ) THEN ; jlibalt = jpnf90  ; ELSE ; jlibalt = jprstlib ; ENDIF 
    207          ENDIF 
    208  
    209200         IF( ln_rsttr ) THEN 
    210201            CALL iom_open( TRIM(cn_trcrst_indir)//'/'//cn_trcrst_in, numrtr, kiolib = jlibalt ) 
     
    236227             ELSE 
    237228               ndastp = ndate0 - 1     ! ndate0 read in the namelist in dom_nam 
    238                adatrj = ( REAL( nittrc000-1, wp ) * rdttra(1) ) / rday 
     229               adatrj = ( REAL( nittrc000-1, wp ) * rdt ) / rday 
    239230               ! note this is wrong if time step has changed during run 
    240231            ENDIF 
     
    289280      ! 
    290281      DO jk = 1, jpk 
    291          zvol(:,:,jk) = e1e2t(:,:) * fse3t_a(:,:,jk) * tmask(:,:,jk) 
     282         zvol(:,:,jk) = e1e2t(:,:) * e3t_a(:,:,jk) * tmask(:,:,jk) 
    292283      END DO 
    293284      ! 
Note: See TracChangeset for help on using the changeset viewer.