Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (15 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/OBS/obs_prep.F90

    r10068 r12377  
    244244      &                     kpi, kpj, kpk, & 
    245245      &                     zmask1, pglam1, pgphi1, zmask2, pglam2, pgphi2,  & 
    246       &                     ld_nea, ld_bound_reject, kdailyavtypes,  kqc_cutoff ) 
     246      &                     ld_nea, ld_bound_reject, Kmm, kdailyavtypes,  kqc_cutoff ) 
    247247 
    248248!!---------------------------------------------------------------------- 
     
    274274      LOGICAL, INTENT(IN) :: ld_bound_reject      ! Switch for rejecting observations near the boundary 
    275275      INTEGER, INTENT(IN) :: kpi, kpj, kpk        ! Local domain sizes 
     276      INTEGER, INTENT(IN) :: Kmm                  ! time-level index 
    276277      INTEGER, DIMENSION(imaxavtypes), OPTIONAL :: & 
    277278         & kdailyavtypes                          ! Types for daily averages 
     
    420421         &                 inlav1obs,             ld_nea,               & 
    421422         &                 ibdyv1obs,             ld_bound_reject,      & 
    422          &                 iqc_cutoff       ) 
     423         &                 iqc_cutoff,            Kmm                 ) 
    423424 
    424425      CALL obs_mpp_sum_integer( iosdv1obs, iosdv1obsmpp ) 
     
    442443         &                 inlav2obs,             ld_nea,               & 
    443444         &                 ibdyv2obs,             ld_bound_reject,      & 
    444          &                 iqc_cutoff       ) 
     445         &                 iqc_cutoff,            Kmm                 ) 
    445446 
    446447      CALL obs_mpp_sum_integer( iosdv2obs, iosdv2obsmpp ) 
     
    10941095      &                       klanobs, knlaobs, ld_nea,         & 
    10951096      &                       kbdyobs, ld_bound_reject,         & 
    1096       &                       kqc_cutoff                        ) 
     1097      &                       kqc_cutoff,       Kmm             ) 
    10971098      !!---------------------------------------------------------------------- 
    10981099      !!                    ***  ROUTINE obs_coo_spc_3d  *** 
     
    11161117      !!---------------------------------------------------------------------- 
    11171118      !! * Modules used 
    1118       USE dom_oce, ONLY : &       ! Geographical information 
     1119      USE dom_oce, ONLY : &       ! Geographical information  
    11191120         & gdepw_1d,      & 
    11201121         & gdepw_0,       &                        
    1121          & gdepw_n,       & 
    1122          & gdept_n,       & 
     1122         & gdepw       & 
     1123         & gdept       & 
    11231124         & ln_zco,        & 
    11241125         & ln_zps              
     
    11601161      LOGICAL, INTENT(IN) :: ld_bound_reject  ! Flag observations near open boundary 
    11611162      INTEGER, INTENT(IN) :: kqc_cutoff     ! Cutoff QC value 
     1163      INTEGER, INTENT(IN) :: Kmm            ! time-level index 
    11621164 
    11631165      !! * Local declarations 
     
    12301232      CALL obs_int_comm_2d( 2, 2, kprofno, kpi, kpj, igrdi, igrdj, plam, zglam ) 
    12311233      CALL obs_int_comm_2d( 2, 2, kprofno, kpi, kpj, igrdi, igrdj, pphi, zgphi ) 
    1232       CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, gdepw_n(:,:,:), & 
     1234      CALL obs_int_comm_3d( 2, 2, kprofno, kpi, kpj, kpk, igrdi, igrdj, gdepw(:,:,:,Kmm), & 
    12331235        &                     zgdepw ) 
    12341236 
Note: See TracChangeset for help on using the changeset viewer.