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/OCE/ISF/isfdynatf.F90

    r12372 r12489  
    1313   USE isf_oce 
    1414 
    15    USE phycst , ONLY: r1_rau0         ! physical constant 
     15   USE phycst , ONLY: r1_rho0         ! physical constant 
    1616   USE dom_oce, ONLY: tmask, ssmask, ht, e3t, r1_e1e2t   ! time and space domain 
    1717 
     
    3939      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT(inout) :: pe3t_f   ! time filtered scale factor to be corrected 
    4040      ! 
    41       REAL(wp)                        , INTENT(in   ) :: pcoef    ! atfp * rdt * r1_rau0 
     41      REAL(wp)                        , INTENT(in   ) :: pcoef    ! rn_atfp * rn_Dt * r1_rho0 
    4242      !!-------------------------------------------------------------------- 
    4343      INTEGER :: jk  ! loop index 
     
    7070      REAL(wp), DIMENSION(jpi,jpj)    , INTENT(in   ) :: pfrac, phtbl    ! fraction of bottom cell included in tbl, tbl thickness 
    7171      REAL(wp), DIMENSION(jpi,jpj)    , INTENT(in   ) :: pfwf , pfwf_b   ! now/before fwf 
    72       REAL(wp),                         INTENT(in   ) :: pcoef           ! atfp * rdt * r1_rau0 
     72      REAL(wp),                         INTENT(in   ) :: pcoef           ! rn_atfp * rn_Dt * r1_rho0 
    7373      !!---------------------------------------------------------------------- 
    7474      INTEGER :: ji,jj,jk 
     
    7777      ! 
    7878      ! compute fwf conservation correction 
    79       zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / ( ht(:,:) + 1._wp - ssmask(:,:) ) * r1_rau0 
     79      zfwfinc(:,:) = pcoef * ( pfwf_b(:,:) - pfwf(:,:) ) / ( ht(:,:) + 1._wp - ssmask(:,:) ) * r1_rho0 
    8080      ! 
    8181      ! add the increment 
Note: See TracChangeset for help on using the changeset viewer.