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.
Changeset 6140 for trunk/NEMOGCM/NEMO/OPA_SRC/C1D/c1d.F90 – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 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/c1d.F90

    r5836 r6140  
    44   !! Ocean domain  :  1D configuration 
    55   !!===================================================================== 
    6    !! History :   2.0  !  2004-09 (C. Ethe)     Original code 
    7    !!             3.0  !  2008-04 (G. Madec)    adaptation to SBC 
    8    !!             3.5  !  2013-10 (D. Calvert)  add namelist 
     6   !! History :  2.0  !  2004-09 (C. Ethe)     Original code 
     7   !!            3.0  !  2008-04 (G. Madec)    adaptation to SBC 
     8   !!            3.5  !  2013-10 (D. Calvert)  add namelist 
    99   !!---------------------------------------------------------------------- 
    1010#if defined key_c1d 
     
    1212   !!   'key_c1d'                                   1D column configuration 
    1313   !!---------------------------------------------------------------------- 
    14    !!   c1d_init       : read in the C1D namelist 
     14   !!   c1d_init      : read in the C1D namelist 
    1515   !!---------------------------------------------------------------------- 
    16    USE in_out_manager   ! I/O manager 
    17    USE par_kind         ! kind parameters 
    18    USE lib_mpp 
     16   USE par_kind       ! kind parameters 
     17   ! 
     18   USE in_out_manager ! I/O manager 
     19   USE lib_mpp        ! MPP library 
    1920 
    2021   IMPLICIT NONE 
    2122   PRIVATE 
    2223 
    23    PUBLIC   c1d_init                                 ! called by nemogcm.F90 
     24   PUBLIC   c1d_init   ! called by nemogcm.F90 
    2425 
    2526   LOGICAL , PUBLIC, PARAMETER ::  lk_c1d = .TRUE.   ! 1D config. flag 
    2627 
    27    REAL(wp), PUBLIC            ::  rn_lat1d     ! Column latitude 
    28    REAL(wp), PUBLIC            ::  rn_lon1d     ! Column longitude 
    29    LOGICAL , PUBLIC            ::  ln_c1d_locpt ! Localization (or not) of 1D column in a grid 
     28   REAL(wp), PUBLIC ::  rn_lat1d     !: Column latitude 
     29   REAL(wp), PUBLIC ::  rn_lon1d     !: Column longitude 
     30   LOGICAL , PUBLIC ::  ln_c1d_locpt !: Localization (or not) of 1D column in a grid 
    3031 
    3132   !!---------------------------------------------------------------------- 
    32    !! NEMO/C1D 3.3 , NEMO Consortium (2010) 
     33   !! NEMO/C1D 3.7 , NEMO Consortium (2015) 
    3334   !! $Id$  
    3435   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     
    4445      !! ** Method  :   Read namelist namc1d  
    4546      !!---------------------------------------------------------------------- 
    46       INTEGER ::   ios                 ! Local integer output status for namelist read 
     47      INTEGER ::   ios   ! Local integer 
     48      !! 
    4749      NAMELIST/namc1d/ rn_lat1d, rn_lon1d , ln_c1d_locpt 
    4850      !!---------------------------------------------------------------------- 
     
    5052      REWIND( numnam_ref )              ! Namelist namc1d in reference namelist : Tracer advection scheme 
    5153      READ  ( numnam_ref, namc1d, IOSTAT = ios, ERR = 901) 
    52 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namc1d in reference namelist', lwp ) 
    53  
     54901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namc1d in reference namelist', lwp ) 
     55      ! 
    5456      REWIND( numnam_cfg )              ! Namelist namtra_adv in configuration namelist : Tracer advection scheme 
    5557      READ  ( numnam_cfg, namc1d, IOSTAT = ios, ERR = 902 ) 
    56 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namc1d in configuration namelist', lwp ) 
     58902   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namc1d in configuration namelist', lwp ) 
    5759      IF(lwm) WRITE ( numond, namc1d ) 
    5860      ! 
Note: See TracChangeset for help on using the changeset viewer.