Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (20 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/TOP/PISCES/trcwri_pisces.F90

    r10069 r12377  
    1919   PUBLIC trc_wri_pisces  
    2020 
     21   !! * Substitutions 
     22#  include "do_loop_substitute.h90" 
    2123   !!---------------------------------------------------------------------- 
    2224   !! NEMO/TOP 4.0 , NEMO Consortium (2018) 
     
    2628CONTAINS 
    2729 
    28    SUBROUTINE trc_wri_pisces 
     30   SUBROUTINE trc_wri_pisces( Kmm ) 
    2931      !!--------------------------------------------------------------------- 
    3032      !!                     ***  ROUTINE trc_wri_trc  *** 
     
    3234      !! ** Purpose :   output passive tracers fields  
    3335      !!--------------------------------------------------------------------- 
     36      INTEGER, INTENT(in)          :: Kmm      ! time level indices 
    3437      CHARACTER (len=20)           :: cltra 
    3538      REAL(wp)                     :: zfact 
     
    4346         DO jn = jp_pcs0, jp_pcs1 
    4447            cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer 
    45             CALL iom_put( cltra, trn(:,:,:,jn) ) 
     48            CALL iom_put( cltra, tr(:,:,:,jn,Kmm) ) 
    4649         END DO 
    4750      ELSE 
     
    5154            IF( jn == jppo4  )                 zfact = po4r * 1.0e+6 
    5255            cltra = TRIM( ctrcnm(jn) )                  ! short title for tracer 
    53             IF( iom_use( cltra ) )  CALL iom_put( cltra, trn(:,:,:,jn) * zfact ) 
     56            IF( iom_use( cltra ) )  CALL iom_put( cltra, tr(:,:,:,jn,Kmm) * zfact ) 
    5457         END DO 
    5558 
     
    5760            zdic(:,:) = 0. 
    5861            DO jk = 1, jpkm1 
    59                zdic(:,:) = zdic(:,:) + trn(:,:,jk,jpdic) * e3t_n(:,:,jk) * tmask(:,:,jk) * 12. 
     62               zdic(:,:) = zdic(:,:) + tr(:,:,jk,jpdic,Kmm) * e3t(:,:,jk,Kmm) * tmask(:,:,jk) * 12. 
    6063            ENDDO 
    6164            CALL iom_put( 'INTDIC', zdic )      
     
    6366         ! 
    6467         IF( iom_use( "O2MIN" ) .OR. iom_use ( "ZO2MIN" ) ) THEN  ! Oxygen minimum concentration and depth  
    65             zo2min   (:,:) = trn(:,:,1,jpoxy) * tmask(:,:,1) 
    66             zdepo2min(:,:) = gdepw_n(:,:,1)   * tmask(:,:,1) 
    67             DO jk = 2, jpkm1 
    68                DO jj = 1, jpj 
    69                   DO ji = 1, jpi 
    70                      IF( tmask(ji,jj,jk) == 1 ) then 
    71                         IF( trn(ji,jj,jk,jpoxy) < zo2min(ji,jj) ) then 
    72                            zo2min   (ji,jj) = trn(ji,jj,jk,jpoxy) 
    73                            zdepo2min(ji,jj) = gdepw_n(ji,jj,jk) 
    74                         ENDIF 
    75                      ENDIF 
    76                   END DO 
    77                END DO 
    78             END DO 
     68            zo2min   (:,:) = tr(:,:,1,jpoxy,Kmm) * tmask(:,:,1) 
     69            zdepo2min(:,:) = gdepw(:,:,1,Kmm)   * tmask(:,:,1) 
     70            DO_3D_11_11( 2, jpkm1 ) 
     71               IF( tmask(ji,jj,jk) == 1 ) then 
     72                  IF( tr(ji,jj,jk,jpoxy,Kmm) < zo2min(ji,jj) ) then 
     73                     zo2min   (ji,jj) = tr(ji,jj,jk,jpoxy,Kmm) 
     74                     zdepo2min(ji,jj) = gdepw(ji,jj,jk,Kmm) 
     75                  ENDIF 
     76               ENDIF 
     77            END_3D 
    7978            ! 
    8079            CALL iom_put('O2MIN' , zo2min     )                              ! oxygen minimum concentration 
Note: See TracChangeset for help on using the changeset viewer.