Ignore:
Timestamp:
2020-04-08T21:37:59+02:00 (18 months ago)
Author:
techene
Message:

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

Location:
NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

    • Property svn:externals
      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         8 
         9# SETTE 
         10^/utils/CI/sette@HEAD         sette 
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/TOP/PISCES/P4Z/p4zsms.F90

    r12680 r12724  
    9191      IF( ln_pisdmp .AND. MOD( kt - 1, nn_pisdmp ) == 0 )   CALL p4z_dmp( kt, Kbb, Kmm )      ! Relaxation of some tracers 
    9292      ! 
    93       rfact = r2dttrc 
     93      rfact = rDt_trc 
    9494      ! 
    9595      ! trends computation initialisation 
     
    107107         xfact = 1.e+3 * rfact2r 
    108108         IF(lwp) WRITE(numout,*)  
    109          IF(lwp) WRITE(numout,*) '    Passive Tracer  time step    rfact  = ', rfact, ' rdt = ', rdt 
     109         IF(lwp) WRITE(numout,*) '    Passive Tracer  time step    rfact  = ', rfact, ' rn_Dt = ', rn_Dt 
    110110         IF(lwp) write(numout,*) '    PISCES  Biology time step    rfact2 = ', rfact2 
    111111         IF(lwp) WRITE(numout,*) 
    112112      ENDIF 
    113113 
    114       IF( ( neuler == 0 .AND. kt == nittrc000 ) .OR. ln_top_euler ) THEN 
     114      IF( l_1st_euler .OR. ln_top_euler ) THEN 
    115115         DO jn = jp_pcs0, jp_pcs1              !   SMS on tracer without Asselin time-filter 
    116116            tr(:,:,:,jn,Kbb) = tr(:,:,:,jn,Kmm) 
Note: See TracChangeset for help on using the changeset viewer.