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 12443 for NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/TOP/TRP/trcatf.F90 – NEMO

Ignore:
Timestamp:
2020-02-24T14:00:21+01:00 (4 years ago)
Author:
davestorkey
Message:

2020/KERNEL-03_Storkey_Coward_RK3_stage2: More variable renaming:
atfp -> rn_atfp (use namelist parameter everywhere)
rdtbt -> rDt_e
nn_baro -> nn_e
rn_scal_load -> rn_load
rau0 -> rho0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/src/TOP/TRP/trcatf.F90

    r12397 r12443  
    7171      !!      the divergence of two consecutive time-steps and tr arrays 
    7272      !!      to prepare the next time_step: 
    73       !!         (tr(Kmm)) = (tr(Kmm)) + atfp [ (tr(Kbb)) + (tr(Kaa)) - 2 (tr(Kmm)) ] 
     73      !!         (tr(Kmm)) = (tr(Kmm)) + rn_atfp [ (tr(Kbb)) + (tr(Kaa)) - 2 (tr(Kmm)) ] 
    7474      !! 
    7575      !! 
     
    200200      !!                  /( e3t(:,:,:,Kmm)    + rbcp*[ e3t(:,:,:,Kbb)    - 2 e3t(:,:,:,Kmm)    + e3t(:,:,:,Kaa)    ] )    
    201201      !!             ztm = 0                                                       otherwise 
    202       !!             tb  = ( e3t_n*tn + atfp*[ e3t_b*tb - 2 e3t_n*tn + e3t_a*ta ] ) 
    203       !!                  /( e3t(:,:,:,Kmm)    + atfp*[ e3t(:,:,:,Kbb)    - 2 e3t(:,:,:,Kmm)    + e3t(:,:,:,Kaa)    ] ) 
     202      !!             tb  = ( e3t_n*tn + rn_atfp*[ e3t_b*tb - 2 e3t_n*tn + e3t_a*ta ] ) 
     203      !!                  /( e3t(:,:,:,Kmm)    + rn_atfp*[ e3t(:,:,:,Kbb)    - 2 e3t(:,:,:,Kmm)    + e3t(:,:,:,Kaa)    ] ) 
    204204      !!             tn  = ta  
    205205      !!             ta  = zt        (NB: reset to 0 after eos_bn2 call) 
     
    222222         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~' 
    223223         IF( .NOT. ln_linssh ) THEN 
    224             rfact1 = atfp * rdttrc 
    225             rfact2 = rfact1 / rau0 
     224            rfact1 = rn_atfp * rdttrc 
     225            rfact2 = rfact1 / rho0 
    226226         ENDIF 
    227227        !   
     
    241241            ztc_d  = ztc_a  - 2. * ztc_n  + ztc_b 
    242242            ! 
    243             ze3t_f = ze3t_n + atfp * ze3t_d 
    244             ztc_f  = ztc_n  + atfp * ztc_d 
     243            ze3t_f = ze3t_n + rn_atfp * ze3t_d 
     244            ztc_f  = ztc_n  + rn_atfp * ztc_d 
    245245            ! 
    246246            IF( .NOT. ln_linssh .AND. jk == mikt(ji,jj) ) THEN           ! first level  
Note: See TracChangeset for help on using the changeset viewer.