Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (5 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

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/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/C1D/dyncor_c1d.F90

    r5215 r6140  
    1111   !!   'key_c1d'                                          1D Configuration 
    1212   !!---------------------------------------------------------------------- 
    13    !!   cor_c1d      : Coriolis factor at T-point (1D configuration) 
    14    !!   dyn_cor_c1d  : vorticity trend due to Coriolis at T-point 
     13   !!   cor_c1d       : Coriolis factor at T-point (1D configuration) 
     14   !!   dyn_cor_c1d   : vorticity trend due to Coriolis at T-point 
    1515   !!---------------------------------------------------------------------- 
    16    USE oce               ! ocean dynamics and tracers 
    17    USE dom_oce           ! ocean space and time domain 
    18    USE phycst            ! physical constants 
    19    USE in_out_manager    ! I/O manager 
    20    USE prtctl            ! Print control 
     16   USE oce            ! ocean dynamics and tracers 
     17   USE dom_oce        ! ocean space and time domain 
     18   USE phycst         ! physical constants 
     19   ! 
     20   USE in_out_manager ! I/O manager 
     21   USE prtctl         ! Print control 
    2122 
    2223   IMPLICIT NONE 
    2324   PRIVATE 
    2425 
    25    PUBLIC   cor_c1d      ! routine called by OPA.F90 
    26    PUBLIC   dyn_cor_c1d  ! routine called by step1d.F90 
     26   PUBLIC   cor_c1d      ! called by nemogcm.F90 
     27   PUBLIC   dyn_cor_c1d  ! called by step1d.F90 
    2728 
    2829   !! * Substitutions 
    2930#  include "vectopt_loop_substitute.h90" 
    3031   !!---------------------------------------------------------------------- 
    31    !! NEMO/C1D 3.3 , NEMO Consortium (2010) 
     32   !! NEMO/C1D 3.7 , NEMO Consortium (2015) 
    3233   !! $Id$  
    3334   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     
    4142      !! ** Purpose : set the Coriolis factor at T-point 
    4243      !!---------------------------------------------------------------------- 
    43       REAL(wp) ::   zphi0, zbeta, zf0         !  temporary scalars 
     44      REAL(wp) ::   zphi0, zbeta, zf0   ! local scalars 
    4445      !!---------------------------------------------------------------------- 
    4546 
     
    8788      INTEGER, INTENT( in ) ::   kt   ! ocean time-step index 
    8889      !! 
    89       INTEGER ::   ji, jj, jk         ! dummy loop indices 
     90      INTEGER ::   ji, jj, jk   ! dummy loop indices 
    9091      !!---------------------------------------------------------------------- 
    9192      ! 
Note: See TracChangeset for help on using the changeset viewer.