Changeset 7 for trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90

Timestamp:

02/08/12 18:07:19 (12 years ago)

Author:

cholod

Message:

Update of the trunk with the v3.4_r3300

Location:

trunk

Files:

• . (modified) (1 prop)
• NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsed.F90

@@ -160 +160 @@
             ikt = mbkt(ji,jj) 
 # if defined key_kriest
-            zwork1(ji,jj) = trn(ji,jj,ikt,jpdsi) * wscal (ji,jj,ikt)
+            zwork1(ji,jj) = trn(ji,jj,ikt,jpgsi) * wscal (ji,jj,ikt)
             zwork2(ji,jj) = trn(ji,jj,ikt,jppoc) * wsbio3(ji,jj,ikt)
 # else
-            zwork1(ji,jj) = trn(ji,jj,ikt,jpdsi) * wsbio4(ji,jj,ikt)
+            zwork1(ji,jj) = trn(ji,jj,ikt,jpgsi) * wsbio4(ji,jj,ikt)
             zwork2(ji,jj) = trn(ji,jj,ikt,jpgoc) * wsbio4(ji,jj,ikt) + trn(ji,jj,ikt,jppoc) * wsbio3(ji,jj,ikt) 
 # endif
@@ -194 +194 @@
             zwscal  = wscal (ji,jj,ikt) * zdep
 # if defined key_kriest
-            zsiloss = trn(ji,jj,ikt,jpdsi) * zwsbio4
+            zsiloss = trn(ji,jj,ikt,jpgsi) * zwsbio4
 # else
-            zsiloss = trn(ji,jj,ikt,jpdsi) * zwscal
+            zsiloss = trn(ji,jj,ikt,jpgsi) * zwscal
 # endif
             zcaloss = trn(ji,jj,ikt,jpcal) * zwscal
             !
-            trn(ji,jj,ikt,jpdsi) = trn(ji,jj,ikt,jpdsi) - zsiloss
+            trn(ji,jj,ikt,jpgsi) = trn(ji,jj,ikt,jpgsi) - zsiloss
             trn(ji,jj,ikt,jpcal) = trn(ji,jj,ikt,jpcal) - zcaloss
 #if ! defined key_sed