Ignore:
Timestamp:
2019-09-11T15:54:18+02:00 (19 months ago)
Author:
smasson
Message:

trunk: merge dev_r10984_HPC-13 into the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/TOP/trcrst.F90

    r10425 r11536  
    5858            IF( ln_rst_list ) THEN 
    5959               nrst_lst = 1 
    60                nitrst = nstocklist( nrst_lst ) 
     60               nitrst = nn_stocklist( nrst_lst ) 
    6161            ELSE 
    6262               nitrst = nitend 
     
    6464         ENDIF 
    6565 
    66          IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nstock ) == 0 ) THEN 
     66         IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nn_stock ) == 0 ) THEN 
    6767            ! we use kt - 1 and not kt - nittrc000 to keep the same periodicity from the beginning of the experiment 
    68             nitrst = kt + nstock - 1                  ! define the next value of nitrst for restart writing 
     68            nitrst = kt + nn_stock - 1                  ! define the next value of nitrst for restart writing 
    6969            IF( nitrst > nitend )   nitrst = nitend   ! make sure we write a restart at the end of the run 
    7070         ENDIF 
     
    7272         IF( kt == nittrc000 ) lrst_trc = .FALSE. 
    7373      ENDIF 
     74 
     75      IF( .NOT. ln_rst_list .AND. nn_stock == -1 )   RETURN   ! we will never do any restart 
    7476 
    7577      ! to get better performances with NetCDF format: 
    7678      ! we open and define the tracer restart file one tracer time step before writing the data (-> at nitrst - 2*nn_dttrc + 1) 
    7779      ! except if we write tracer restart files every tracer time step or if a tracer restart file was writen at nitend - 2*nn_dttrc + 1 
    78       IF( kt == nitrst - 2*nn_dttrc .OR. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN 
     80      IF( kt == nitrst - 2*nn_dttrc .OR. nn_stock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN 
    7981         ! beware of the format used to write kt (default is i8.8, that should be large enough) 
    8082         IF( nitrst > 1.0e9 ) THEN   ;   WRITE(clkt,*       ) nitrst 
     
    153155          IF( l_offline .AND. ln_rst_list ) THEN 
    154156             nrst_lst = nrst_lst + 1 
    155              nitrst = nstocklist( nrst_lst ) 
     157             nitrst = nn_stocklist( nrst_lst ) 
    156158          ENDIF 
    157159      ENDIF 
Note: See TracChangeset for help on using the changeset viewer.