source: NEMO/trunk/src/TOP/PISCES/trcsms_pisces.F90 @ 12489

Last change on this file since 12489 was 12377, checked in by acc, 10 months ago

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.

  • Property svn:keywords set to Id
File size: 2.0 KB
Line 
1MODULE trcsms_pisces
2   !!======================================================================
3   !!                         ***  MODULE trcsms_pisces  ***
4   !! TOP :   PISCES Source Minus Sink manager
5   !!======================================================================
6   !! History :   1.0  !  2004-03 (O. Aumont) Original code
7   !!             2.0  !  2007-12  (C. Ethe, G. Madec)  F90
8   !!----------------------------------------------------------------------
9   !!   trcsms_pisces        :  Time loop of passive tracers sms
10   !!----------------------------------------------------------------------
11   USE par_pisces
12   USE sms_pisces
13   USE p4zsms
14   USE p2zsms
15
16   IMPLICIT NONE
17   PRIVATE
18
19   PUBLIC   trc_sms_pisces    ! called in trcsms.F90
20   !!----------------------------------------------------------------------
21   !! NEMO/TOP 4.0 , NEMO Consortium (2018)
22   !! $Id$
23   !! Software governed by the CeCILL license (see ./LICENSE)
24   !!----------------------------------------------------------------------
25CONTAINS
26
27   SUBROUTINE trc_sms_pisces( kt, Kbb, Kmm, Krhs )
28      !!---------------------------------------------------------------------
29      !!                     ***  ROUTINE trc_sms_pisces  ***
30      !!
31      !! ** Purpose :   Managment of the call to Biological sources and sinks
32      !!                routines of PISCES or LOBSTER bio-model
33      !!
34      !!---------------------------------------------------------------------
35      !
36      INTEGER, INTENT( in ) ::   kt               ! ocean time-step index     
37      INTEGER, INTENT( in ) ::   Kbb, Kmm, Krhs   ! time level index
38      !!---------------------------------------------------------------------
39      !
40      IF( ln_p4z .OR. ln_p5z ) THEN  ;   CALL p4z_sms( kt, Kbb, Kmm, Krhs )   !  PISCES
41      ELSE                           ;   CALL p2z_sms( kt,      Kmm, Krhs )   !  LOBSTER
42      ENDIF
43
44      !
45   END SUBROUTINE trc_sms_pisces
46
47   !!======================================================================
48END MODULE trcsms_pisces 
Note: See TracBrowser for help on using the repository browser.