Ignore:
Timestamp:
2020-02-28T16:55:11+01:00 (8 months ago)
Author:
davestorkey
Message:

Preparation for new timestepping scheme #2390.
Main changes:

  1. Initial euler timestep now handled in stp and not in TRA/DYN routines.
  2. Renaming of all timestep parameters. In summary, the namelist parameter is now rn_Dt and the current timestep is rDt (and rDt_ice, rDt_trc etc).
  3. Renaming of a few miscellaneous parameters, eg. atfp → rn_atfp (namelist parameter used everywhere) and rau0 → rho0.

This version gives bit-comparable results to the previous version of the trunk.

File:
1 edited

Legend:

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

    r12377 r12489  
    6464      IF( ln_timing )   CALL timing_start('trc_stp') 
    6565      ! 
    66       IF( ( neuler == 0 .AND. kt == nittrc000 ) .OR. ln_top_euler ) THEN     ! at nittrc000 
    67          r2dttrc =  rdttrc           ! = rdttrc (use or restarting with Euler time stepping) 
     66      IF( l_1st_euler .OR. ln_top_euler ) THEN     ! at nittrc000 
     67         rDt_trc =  rn_Dt           ! = rn_Dt (use or restarting with Euler time stepping) 
    6868      ELSEIF( kt <= nittrc000 + 1 ) THEN                                     ! at nittrc000 or nittrc000+1  
    69          r2dttrc = 2. * rdttrc       ! = 2 rdttrc (leapfrog)  
     69         rDt_trc = 2. * rn_Dt       ! = 2 rn_Dt (leapfrog)  
    7070      ENDIF 
    7171      ! 
     
    177177            nb_rec_per_day = ncpl_qsr_freq 
    178178         ELSE   
    179             rdt_sampl = MAX( 3600., rdttrc ) 
     179            rdt_sampl = MAX( 3600., rn_Dt ) 
    180180            nb_rec_per_day = INT( rday / rdt_sampl ) 
    181181         ENDIF 
     
    196196 
    197197            CALL iom_get( numrtr, 'ktdcy', zkt )   
    198             rsecfst = INT( zkt ) * rdttrc 
     198            rsecfst = INT( zkt ) * rn_Dt 
    199199            IF(lwp) WRITE(numout,*) 'trc_qsr_mean:   qsr_mean read in the restart file at time-step rsecfst =', rsecfst, ' s ' 
    200200            CALL iom_get( numrtr, jpdom_autoglo, 'qsr_mean', qsr_mean )   !  A mean of qsr 
     
    217217         ELSE                                         !* no restart: set from nit000 values 
    218218            IF(lwp) WRITE(numout,*) 'trc_qsr_mean:   qsr_mean set to nit000 values' 
    219             rsecfst  = kt * rdttrc 
     219            rsecfst  = kt * rn_Dt 
    220220            ! 
    221221            qsr_mean(:,:) = qsr(:,:) 
     
    227227      ENDIF 
    228228      ! 
    229       rseclast = kt * rdttrc 
     229      rseclast = kt * rn_Dt 
    230230      ! 
    231231      llnew   = ( rseclast - rsecfst ) .ge.  rdt_sampl    !   new shortwave to store 
Note: See TracChangeset for help on using the changeset viewer.