Changeset 12489 for NEMO/trunk/src/SAS


Ignore:
Timestamp:
2020-02-28T16:55:11+01:00 (9 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.

Location:
NEMO/trunk/src/SAS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/SAS/diawri.F90

    r12377 r12489  
    174174      ENDIF 
    175175#if defined key_diainstant 
    176       zsto = nn_write * rdt 
     176      zsto = nn_write * rn_Dt 
    177177      clop = "inst("//TRIM(clop)//")" 
    178178#else 
    179       zsto=rdt 
     179      zsto=rn_Dt 
    180180      clop = "ave("//TRIM(clop)//")" 
    181181#endif 
    182       zout = nn_write * rdt 
    183       zmax = ( nitend - nit000 + 1 ) * rdt 
     182      zout = nn_write * rn_Dt 
     183      zmax = ( nitend - nit000 + 1 ) * rn_Dt 
    184184 
    185185      ! Define indices of the horizontal output zoom and vertical limit storage 
     
    202202 
    203203         ! Compute julian date from starting date of the run 
    204          CALL ymds2ju( nyear, nmonth, nday, rdt, zjulian ) 
     204         CALL ymds2ju( nyear, nmonth, nday, rn_Dt, zjulian ) 
    205205         zjulian = zjulian - adatrj   !   set calendar origin to the beginning of the experiment 
    206206         IF(lwp)WRITE(numout,*) 
     
    224224         CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,           &  ! Horizontal grid: glamt and gphit 
    225225            &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,       & 
    226             &          nit000-1, zjulian, rdt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set ) 
     226            &          nit000-1, zjulian, rn_Dt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set ) 
    227227         CALL histvert( nid_T, "deptht", "Vertical T levels",      &  ! Vertical grid: gdept 
    228228            &           "m", ipk, gdept_1d, nz_T, "down" ) 
     
    236236         CALL histbeg( clhstnam, jpi, glamu, jpj, gphiu,           &  ! Horizontal grid: glamu and gphiu 
    237237            &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,       & 
    238             &          nit000-1, zjulian, rdt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set ) 
     238            &          nit000-1, zjulian, rn_Dt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set ) 
    239239         CALL histvert( nid_U, "depthu", "Vertical U levels",      &  ! Vertical grid: gdept 
    240240            &           "m", ipk, gdept_1d, nz_U, "down" ) 
     
    248248         CALL histbeg( clhstnam, jpi, glamv, jpj, gphiv,           &  ! Horizontal grid: glamv and gphiv 
    249249            &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,       & 
    250             &          nit000-1, zjulian, rdt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set ) 
     250            &          nit000-1, zjulian, rn_Dt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set ) 
    251251         CALL histvert( nid_V, "depthv", "Vertical V levels",      &  ! Vertical grid : gdept 
    252252            &          "m", ipk, gdept_1d, nz_V, "down" ) 
     
    261261            CALL histbeg( clhstnam, jpi, glamt, jpj, gphit,           &  ! Horizontal grid: glamt and gphit 
    262262               &          iimi, iima-iimi+1, ijmi, ijma-ijmi+1,       & 
    263                &          nit000-1, zjulian, rdt, nh_A, nid_A, domain_id=nidom, snc4chunks=snc4set ) 
     263               &          nit000-1, zjulian, rn_Dt, nh_A, nid_A, domain_id=nidom, snc4chunks=snc4set ) 
    264264            CALL histvert( nid_A, "ght_abl", "Vertical T levels",      &  ! Vertical grid: gdept 
    265265               &           "m", ipka, ght_abl(2:jpka), nz_A, "up" ) 
  • NEMO/trunk/src/SAS/nemogcm.F90

    r12377 r12489  
    378378                           CALL bdy_init 
    379379      ! ==> 
    380                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance 
     380                           CALL icb_init( rn_Dt, nit000)   ! initialise icebergs instance 
    381381      ! 
    382382      IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA 
Note: See TracChangeset for help on using the changeset viewer.