Changeset 44 for vendor/nemo/current/NEMOGCM/NEMO/TOP_SRC/PISCES

Timestamp:

08/31/12 15:41:37 (12 years ago)

Author:

cholod

Message:

Load NEMO_TMP into vendor/nemo/current.

Location:

vendor/nemo/current/NEMOGCM/NEMO/TOP_SRC/PISCES

Files:

• p4zlys.F90 (modified) (2 diffs)
• p4zsink.F90 (modified) (2 diffs)
• trcsms_pisces.F90 (modified) (6 diffs)

vendor/nemo/current/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zlys.F90

@@ -42 +42 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id: p4zlys.F90 3295 2012-01-30 15:49:07Z cetlod $ 
+   !! $Id: p4zlys.F90 3321 2012-03-05 17:10:55Z cetlod $ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -150 +150 @@
          IF( lk_iomput ) THEN
             zrfact2 = 1.e3 * rfact2r
-            CALL iom_put( "PH"    , hi      (:,:,:)                  * tmask(:,:,:) )
-            CALL iom_put( "CO3"   , zco3    (:,:,:) * 1e+3           * tmask(:,:,:) )
-            CALL iom_put( "CO3sat", aksp    (:,:,:) * 1e+3 / calcon  * tmask(:,:,:) )
-            CALL iom_put( "DCAL"  , zcaldiss(:,:,:) * zrfact2 * tmask(:,:,:) )
+            CALL iom_put( "PH"    , -1. * LOG10( hi(:,:,:) )                * tmask(:,:,:) )
+            CALL iom_put( "CO3"   ,        zco3    (:,:,:) * 1e+3           * tmask(:,:,:) )
+            CALL iom_put( "CO3sat",        aksp    (:,:,:) * 1e+3 / calcon  * tmask(:,:,:) )
+            CALL iom_put( "DCAL"  ,        zcaldiss(:,:,:) * zrfact2        * tmask(:,:,:) )
          ELSE
-            trc3d(:,:,:,jp_pcs0_3d    ) = hi  (:,:,:)          * tmask(:,:,:)
-            trc3d(:,:,:,jp_pcs0_3d + 1) = zco3(:,:,:)          * tmask(:,:,:)
-            trc3d(:,:,:,jp_pcs0_3d + 2) = aksp(:,:,:) / calcon * tmask(:,:,:)
+            trc3d(:,:,:,jp_pcs0_3d    ) = -1. * LOG10( hi(:,:,:) ) * tmask(:,:,:)
+            trc3d(:,:,:,jp_pcs0_3d + 1) = zco3(:,:,:)              * tmask(:,:,:)
+            trc3d(:,:,:,jp_pcs0_3d + 2) = aksp(:,:,:) / calcon     * tmask(:,:,:)
          ENDIF
          !

vendor/nemo/current/NEMOGCM/NEMO/TOP_SRC/PISCES/p4zsink.F90

@@ -65 +65 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id: p4zsink.F90 3295 2012-01-30 15:49:07Z cetlod $ 
+   !! $Id: p4zsink.F90 3404 2012-06-02 11:52:06Z cetlod $ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -295 +295 @@
       ENDIF
       !
-      CALL wrk_alloc( jpi, jpj, jpk, znum3d )
+      CALL wrk_dealloc( jpi, jpj, jpk, znum3d )
       !
       IF( nn_timing == 1 )  CALL timing_stop('p4z_sink')

vendor/nemo/current/NEMOGCM/NEMO/TOP_SRC/PISCES/trcsms_pisces.F90

@@ -40 +40 @@
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3 , NEMO Consortium (2010)
-   !! $Id: trcsms_pisces.F90 3295 2012-01-30 15:49:07Z cetlod $ 
+   !! $Id: trcsms_pisces.F90 3320 2012-03-05 16:37:52Z cetlod $ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -60 +60 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      INTEGER ::   jnt, jn
+      INTEGER ::   jnt, jn, jl
       CHARACTER (len=25) :: charout
+      REAL(wp), POINTER, DIMENSION(:,:,:,:)  :: ztrdpis
       !!---------------------------------------------------------------------
       !
@@ -68 +69 @@
       IF( ln_pisdmp .AND. MOD( kt - nn_dttrc, nn_pisdmp ) == 0 )   CALL trc_sms_pisces_dmp( kt )  ! Relaxation of some tracers
                                                                    CALL trc_sms_pisces_mass_conserv( kt ) ! Mass conservation checking
+      IF( l_trdtrc )  THEN
+         CALL wrk_alloc( jpi, jpj, jpk, jp_pisces, ztrdpis ) 
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+            ztrdpis(:,:,:,jn) = trn(:,:,:,jl)
+         ENDDO
+      ENDIF
 
       IF( ndayflxtr /= nday_year ) THEN      ! New days
@@ -82 +90 @@
       ENDIF
 
+
       DO jnt = 1, nrdttrc          ! Potential time splitting if requested
          !
@@ -87 +96 @@
          CALL p4z_sed (kt, jnt)    ! compute soft tissue remineralisation
          !
-         trb(:,:,:,:) = trn(:,:,:,:)
+         DO jn = jp_pcs0, jp_pcs1
+            trb(:,:,:,jn) = trn(:,:,:,jn)
+         ENDDO
          !
       END DO
+
+      IF( l_trdtrc )  THEN
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+            ztrdpis(:,:,:,jn) = ( ztrdpis(:,:,:,jn) - trn(:,:,:,jl) ) * rfact2r
+         ENDDO
+      ENDIF
 
       CALL p4z_lys( kt )             ! Compute CaCO3 saturation
@@ -101 +119 @@
 
       IF( l_trdtrc ) THEN
-          DO jn = jp_pcs0, jp_pcs1
-            CALL trd_mod_trc( tra(:,:,:,jn), jn, jptra_trd_sms, kt )   ! save trends
+         DO jn = 1, jp_pisces
+            jl = jn + jp_pcs0 - 1
+             ztrdpis(:,:,:,jn) = ztrdpis(:,:,:,jn) + tra(:,:,:,jl)
+             CALL trd_mod_trc( ztrdpis(:,:,:,jn), jn, jptra_trd_sms, kt )   ! save trends
           END DO
+          CALL wrk_dealloc( jpi, jpj, jpk, jp_pisces, ztrdpis ) 
       END IF