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 728 for trunk/NEMO/TOP_SRC – NEMO

Changeset 728 for trunk/NEMO/TOP_SRC


Ignore:
Timestamp:
2007-10-22T12:01:39+02:00 (16 years ago)
Author:
cetlod
Message:

add tmask_i in global sum, see ticket:17

Location:
trunk/NEMO/TOP_SRC/SMS
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMO/TOP_SRC/SMS/p4zsed.F

    r719 r728  
    11 
    2 CCC $Header$  
     2CCC $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/p4zsed.F,v 1.9 2007/10/12 09:35:04 opalod Exp $  
    33CCC  TOP 1.0 , LOCEAN-IPSL (2005)  
    44C This software is governed by CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
     
    102102     &      +(rivinp(ji,jj)+nitdep(ji,jj))*rfact2 
    103103          trn(ji,jj,1,jpfer) = trn(ji,jj,1,jpfer) 
    104      &      +rivinp(ji,jj)*9E-5*rfact2 
     104     &      +rivinp(ji,jj)*3E-5*rfact2 
    105105          trn(ji,jj,1,jpsil) = trn(ji,jj,1,jpsil) 
    106106     &      +sidep(ji,jj)+cotdep(ji,jj)*rfact2/6. 
     
    140140C    ------------------------------------------------------------- 
    141141C 
    142         DO jj=2,jpjm1 
    143           DO ji=2,jpim1 
     142        DO jj=1,jpj 
     143          DO ji=1,jpi 
    144144            ikt=max(mbathy(ji,jj)-1,1) 
    145             zfact=e1t(ji,jj)*e2t(ji,jj)/rjjss 
     145            zfact=e1t(ji,jj)*e2t(ji,jj)/rjjss*tmask_i(ji,jj) 
    146146            sumsedsi=sumsedsi+zfact*trn(ji,jj,ikt,jpdsi) 
    147147#if ! defined key_trc_kriest 
     
    152152            sumsedcal=sumsedcal+trn(ji,jj,ikt,jpcal)*wscal(ji,jj,ikt) 
    153153     &          *2.*zfact 
     154#if  defined key_trc_kriest 
    154155            sumsedpo4=sumsedpo4+ 
    155156     &          (trn(ji,jj,ikt,jppoc)*wsbio3(ji,jj,ikt))*zfact 
     157#else 
     158            sumsedpo4=sumsedpo4+(trn(ji,jj,ikt,jpgoc)*wsbio4(ji,jj,ikt) 
     159     &    +trn(ji,jj,ikt,jppoc)*wsbio3(ji,jj,ikt))*zfact 
     160#endif 
    156161          END DO 
    157162        END DO 
     
    246251            DO ji=2,jpi-1 
    247252        denitot=denitot+denitr(ji,jj,jk)*rdenit*e1t(ji,jj)*e2t(ji,jj) 
    248      &    *fse3t(ji,jj,jk)*tmask(ji,jj,jk)*znegtr(ji,jj,jk) 
     253     &    *fse3t(ji,jj,jk)*tmask(ji,jj,jk)*tmask_i(ji,jj) 
     254     &    *znegtr(ji,jj,jk) 
    249255            END DO 
    250256          END DO 
     
    274280      nitrpottot=0. 
    275281      DO jk=1,jpkm1 
    276         DO jj=2,jpj-1 
    277           DO ji=2,jpi-1 
     282        DO jj=1,jpj 
     283          DO ji=1,jpi 
    278284        nitrpottot=nitrpottot+nitrpot(ji,jj,jk)*e1t(ji,jj) 
    279      &    *e2t(ji,jj)*tmask(ji,jj,jk)*fse3t(ji,jj,jk) 
     285     &    *e2t(ji,jj)*tmask(ji,jj,jk)*tmask_i(ji,jj)*fse3t(ji,jj,jk) 
    280286          END DO 
    281287        END DO 
  • trunk/NEMO/TOP_SRC/SMS/trcini.pisces.h90

    r719 r728  
    3737      !!---------------------------------------------------------------------- 
    3838      !!  TOP 1.0 , LOCEAN-IPSL (2005)  
    39       !! $Header$  
     39      !! $Header: /home/opalod/NEMOCVSROOT/NEMO/TOP_SRC/SMS/trcini.pisces.h90,v 1.9 2007/10/12 09:35:04 opalod Exp $  
    4040      !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt  
    4141      !!---------------------------------------------------------------------- 
     
    169169            DO ji = 2, jpim1 
    170170               sumdepsi = sumdepsi + dustmo(ji,jj,jm)/(12.*rmoss)*8.8        & 
    171                   *0.075/28.1*e1t(ji,jj)*e2t(ji,jj)*tmask(ji,jj,1) 
     171                  *0.075/28.1*e1t(ji,jj)*e2t(ji,jj)*tmask(ji,jj,1)*tmask_i(ji,jj) 
    172172            END DO 
    173173         END DO 
     
    200200         DO ji=2,jpim1 
    201201            rivpo4input=rivpo4input+rivinp(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    202                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     202               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    203203            rivalkinput=rivalkinput+cotdep(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    204                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     204               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    205205            nitdepinput=nitdepinput+nitdep(ji,jj)*(e1t(ji,jj)*e2t(ji,jj)    & 
    206                *fse3t(ji,jj,1))*tmask(ji,jj,1)*raass 
     206               *fse3t(ji,jj,1))*tmask(ji,jj,1)*tmask_i(ji,jj)*raass 
    207207         END DO 
    208208      END DO 
Note: See TracChangeset for help on using the changeset viewer.