Changeset 1503

Timestamp:

2009-07-20T17:32:19+02:00 (15 years ago)

Author:

cetlod

Message:

correction of minor bug in p4zsed.F90 PISCES module ticket:477

File:

• trunk/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) (8 diffs)

trunk/NEMO/TOP_SRC/PISCES/p4zsed.F90

@@ -60 +60 @@
 
    !!* Substitution
-#  include "domzgr_substitute.h90"
+#  include "top_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
@@ -461 +461 @@
       REAL(wp) , DIMENSION (jpi,jpj)     ::   riverdoc, river, ndepo
       REAL(wp) , DIMENSION (jpi,jpj,jpk) ::   cmask
-      REAL(wp), DIMENSION(jpi,jpj,12)    ::   zdustmo
+      REAL(wp) , DIMENSION(jpi,jpj,12)    ::   zdustmo
 
       NAMELIST/nampissed/ bdustfer, briver, bndepo, bsedinput, sedfeinput, dustsolub
@@ -534 +534 @@
          DO jk = 1, 5
             DO jj = 2, jpjm1
-               DO ji = 2, jpim1
+               DO ji = fs_2, fs_jpim1
                   IF( tmask(ji,jj,jk) /= 0. ) THEN
                      zmaskt = tmask(ji+1,jj,jk) * tmask(ji-1,jj,jk) * tmask(ji,jj+1,jk)    &
@@ -564 +564 @@
       DO jm = 1, jpmois
          DO jj = 2, jpjm1
-            DO ji = 2, jpim1
+            DO ji = fs_2, fs_jpim1
                sumdepsi = sumdepsi + zdustmo(ji,jj,jm) / (12.*rmoss) * 8.8        &
                   &     * 0.075/28.1 * e1t(ji,jj) * e2t(ji,jj) * tmask(ji,jj,1) * tmask_i(ji,jj)
@@ -570 +570 @@
          END DO
       END DO
-      IF( lk_mpp )   CALL mpp_sum( sumdepsi )  ! sum over the global domain
+      IF( lk_mpp )  CALL mpp_sum( sumdepsi )  ! sum over the global domain
 
       ! N/P and Si releases due to coastal rivers
@@ -576 +576 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            zcoef = raass * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,1)
-            cotdep(ji,jj) =  river(ji,jj)                  *1E9 / ( 12. * zcoef + rtrn ) * tmask(ji,jj,1)
-            rivinp(ji,jj) = (river(ji,jj)+riverdoc(ji,jj)) *1E9 / ( 31.6* zcoef + rtrn ) * tmask(ji,jj,1)
-            nitdep(ji,jj) = 7.6 * ndepo(ji,jj)                  / ( 14E6*raass*fse3t(ji,jj,1) + rtrn ) * tmask(ji,jj,1)
+            zcoef = raass * e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,1) * tmask(ji,jj,1) * tmask_i(ji,jj)
+            cotdep(ji,jj) =  river(ji,jj)                  *1E9 / ( 12. * zcoef + rtrn )
+            rivinp(ji,jj) = (river(ji,jj)+riverdoc(ji,jj)) *1E9 / ( 31.6* zcoef + rtrn )
+            nitdep(ji,jj) = 7.6 * ndepo(ji,jj)                  / ( 14E6*raass*fse3t(ji,jj,1) + rtrn )
          END DO
       END DO
@@ -585 +585 @@
       CALL lbc_lnk( cotdep , 'T', 1. )  ;  CALL lbc_lnk( rivinp , 'T', 1. )  ;  CALL lbc_lnk( nitdep , 'T', 1. )
 
-      rivpo4input=0.e0
-      rivalkinput=0.e0
-      nitdepinput=0.e0
+      rivpo4input = 0.e0
+      rivalkinput = 0.e0
+      nitdepinput = 0.e0
       DO jj = 2 , jpjm1
-         DO ji = 2, jpim1
+         DO ji = fs_2, fs_jpim1
             zcoef = cvol(ji,jj,1) * raass
             rivpo4input = rivpo4input + rivinp(ji,jj) * zcoef
@@ -612 +612 @@
 
    END SUBROUTINE p4z_sed_init
-
-
 
 #else