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 12377 for NEMO/trunk/src/OCE/FLO/floats.F90 – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge --ignore-ancestry \

​svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
​svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The --ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk

    • Property svn:externals

      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 

  • NEMO/trunk/src/OCE/FLO/floats.F90

    r11536 r12377  
    3737CONTAINS 
    3838 
    39    SUBROUTINE flo_stp( kt ) 
     39   SUBROUTINE flo_stp( kt, Kbb, Kmm ) 
    4040      !!---------------------------------------------------------------------- 
    4141      !!                   ***  ROUTINE flo_stp  *** 
    … …  
    4848      !!        if ln_flork4 =T 
    4949      !!---------------------------------------------------------------------- 
    50       INTEGER, INTENT( in  ) ::   kt   ! ocean time step 
     50      INTEGER, INTENT( in  ) ::   kt        ! ocean time step 
     51      INTEGER, INTENT( in  ) ::   Kbb, Kmm  ! ocean time level indices  
    5152      !!---------------------------------------------------------------------- 
    5253      ! 
    5354      IF( ln_timing )   CALL timing_start('flo_stp') 
    5455      ! 
    55       IF( ln_flork4 ) THEN   ;   CALL flo_4rk( kt )        ! Trajectories using a 4th order Runge Kutta scheme 
    56       ELSE                   ;   CALL flo_blk( kt )        ! Trajectories using Blanke' algorithme 
     56      IF( ln_flork4 ) THEN   ;   CALL flo_4rk( kt, Kbb, Kmm )  ! Trajectories using a 4th order Runge Kutta scheme 
     57      ELSE                   ;   CALL flo_blk( kt, Kbb, Kmm )  ! Trajectories using Blanke' algorithme 
    5758      ENDIF 
    5859      ! 
    5960      IF( lk_mpp )   CALL mppsync   ! synchronization of all the processor 
    6061      ! 
    61       CALL flo_wri( kt )      ! trajectories ouput  
     62      CALL flo_wri( kt, Kmm ) ! trajectories ouput  
    6263      ! 
    6364      CALL flo_rst( kt )      ! trajectories restart 
    6465      ! 
    65       wb(:,:,:) = wn(:,:,:)         ! Save the old vertical velocity field 
     66      wb(:,:,:) = ww(:,:,:)         ! Save the old vertical velocity field 
    6667      ! 
    6768      IF( ln_timing )   CALL timing_stop('flo_stp') 
    … …  
    7071 
    7172 
    72    SUBROUTINE flo_init 
     73   SUBROUTINE flo_init( Kmm ) 
    7374      !!---------------------------------------------------------------- 
    7475      !!                 ***  ROUTINE flo_init  *** 
    … …  
    7677      !! ** Purpose :   Read the namelist of floats 
    7778      !!---------------------------------------------------------------------- 
     79      INTEGER, INTENT(in) :: Kmm       ! ocean time level index 
     80      ! 
    7881      INTEGER ::   jfl 
    7982      INTEGER ::   ios                 ! Local integer output status for namelist read 
    … …  
    8689      IF(lwp) WRITE(numout,*) '~~~~~~~' 
    8790 
    88       REWIND( numnam_ref )              ! Namelist namflo in reference namelist : Floats 
    8991      READ  ( numnam_ref, namflo, IOSTAT = ios, ERR = 901) 
    9092901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namflo in reference namelist' ) 
    9193 
    92       REWIND( numnam_cfg )              ! Namelist namflo in configuration namelist : Floats 
    9394      READ  ( numnam_cfg, namflo, IOSTAT = ios, ERR = 902 ) 
    9495902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namflo in configuration namelist' ) 
    … …  
    130131         END DO 
    131132         ! 
    132          CALL flo_dom                  ! compute/read initial position of floats 
     133         CALL flo_dom( Kmm )           ! compute/read initial position of floats 
    133134         ! 
    134          wb(:,:,:) = wn(:,:,:)         ! set wb for computation of floats trajectories at the first time step 
     135         wb(:,:,:) = ww(:,:,:)         ! set wb for computation of floats trajectories at the first time step 
    135136         ! 
    136137      ENDIF 
    137       ! 
    138138   END SUBROUTINE flo_init 
    139139 
Note: See TracChangeset for help on using the changeset viewer.