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

    r5930 r6140  
    1616   USE oce             ! ocean dynamics and tracers variables 
    1717   USE dom_oce         ! ocean space and time domain variables  
     18   USE c1d             ! 1D vertical configuration 
     19   ! 
    1820   USE in_out_manager  ! I/O manager 
    1921   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
    2022   USE lib_mpp         ! distributed memory computing 
    21    USE c1d             ! 1D vertical configuration 
    2223 
    2324   IMPLICIT NONE 
     
    3031   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
    3132   !!---------------------------------------------------------------------- 
    32  
    3333CONTAINS 
    3434 
     
    4646      !!                 
    4747      !!---------------------------------------------------------------------- 
    48       INTEGER, INTENT( in ) ::   kt         ! ocean time-step index 
    49       INTEGER, INTENT( inout ) ::   kindic  ! error indicator 
     48      INTEGER, INTENT(in   ) ::   kt       ! ocean time-step index 
     49      INTEGER, INTENT(inout) ::   kindic   ! error indicator 
    5050      !! 
    51       INTEGER  ::   ji, jj, jk              ! dummy loop indices 
    52       INTEGER  ::   ii, ij, ik              ! temporary integers 
    53       REAL(wp) ::   zumax, zsmin, zssh2     ! temporary scalars 
    54       INTEGER, DIMENSION(3) ::   ilocu      !  
    55       INTEGER, DIMENSION(2) ::   ilocs      !  
     51      INTEGER  ::   ji, jj, jk             ! dummy loop indices 
     52      INTEGER  ::   ii, ij, ik             ! local integers 
     53      REAL(wp) ::   zumax, zsmin, zssh2    ! local scalars 
     54      INTEGER, DIMENSION(3) ::   ilocu     !  
     55      INTEGER, DIMENSION(2) ::   ilocs     !  
    5656      !!---------------------------------------------------------------------- 
    57  
     57      ! 
    5858      IF( kt == nit000 .AND. lwp ) THEN 
    5959         WRITE(numout,*) 
     
    6363         CALL ctl_opn( numstp, 'time.step', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea ) 
    6464      ENDIF 
    65  
     65      ! 
    6666      IF(lwp) WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp 
    6767      IF(lwp) REWIND( numstp )                       !  -------------------------- 
    68  
     68      ! 
    6969      !                                              !* Test maximum of velocity (zonal only) 
    7070      !                                              !  ------------------------ 
     
    102102      ENDIF 
    1031039400  FORMAT (' kt=',i6,' max abs(U): ',1pg11.4,', i j k: ',3i5) 
    104  
     104      ! 
    105105      !                                              !* Test minimum of salinity 
    106106      !                                              !  ------------------------ 
    107107      !! zsmin = MINVAL( tsn(:,:,1,jp_sal), mask = tmask(:,:,1) == 1.e0 )  slower than the following loop on NEC SX5 
    108       zsmin = 100.e0 
     108      zsmin = 100._wp 
    109109      DO jj = 2, jpjm1 
    110110         DO ji = 1, jpi 
     
    136136      ENDIF 
    1371379500  FORMAT (' kt=',i6,' min SSS: ',1pg11.4,', i j: ',2i5) 
    138  
    139        
     138      ! 
     139      ! 
    140140      IF( lk_c1d )  RETURN          ! No log file in case of 1D vertical configuration 
    141141 
     
    151151      IF(lwp) WRITE(numsol,9300) kt, zssh2, zumax, zsmin      ! ssh statistics 
    152152      ! 
    153  
    1541539200  FORMAT('it:', i8, ' iter:', i4, ' r: ',e16.10, ' b: ',e16.10 ) 
    1551549300  FORMAT(' it :', i8, ' ssh2: ', e16.10, ' Umax: ',e16.10,' Smin: ',e16.10) 
Note: See TracChangeset for help on using the changeset viewer.