Changeset 3203 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM

Timestamp:

2011-12-07T16:10:49+01:00 (12 years ago)

Author:

cbricaud

Message:

correct bug in diadct

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) (1 diff)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -860 +860 @@
         sec%transport(2,jclass)=sec%transport(2,jclass)+zsum(2,jclass)*1.E-6
         IF( sec%llstrpond ) THEN
-           IF( zsum(1,jclass) .NE. 0 ) THEN
-              sec%transport(3,jclass)=sec%transport(3,jclass)+zsum(3,jclass)/zsum(1,jclass)
-              sec%transport(5,jclass)=sec%transport(5,jclass)+zsum(5,jclass)/zsum(1,jclass)
-              sec%transport(7,jclass)=sec%transport(7,jclass)+zsum(7,jclass)
-              sec%transport(9,jclass)=sec%transport(9,jclass)+zsum(9,jclass)
-           ELSE
-              sec%transport(3,jclass)=0.
-              sec%transport(5,jclass)=0.
-              sec%transport(7,jclass)=0.
-              sec%transport(9,jclass)=0.
+           IF( zsum(1,jclass) .NE. 0._wp ) THEN
+              sec%transport( 3,jclass) = sec%transport( 3,jclass) + zsum( 3,jclass)/zsum(1,jclass)
+              sec%transport( 5,jclass) = sec%transport( 5,jclass) + zsum( 5,jclass)/zsum(1,jclass)
+              sec%transport( 7,jclass) = sec%transport( 7,jclass) + zsum( 7,jclass)
+              sec%transport( 9,jclass) = sec%transport( 9,jclass) + zsum( 9,jclass)
            ENDIF
-           IF( zsum(2,jclass) .NE. 0 )THEN
-              sec%transport( 4,jclass)=sec%transport( 4,jclass)+zsum( 4,jclass)/zsum(2,jclass)
-              sec%transport( 6,jclass)=sec%transport( 6,jclass)+zsum( 6,jclass)/zsum(2,jclass)
-              sec%transport( 8,jclass)=sec%transport( 8,jclass)+zsum( 8,jclass)
-              sec%transport(10,jclass)=sec%transport(10,jclass)+zsum(10,jclass)
-           ELSE
-              sec%transport( 4,jclass)=0.
-              sec%transport( 6,jclass)=0.
-              sec%transport( 8,jclass)=0.
-              sec%transport(10,jclass)=0.
+           IF( zsum(2,jclass) .NE. 0._wp )THEN
+              sec%transport( 4,jclass) = sec%transport( 4,jclass) + zsum( 4,jclass)/zsum(2,jclass)
+              sec%transport( 6,jclass) = sec%transport( 6,jclass) + zsum( 6,jclass)/zsum(2,jclass)
+              sec%transport( 8,jclass) = sec%transport( 8,jclass) + zsum( 8,jclass)
+              sec%transport(10,jclass) = sec%transport(10,jclass) + zsum(10,jclass)
            ENDIF
         ELSE
-           sec%transport( 3,jclass)=0.
-           sec%transport( 4,jclass)=0.
-           sec%transport( 5,jclass)=0.
-           sec%transport( 6,jclass)=0.
-           sec%transport( 7,jclass)=0.
-           sec%transport( 8,jclass)=0.
-           sec%transport(10,jclass)=0.
+           sec%transport( 3,jclass) = 0._wp
+           sec%transport( 4,jclass) = 0._wp
+           sec%transport( 5,jclass) = 0._wp
+           sec%transport( 6,jclass) = 0._wp
+           sec%transport( 7,jclass) = 0._wp
+           sec%transport( 8,jclass) = 0._wp
+           sec%transport(10,jclass) = 0._wp
         ENDIF
      ENDDO