Changeset 4617 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90

Timestamp:

2014-04-06T17:47:31+02:00 (10 years ago)

Author:

gm

Message:

#1260 : TOP fixes, see the associated wiki page for explanation

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90 (modified) (18 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90

@@ -15 +15 @@
    USE oce_trc         !  shared variables between ocean and passive tracers
    USE trc             !  passive tracers common variables 
-   USE trcdta
+   USE trcdta          !
    USE sms_pisces      !  PISCES Source Minus Sink variables
    USE p4zbio          !  Biological model
@@ -24 +24 @@
    USE p4zsed          !  Sedimentation
    USE p4zint          !  time interpolation
-   USE iom             !  I/O manager
    USE trdmod_oce      !  Ocean trends variables
    USE trdmod_trc      !  TOP trends variables
    USE sedmodel        !  Sediment model
+   !
    USE prtctl_trc      !  print control for debugging
+   USE iom             !  I/O manager
 
    IMPLICIT NONE
@@ -34 +35 @@
 
    PUBLIC   p4z_sms_init    ! called in p4zsms.F90
-   PUBLIC   p4z_sms    ! called in p4zsms.F90
+   PUBLIC   p4z_sms         ! called in p4zsms.F90
 
    REAL(wp) :: alkbudget, no3budget, silbudget, ferbudget
@@ -58 +59 @@
       !!              - ...
       !!---------------------------------------------------------------------
-      !
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
@@ -73 +73 @@
             jl = jn + jp_pcs0 - 1
             ztrdpis(:,:,:,jn) = trn(:,:,:,jl)
-         ENDDO
+         END DO
       ENDIF
       !
@@ -91 +91 @@
          !
          ndayflxtr = nday_year
-
+         !
          IF(lwp) write(numout,*)
          IF(lwp) write(numout,*) ' New chemical constants and various rates for biogeochemistry at new day : ', nday_year
          IF(lwp) write(numout,*) '~~~~~~'
-
+         !
          CALL p4z_che              ! computation of chemical constants
          CALL p4z_int( kt )        ! computation of various rates for biogeochemistry
          !
       ENDIF
-
-      IF( ll_sbc ) CALL p4z_sbc( kt )   ! external sources of nutrients 
-
+      IF( ll_sbc )   CALL p4z_sbc( kt )   ! external sources of nutrients 
+      !
       DO jnt = 1, nrdttrc          ! Potential time splitting if requested
          !
@@ -110 +109 @@
          DO jn = jp_pcs0, jp_pcs1
             trb(:,:,:,jn) = trn(:,:,:,jn)
-         ENDDO
+         END DO
          !
       END DO
@@ -118 +117 @@
             jl = jn + jp_pcs0 - 1
             ztrdpis(:,:,:,jn) = ( ztrdpis(:,:,:,jn) - trn(:,:,:,jl) ) * rfact2r
-         ENDDO
+         END DO
       ENDIF
 
@@ -152 +151 @@
       !
       CALL p4z_chk_mass( kt ) ! Mass conservation checking
-
-      IF ( kt == nittrc000 ) CALL FLUSH    ( numonp )     ! flush output namelist PISCES
-      IF( nn_timing == 1 )  CALL timing_stop('p4z_sms')
-      !
+      !
+      IF( kt == nittrc000 )   CALL FLUSH    ( numonp )     ! flush output namelist PISCES
+      IF( nn_timing == 1  )   CALL timing_stop('p4z_sms')
       !
    END SUBROUTINE p4z_sms
+
 
    SUBROUTINE p4z_sms_init
@@ -260 +259 @@
          WRITE(numout,*) '    Flag to check mass conservation of NO3/Si/TALK ln_check_mass = ', ln_check_mass
       ENDIF
-
+      !
    END SUBROUTINE p4z_sms_init
+
 
    SUBROUTINE p4z_ph_ini
@@ -291 +291 @@
    END SUBROUTINE p4z_ph_ini
 
+
    SUBROUTINE p4z_rst( kt, cdrw )
       !!---------------------------------------------------------------------
@@ -341 +342 @@
    END SUBROUTINE p4z_rst
 
+
    SUBROUTINE p4z_dmp( kt )
       !!----------------------------------------------------------------------
@@ -347 +349 @@
       !! ** purpose  : Relaxation of some tracers
       !!----------------------------------------------------------------------
-      !
-      INTEGER, INTENT( in )  ::     kt ! time step
+      INTEGER, INTENT(in) ::   kt   ! time step
       !
       REAL(wp) ::  alkmean = 2426.     ! mean value of alkalinity ( Glodap ; for Goyet 2391. )
@@ -357 +358 @@
       REAL(wp) :: zarea, zalksum, zpo4sum, zno3sum, zsilsum
       !!---------------------------------------------------------------------
-
 
       IF(lwp)  WRITE(numout,*)
@@ -386 +386 @@
          !
       ENDIF
-
+      !
    END SUBROUTINE p4z_dmp
 
@@ -397 +397 @@
       !!
       !!---------------------------------------------------------------------
-      !
-      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
-      !!
-      !!---------------------------------------------------------------------
-
+      INTEGER, INTENT(in) ::   kt   ! ocean time-step index      
+      !!---------------------------------------------------------------------
+      !
       IF( kt == nittrc000 ) THEN 
          IF( ln_check_mass .AND. lwp) THEN      !   Open budget file of NO3, ALK, Si, Fer
@@ -434 +432 @@
             &                    + trn(:,:,:,jpzoo) * ferat3            &
             &                    + trn(:,:,:,jpmes) * ferat3            ) * cvol(:,:,:)  )
-
-         !
+            !
          t_atm_co2_flx  = t_atm_co2_flx / glob_sum( e1e2t(:,:) )
          t_oce_co2_flx  = t_oce_co2_flx         * 12. / 1.e15 * (-1 )
@@ -452 +449 @@
          !
       ENDIF
-       !
- 9000  FORMAT(i8,f10.5,e18.10,f10.5,f10.5)
- 9500  FORMAT(i8,4e18.10)     
-       !
+      !
+ 9000 FORMAT(i8,f10.5,e18.10,f10.5,f10.5)
+ 9500 FORMAT(i8,4e18.10)     
+      !
    END SUBROUTINE p4z_chk_mass