Ignore:
Timestamp:
2020-04-08T21:37:59+02:00 (10 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:
3 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/OFF/dtadyn.F90

    r12377 r12724  
    546546      ENDIF 
    547547 
    548       ssh(:,:,Kmm) = ssh(:,:,Kmm) + atfp * ( ssh(:,:,Kbb) - 2 * ssh(:,:,Kmm) + ssh(:,:,Kaa))   
     548      ssh(:,:,Kmm) = ssh(:,:,Kmm) + rn_atfp * ( ssh(:,:,Kbb) - 2 * ssh(:,:,Kmm) + ssh(:,:,Kaa))   
    549549 
    550550      !! Do we also need to time filter e3t?? 
    … …  
    622622      !!---------------------------------------------------------------------- 
    623623      ! 
    624       z2dt = 2._wp * rdt 
     624      z2dt = 2._wp * rn_Dt 
    625625      ! 
    626626      zhdiv(:,:) = 0._wp 
    … …  
    629629      END DO 
    630630      !                                                ! Sea surface  elevation time-stepping 
    631       pssha(:,:) = ( psshb(:,:) - z2dt * ( r1_rau0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:) 
     631      pssha(:,:) = ( psshb(:,:) - z2dt * ( r1_rho0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:) 
    632632      !                                                 !  
    633633      !                                                 ! After acale factors at t-points ( z_star coordinate ) 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OFF/nemogcm.F90

    r12377 r12724  
    209209      IF( lwm )   CALL ctl_opn(     numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
    210210      ! open /dev/null file to be able to supress output write easily 
     211      IF( Agrif_Root() ) THEN 
    211212                  CALL ctl_opn(     numnul,           '/dev/null', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
     213#ifdef key_agrif 
     214      ELSE 
     215                  numnul = Agrif_Parent(numnul)    
     216#endif 
     217      ENDIF 
    212218      ! 
    213219      !                             !--------------------! 
Note: See TracChangeset for help on using the changeset viewer.