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/TOP_SRC/PISCES/trcwri_pisces.F90

    r5836 r6140  
    2121   PUBLIC trc_wri_pisces  
    2222 
    23    !! * Substitutions 
    24 #  include "domzgr_substitute.h90" 
    25  
     23   !!---------------------------------------------------------------------- 
     24   !! NEMO/TOP 3.3 , NEMO Consortium (2010) 
     25   !! $Id: trcnam.F90 5836 2015-10-26 14:49:40Z cetlod $ 
     26   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
     27   !!---------------------------------------------------------------------- 
    2628CONTAINS 
    2729 
     
    5759         zdic(:,:) = 0. 
    5860         DO jk = 1, jpkm1 
    59             zdic(:,:) = zdic(:,:) + trn(:,:,jk,jpdic) * fse3t(:,:,jk) * tmask(:,:,jk) * 12. 
     61            zdic(:,:) = zdic(:,:) + trn(:,:,jk,jpdic) * e3t_n(:,:,jk) * tmask(:,:,jk) * 12. 
    6062         ENDDO 
    6163         CALL iom_put( 'INTDIC', zdic )      
     
    6466      IF( iom_use( "O2MIN" ) .OR. iom_use ( "ZO2MIN" ) ) THEN  ! Oxygen minimum concentration and depth  
    6567         zo2min   (:,:) = trn(:,:,1,jpoxy) * tmask(:,:,1) 
    66          zdepo2min(:,:) = fsdepw(:,:,1)    * tmask(:,:,1) 
     68         zdepo2min(:,:) = gdepw_n(:,:,1)   * tmask(:,:,1) 
    6769         DO jk = 2, jpkm1 
    6870            DO jj = 1, jpj 
     
    7173                     IF( trn(ji,jj,jk,jpoxy) < zo2min(ji,jj) ) then 
    7274                        zo2min   (ji,jj) = trn(ji,jj,jk,jpoxy) 
    73                         zdepo2min(ji,jj) = fsdepw(ji,jj,jk) 
     75                        zdepo2min(ji,jj) = gdepw_n(ji,jj,jk) 
    7476                     ENDIF 
    7577                  ENDIF 
Note: See TracChangeset for help on using the changeset viewer.