Changeset 3028 for branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90

Timestamp:

2011-10-31T09:42:39+01:00 (12 years ago)

Author:

cetlod

Message:

branch dev_LOCEAN_2011 : minor changes in TOP component relative to the management of additional diagnostics

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90 (modified) (4 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zflx.F90

@@ -83 +83 @@
       !!              - Add option for time-interpolation of atcco2.txt  
       !!---------------------------------------------------------------------
-      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY:   zkgco2 => wrk_2d_11 , zkgo2 => wrk_2d_12 , zh2co3 => wrk_2d_13 
-      USE wrk_nemo, ONLY:   zoflx  => wrk_2d_14 , zkg   => wrk_2d_15
-      USE wrk_nemo, ONLY:   zdpco2 => wrk_2d_16 , zdpo2 => wrk_2d_17
+      USE wrk_nemo, ONLY:  wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:  zkgco2 => wrk_2d_11 , zkgo2 => wrk_2d_12 
+      USE wrk_nemo, ONLY:  zh2co3 => wrk_2d_13 , zoflx => wrk_2d_14 
+      USE wrk_nemo, ONLY:   
       !
       INTEGER, INTENT(in) ::   kt   !
@@ -98 +98 @@
       !!---------------------------------------------------------------------
 
-      IF( wrk_in_use(2, 11,12,13,14,15,16,17) ) THEN
+      IF( wrk_in_use(2, 11,12,13,14) ) THEN
          CALL ctl_stop('p4z_flx: requested workspace arrays unavailable')   ;   RETURN
       ENDIF
@@ -196 +196 @@
             zfld16 = atcox * patm(ji,jj) * chemc(ji,jj,2) * tmask(ji,jj,1) * zkgo2(ji,jj)          ! (mol/L) * (m/s)
             zflu16 = trn(ji,jj,1,jpoxy) * tmask(ji,jj,1) * zkgo2(ji,jj)
-            tra(ji,jj,1,jpoxy) = tra(ji,jj,1,jpoxy) + ( zfld16 - zflu16 ) / fse3t(ji,jj,1)
-
-            IF( ln_diatrc ) THEN          ! Save diagnostics
-              IF( lk_iomput ) THEN
-                 zoflx(ji,jj) = ( zfld16 - zflu16 ) * 1000. * tmask(ji,jj,1)
-                 zkg  (ji,jj) = zkgco2(ji,jj) * tmask(ji,jj,1)
-                 zdpco2(ji,jj) = ( satmco2(ji,jj) * patm(ji,jj) - zh2co3(ji,jj) / ( chemc(ji,jj,1) + rtrn ) ) * tmask(ji,jj,1)
-                 zdpo2 (ji,jj) = ( atcox * patm(ji,jj) - trn(ji,jj,1,jpoxy)    / ( chemc(ji,jj,2) + rtrn ) ) * tmask(ji,jj,1)
-              ELSE
-                 zfact = 1. / e1e2t(ji,jj) / rfact
-                 trc2d(ji,jj,jp_pcs0_2d    ) = oce_co2(ji,jj) * zfact
-                 trc2d(ji,jj,jp_pcs0_2d + 1) = ( zfld16 - zflu16 ) * 1000. * tmask(ji,jj,1)
-                 trc2d(ji,jj,jp_pcs0_2d + 2) = zkgco2(ji,jj) * tmask(ji,jj,1)
-                 trc2d(ji,jj,jp_pcs0_2d + 3) = ( satmco2(ji,jj)  * patm(ji,jj) - zh2co3(ji,jj) / ( chemc(ji,jj,1) + rtrn ) ) &
-                    &                            * tmask(ji,jj,1)
-              ENDIF
-           ENDIF
+            zoflx(ji,jj) = zfld16 - zflu16
+            tra(ji,jj,1,jpoxy) = tra(ji,jj,1,jpoxy) + zoflx(ji,jj) / fse3t(ji,jj,1)
          END DO
       END DO
@@ -241 +226 @@
 
       IF( ln_diatrc ) THEN
-         CALL iom_put( "Cflx" , oce_co2(:,:) / e1e2t(:,:) / rfact ) 
-         CALL iom_put( "Oflx" , zoflx  )
-         CALL iom_put( "Kg"   , zkg    )
-         CALL iom_put( "Dpco2", zdpco2 )
-         CALL iom_put( "Dpo2" , zdpo2  )
-      ENDIF
-      !
-      IF( wrk_not_released(2, 11,12,13,14,15,16,17) )  &
-        &             CALL ctl_stop('p4z_flx: failed to release workspace arrays')
+         IF( lk_iomput ) THEN
+            CALL iom_put( "Cflx" , oce_co2(:,:) / e1e2t(:,:) / rfact ) 
+            CALL iom_put( "Oflx" , zoflx(:,:) * 1000 * tmask(:,:,1)  )
+            CALL iom_put( "Kg"   , zkgco2(:,:) * tmask(:,:,1) )
+            CALL iom_put( "Dpco2", ( satmco2(:,:) * patm(:,:) - zh2co3(:,:) / ( chemc(:,:,1) + rtrn ) ) * tmask(:,:,1) )
+            CALL iom_put( "Dpo2" , ( atcox * patm(:,:) - trn(:,:,1,jpoxy) / ( chemc(:,:,2) + rtrn ) ) * tmask(:,:,1) )
+         ELSE
+            trc2d(:,:,jp_pcs0_2d    ) = oce_co2(:,:) / e1e2t(:,:) / rfact 
+            trc2d(:,:,jp_pcs0_2d + 1) = zoflx(:,:) * 1000 * tmask(:,:,1) 
+            trc2d(:,:,jp_pcs0_2d + 2) = zkgco2(:,:) * tmask(:,:,1) 
+            trc2d(:,:,jp_pcs0_2d + 3) = ( satmco2(:,:) * patm(:,:) - zh2co3(:,:) / ( chemc(:,:,1) + rtrn ) ) * tmask(:,:,1) 
+         ENDIF
+      ENDIF
+      !
+      IF( wrk_not_released(2, 11,12,13,14) ) CALL ctl_stop('p4z_flx: failed to release workspace arrays')
       !
    END SUBROUTINE p4z_flx