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 12724 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/ASM/asminc.F90 – NEMO

Ignore:
Timestamp:
2020-04-08T21:37:59+02:00 (4 years 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/OCE/ASM/asminc.F90

    r12680 r12724  
    489489      ENDIF 
    490490      ! 
    491       IF(lwp) WRITE(numout,*) '   ==>>>   Euler time step switch is ', neuler 
     491      IF(lwp) WRITE(numout,*) '   ==>>>   Euler time step switch is ', l_1st_euler 
    492492      ! 
    493493      IF( lk_asminc ) THEN                            !==  data assimilation  ==! 
    … …  
    536536            ! 
    537537            it = kt - nit000 + 1 
    538             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     538            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    539539            ! 
    540540            IF(lwp) THEN 
    … …  
    579579         IF ( kt == nitdin_r ) THEN 
    580580            ! 
    581             neuler = 0  ! Force Euler forward step 
     581            l_1st_euler = .TRUE.  ! Force Euler forward step 
    582582            ! 
    583583            ! Initialize the now fields with the background + increment 
    … …  
    653653            ! 
    654654            it = kt - nit000 + 1 
    655             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     655            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    656656            ! 
    657657            IF(lwp) THEN 
    … …  
    679679         IF ( kt == nitdin_r ) THEN 
    680680            ! 
    681             neuler = 0                    ! Force Euler forward step 
     681            l_1st_euler = .TRUE.                    ! Force Euler forward step 
    682682            ! 
    683683            ! Initialize the now fields with the background + increment 
    … …  
    724724            ! 
    725725            it = kt - nit000 + 1 
    726             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     726            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    727727            ! 
    728728            IF(lwp) THEN 
    … …  
    755755         IF ( kt == nitdin_r ) THEN 
    756756            ! 
    757             neuler = 0                                   ! Force Euler forward step 
     757            l_1st_euler = .TRUE.                            ! Force Euler forward step 
    758758            ! 
    759759            ssh(:,:,Kmm) = ssh_bkg(:,:) + ssh_bkginc(:,:)   ! Initialize the now fields the background + increment 
    … …  
    845845            it = kt - nit000 + 1 
    846846            zincwgt = wgtiau(it)      ! IAU weight for the current time step 
    847             ! note this is not a tendency so should not be divided by rdt (as with the tracer and other increments) 
     847            ! note this is not a tendency so should not be divided by rn_Dt (as with the tracer and other increments) 
    848848            ! 
    849849            IF(lwp) THEN 
    … …  
    880880#if defined key_cice && defined key_asminc 
    881881            ! Sea-ice : CICE case. Pass ice increment tendency into CICE 
    882             ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rdt 
     882            ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rn_Dt 
    883883#endif 
    884884            ! 
    … …  
    900900         IF ( kt == nitdin_r ) THEN 
    901901            ! 
    902             neuler = 0                    ! Force Euler forward step 
     902            l_1st_euler = 0              ! Force Euler forward step 
    903903            ! 
    904904            ! Sea-ice : SI3 case 
    … …  
    930930#if defined key_cice && defined key_asminc 
    931931            ! Sea-ice : CICE case. Pass ice increment tendency into CICE 
    932            ndaice_da(:,:) = seaice_bkginc(:,:) / rdt 
     932           ndaice_da(:,:) = seaice_bkginc(:,:) / rn_Dt 
    933933#endif 
    934934            IF ( .NOT. PRESENT(kindic) ) THEN 
    … …  
    963963!           ! fwf : ice formation and melting 
    964964! 
    965 !                 zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*rdt 
     965!                 zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*rn_Dt 
    966966! 
    967967!           ! change salinity down to mixed layer depth 
    … …  
    10041004! 
    10051005!      !            !  salt exchanges at the ice/ocean interface 
    1006 !      !            zpmess         = zfons / rdt_ice    ! rdt_ice is ice timestep 
     1006!      !            zpmess         = zfons / rDt_ice    ! rDt_ice is ice timestep 
    10071007!      ! 
    10081008!      !! Adjust fsalt. A +ve fsalt means adding salt to ocean 
Note: See TracChangeset for help on using the changeset viewer.