source: NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/OCE/TRD/trdtrc.F90

Last change on this file was 12377, checked in by acc, 13 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: 1.1 KB
Line 
1MODULE trdtrc
2   !!======================================================================
3   !!                       ***  MODULE trdtrc  ***
4   !!  Dummy module
5   !!======================================================================
6   !!----------------------------------------------------------------------
7   !!   Dummy module                                             NO TOP use
8   !!----------------------------------------------------------------------
9CONTAINS
10
11   SUBROUTINE trd_trc( ptrtrd, kjn, ktrd, kt, Kmm )
12      INTEGER ::   kt, kjn, ktrd   
13      INTEGER ::   Kmm            ! time level index
14      REAL    ::   ptrtrd(:,:,:) 
15      WRITE(*,*) 'trd_trc : You should not have seen this print! error?', ptrtrd(1,1,1)
16      WRITE(*,*) '  "      "      : You should not have seen this print! error?', kjn, ktrd, kt
17   END SUBROUTINE trd_trc
18
19   !!----------------------------------------------------------------------
20   !! NEMO/OCE 4.0 , NEMO Consortium (2018)
21   !! $Id$
22   !! Software governed by the CeCILL license (see ./LICENSE)
23   !!======================================================================
24END MODULE trdtrc
Note: See TracBrowser for help on using the repository browser.