Ignore:
Timestamp:
2020-02-28T16:55:11+01:00 (14 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/ASM/asminc.F90

    r12377 r12489  
    487487      ENDIF 
    488488      ! 
    489       IF(lwp) WRITE(numout,*) '   ==>>>   Euler time step switch is ', neuler 
     489      IF(lwp) WRITE(numout,*) '   ==>>>   Euler time step switch is ', l_1st_euler 
    490490      ! 
    491491      IF( lk_asminc ) THEN                            !==  data assimilation  ==! 
     
    534534            ! 
    535535            it = kt - nit000 + 1 
    536             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     536            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    537537            ! 
    538538            IF(lwp) THEN 
     
    577577         IF ( kt == nitdin_r ) THEN 
    578578            ! 
    579             neuler = 0  ! Force Euler forward step 
     579            l_1st_euler = .TRUE.  ! Force Euler forward step 
    580580            ! 
    581581            ! Initialize the now fields with the background + increment 
     
    651651            ! 
    652652            it = kt - nit000 + 1 
    653             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     653            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    654654            ! 
    655655            IF(lwp) THEN 
     
    677677         IF ( kt == nitdin_r ) THEN 
    678678            ! 
    679             neuler = 0                    ! Force Euler forward step 
     679            l_1st_euler = .TRUE.                    ! Force Euler forward step 
    680680            ! 
    681681            ! Initialize the now fields with the background + increment 
     
    722722            ! 
    723723            it = kt - nit000 + 1 
    724             zincwgt = wgtiau(it) / rdt   ! IAU weight for the current time step 
     724            zincwgt = wgtiau(it) / rn_Dt   ! IAU weight for the current time step 
    725725            ! 
    726726            IF(lwp) THEN 
     
    753753         IF ( kt == nitdin_r ) THEN 
    754754            ! 
    755             neuler = 0                                   ! Force Euler forward step 
     755            l_1st_euler = .TRUE.                            ! Force Euler forward step 
    756756            ! 
    757757            ssh(:,:,Kmm) = ssh_bkg(:,:) + ssh_bkginc(:,:)   ! Initialize the now fields the background + increment 
     
    841841            it = kt - nit000 + 1 
    842842            zincwgt = wgtiau(it)      ! IAU weight for the current time step  
    843             ! note this is not a tendency so should not be divided by rdt (as with the tracer and other increments) 
     843            ! note this is not a tendency so should not be divided by rn_Dt (as with the tracer and other increments) 
    844844            ! 
    845845            IF(lwp) THEN 
     
    876876#if defined key_cice && defined key_asminc 
    877877            ! Sea-ice : CICE case. Pass ice increment tendency into CICE 
    878             ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rdt 
     878            ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rn_Dt 
    879879#endif 
    880880            ! 
     
    896896         IF ( kt == nitdin_r ) THEN 
    897897            ! 
    898             neuler = 0                    ! Force Euler forward step 
     898            l_1st_euler = 0              ! Force Euler forward step 
    899899            ! 
    900900            ! Sea-ice : SI3 case 
     
    926926#if defined key_cice && defined key_asminc 
    927927            ! Sea-ice : CICE case. Pass ice increment tendency into CICE 
    928            ndaice_da(:,:) = seaice_bkginc(:,:) / rdt 
     928           ndaice_da(:,:) = seaice_bkginc(:,:) / rn_Dt 
    929929#endif 
    930930            IF ( .NOT. PRESENT(kindic) ) THEN 
     
    959959!           ! fwf : ice formation and melting 
    960960! 
    961 !                 zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*rdt 
     961!                 zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*rn_Dt 
    962962! 
    963963!           ! change salinity down to mixed layer depth 
     
    10001000! 
    10011001!      !            !  salt exchanges at the ice/ocean interface 
    1002 !      !            zpmess         = zfons / rdt_ice    ! rdt_ice is ice timestep 
     1002!      !            zpmess         = zfons / rDt_ice    ! rDt_ice is ice timestep 
    10031003!      ! 
    10041004!      !! Adjust fsalt. A +ve fsalt means adding salt to ocean 
Note: See TracChangeset for help on using the changeset viewer.