Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (8 months 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/BDY/bdyini.F90

    r12142 r12377  
    2222   USE bdydta         ! open boundary cond. setting   (bdy_dta_init routine) 
    2323   USE bdytides       ! open boundary cond. setting   (bdytide_init routine) 
    24    USE sbctide        ! Tidal forcing or not 
     24   USE tide_mod, ONLY: ln_tide ! tidal forcing 
    2525   USE phycst   , ONLY: rday 
    2626   ! 
     
    7575      ! Read namelist parameters 
    7676      ! ------------------------ 
    77       REWIND( numnam_ref )              ! Namelist nambdy in reference namelist :Unstructured open boundaries 
    7877      READ  ( numnam_ref, nambdy, IOSTAT = ios, ERR = 901) 
    7978901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nambdy in reference namelist' ) 
     
    9392      cn_ice         (2:jp_bdy) = cn_ice         (1) 
    9493      nn_ice_dta     (2:jp_bdy) = nn_ice_dta     (1) 
    95       REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist :Unstructured open boundaries 
    9694      READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 ) 
    9795902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nambdy in configuration namelist' ) 
     
    364362      ! ------------------------------------------------- 
    365363 
    366       REWIND( numnam_cfg )      
    367364      nblendta(:,:) = 0 
    368365      nbdysege = 0 
     
    10801077      INTEGER          ::   ios                 ! Local integer output status for namelist read 
    10811078      INTEGER          ::   nbdyind, nbdybeg, nbdyend 
     1079      INTEGER          ::   nbdy_count, nbdy_rdstart, nbdy_loc 
    10821080      CHARACTER(LEN=1) ::   ctypebdy   !     -        -  
     1081      CHARACTER(LEN=50)::   cerrmsg    !     -        -  
    10831082      NAMELIST/nambdy_index/ ctypebdy, nbdyind, nbdybeg, nbdyend 
    10841083      !!---------------------------------------------------------------------- 
    1085  
    1086       ! No REWIND here because may need to read more than one nambdy_index namelist. 
    1087       ! Read only namelist_cfg to avoid unseccessfull overwrite  
    1088       ! keep full control of the configuration namelist 
    1089       READ  ( numnam_cfg, nambdy_index, IOSTAT = ios, ERR = 904 ) 
     1084      ! Need to support possibility of reading more than one nambdy_index from 
     1085      ! the namelist_cfg internal file. 
     1086      ! Do this by finding the kb_bdy'th occurence of nambdy_index in the 
     1087      ! character buffer as the starting point. 
     1088      nbdy_rdstart = 1 
     1089      DO nbdy_count = 1, kb_bdy 
     1090       nbdy_loc = INDEX( numnam_cfg( nbdy_rdstart: ), 'nambdy_index' ) 
     1091       IF( nbdy_loc .GT. 0 ) THEN 
     1092          nbdy_rdstart = nbdy_rdstart + nbdy_loc 
     1093       ELSE 
     1094          WRITE(cerrmsg,'(A,I4,A)') 'Error: entry number ',kb_bdy,' of nambdy_index not found' 
     1095          ios = -1 
     1096          CALL ctl_nam ( ios , cerrmsg ) 
     1097       ENDIF 
     1098      END DO 
     1099      nbdy_rdstart = MAX( 1, nbdy_rdstart - 2 ) 
     1100      READ  ( numnam_cfg( nbdy_rdstart: ), nambdy_index, IOSTAT = ios, ERR = 904) 
    10901101904   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nambdy_index in configuration namelist' ) 
    10911102      IF(lwm) WRITE ( numond, nambdy_index ) 
Note: See TracChangeset for help on using the changeset viewer.