New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
trdtrc.F90 in branches/UKMO/dev_r5107_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/TRD – NEMO

source: branches/UKMO/dev_r5107_hadgem3_cplseq/NEMOGCM/NEMO/OPA_SRC/TRD/trdtrc.F90 @ 5476

Last change on this file since 5476 was 4990, checked in by timgraham, 9 years ago

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.
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 )
12      INTEGER ::   kt, kjn, ktrd   
13      REAL    ::   ptrtrd(:,:,:) 
14      WRITE(*,*) 'trd_trc : You should not have seen this print! error?', ptrtrd(1,1,1)
15      WRITE(*,*) '  "      "      : You should not have seen this print! error?', kjn, ktrd, kt
16   END SUBROUTINE trd_trc
17
18   !!----------------------------------------------------------------------
19   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
20   !! $Id: trdtrc.F90 2715 2011-03-30 15:58:35Z rblod $
21   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
22   !!======================================================================
23END MODULE trdtrc
Note: See TracBrowser for help on using the repository browser.