Changeset 3448

Timestamp:

2012-08-10T15:18:09+02:00 (12 years ago)

Author:

cetlod

Message:

ranch:2012/dev_r3438_LOCEAN15_PISLOB : minor bug corrections, see ticket #972

File:

• branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90 (modified) (4 diffs)

branches/2012/dev_r3438_LOCEAN15_PISLOB/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90

@@ -85 +85 @@
       !
       ! Allocate temporary workspace
-                                          CALL wrk_alloc( jpi, jpj, jpk, zFe3, zTL1, ztotlig )
-      IF( ln_diatrc .AND. lk_iomput )     CALL wrk_alloc( jpi, jpj, jpk, zFeL1 )
-      !
-      IF( ln_fechem ) THEN
-                                          CALL wrk_alloc( jpi, jpj, jpk, zTL2, zFeP )
-         IF( ln_diatrc .AND. lk_iomput )  CALL wrk_alloc( jpi, jpj, jpk, zFe2, zFeL2 )
-      ENDIF
+                       CALL wrk_alloc( jpi, jpj, jpk, zFe3, zFeL1, zTL1, ztotlig )
+      IF( ln_fechem )  CALL wrk_alloc( jpi, jpj, jpk, zFe2, zFeL2, zTL2, zFeP )
       ! Total ligand concentration : Ligands can be chosen to be constant or variable
       ! Parameterization from Tagliabue and Voelker (2011)
@@ -179 +174 @@
                   zFe3(ji,jj,jk) = MAX( 0., zxs ) 
                   zFep(ji,jj,jk) = MAX( 0., ( ks * zFe3(ji,jj,jk) / kpr ) )
-                  IF( ln_diatrc .AND. lk_iomput ) THEN
-                     zkappa2 = ( kb2 + zkph2 ) / kl2
-                     zFeL2(ji,jj,jk) = MAX( 0., ( zFe3(ji,jj,jk) * zTL2(ji,jj,jk) ) / ( zkappa2 + zFe3(ji,jj,jk) ) )
-                     zFeL1(ji,jj,jk) = MAX( 0., ( ztfe / zb - za / zb * zFe3(ji,jj,jk) - zc / zb * zFeL2(ji,jj,jk) ) )
-                     zFe2 (ji,jj,jk) = MAX( 0., ( ( zkph1 * zFeL1(ji,jj,jk) + zkph2 * zFeL2(ji,jj,jk) ) / zkox ) )
-                  ENDIF 
+                  zkappa2 = ( kb2 + zkph2 ) / kl2
+                  zFeL2(ji,jj,jk) = MAX( 0., ( zFe3(ji,jj,jk) * zTL2(ji,jj,jk) ) / ( zkappa2 + zFe3(ji,jj,jk) ) )
+                  zFeL1(ji,jj,jk) = MAX( 0., ( ztfe / zb - za / zb * zFe3(ji,jj,jk) - zc / zb * zFeL2(ji,jj,jk) ) )
+                  zFe2 (ji,jj,jk) = MAX( 0., ( ( zkph1 * zFeL1(ji,jj,jk) + zkph2 * zFeL2(ji,jj,jk) ) / zkox ) )
                END DO
             END DO
@@ -202 +195 @@
                   ztfe           = trn(ji,jj,jk,jpfer) 
                   ! Fe' is the root of a 2nd order polynom
-                  zFe3(ji,jj,jk) = ( -( 1. + zfesatur * zkeq - zkeq * ztfe )               &
+                  zFe3 (ji,jj,jk) = ( -( 1. + zfesatur * zkeq - zkeq * ztfe )               &
                      &             + SQRT( ( 1. + zfesatur * zkeq - zkeq * ztfe )**2       &
                      &               + 4. * ztfe * zkeq) ) / ( 2. * zkeq )
-                  zFe3(ji,jj,jk) = zFe3(ji,jj,jk) * 1E9
+                  zFe3 (ji,jj,jk) = zFe3(ji,jj,jk) * 1E9
+                  zFeL1(ji,jj,jk) = MAX( 0., trn(ji,jj,jk,jpfer) * 1E9 - zFe3(ji,jj,jk) )
               END DO
             END DO
          END DO
-         IF( ln_diatrc .AND. lk_iomput )   &
-            &  zFeL1(:,:,1:jpkm1) = MAX( 0., trn(:,:,1:jpkm1,jpfer) * 1E9 - zFe3(:,:,1:jpkm1) )
          !
       ENDIF
@@ -328 +320 @@
       ENDIF
       !
-                                         CALL wrk_dealloc( jpi, jpj, jpk, zFe3, zTL1, ztotlig )
-      IF( ln_diatrc .AND. lk_iomput )    CALL wrk_dealloc( jpi, jpj, jpk, zFeL1 )
-      IF( ln_fechem ) THEN
-                                         CALL wrk_dealloc( jpi, jpj, jpk, zTL2, zFeP )
-         IF( ln_diatrc .AND. lk_iomput ) CALL wrk_dealloc( jpi, jpj, jpk, zFe2, zFeL2 )
-      ENDIF
+                       CALL wrk_dealloc( jpi, jpj, jpk, zFe3, zFeL1, zTL1, ztotlig )
+      IF( ln_fechem )  CALL wrk_dealloc( jpi, jpj, jpk, zFe2, zFeL2, zTL2, zFeP )
       !
       IF( nn_timing == 1 )  CALL timing_stop('p4z_fechem')