Changeset 9863 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/PISCES/P4Z/p4zsms.F90

Timestamp:

2018-06-30T12:51:02+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): simplified implementation of the Euler stepping at nit000

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/PISCES/P4Z/p4zsms.F90 (modified) (5 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/PISCES/P4Z/p4zsms.F90

@@ -4 +4 @@
    !! TOP :   PISCES Source Minus Sink manager
    !!======================================================================
-   !! History :   1.0  !  2004-03 (O. Aumont) Original code
-   !!             2.0  !  2007-12  (C. Ethe, G. Madec)  F90
+   !! History :  1.0  !  2004-03 (O. Aumont) Original code
+   !!            2.0  !  2007-12  (C. Ethe, G. Madec)  F90
    !!----------------------------------------------------------------------
-   !!   p4z_sms        : Time loop of passive tracers sms
+
    !!----------------------------------------------------------------------
-   USE oce_trc         ! shared variables between ocean and passive tracers
-   USE trc             ! passive tracers common variables 
-   USE trcdta          ! 
-   USE sms_pisces      ! PISCES Source Minus Sink variables
-   USE p4zbio          ! Biological model
-   USE p4zche          ! Chemical model
-   USE p4zlys          ! Calcite saturation
-   USE p4zflx          ! Gas exchange
-   USE p4zsbc          ! External source of nutrients
-   USE p4zsed          ! Sedimentation
-   USE p4zint          ! time interpolation
-   USE p4zrem          ! remineralisation
-   USE iom             ! I/O manager
-   USE trd_oce         ! Ocean trends variables
-   USE trdtrc          ! TOP trends variables
-   USE sedmodel        ! Sediment model
-   USE prtctl_trc      ! print control for debugging
+   !!   p4z_sms       : Time loop of passive tracers sms
+   !!   p4z_sms_init  : initialisation
+   !!   p4z_rst       : Read or write variables in restart file
+   !!   p4z_dmp       : Relaxation of some tracers
+   !!   p4z_chk_mass  : mass conservation check
+   !!----------------------------------------------------------------------
+   USE oce_trc        ! shared variables between ocean and passive tracers
+   USE trc            ! passive tracers common variables 
+   USE trcdta         ! 
+   USE sms_pisces     ! PISCES Source Minus Sink variables
+   USE p4zbio         ! Biological model
+   USE p4zche         ! Chemical model
+   USE p4zlys         ! Calcite saturation
+   USE p4zflx         ! Gas exchange
+   USE p4zsbc         ! External source of nutrients
+   USE p4zsed         ! Sedimentation
+   USE p4zint         ! time interpolation
+   USE p4zrem         ! remineralisation
+   USE trd_oce        ! Ocean trends variables
+   USE trdtrc         ! TOP trends variables
+   USE sedmodel       ! Sediment model
+   !
+   USE iom            ! I/O manager
+   USE prtctl_trc     ! print control for debugging
 
    IMPLICIT NONE
@@ -37 +44 @@
    REAL(wp) ::   xfact1, xfact2, xfact3
 
-   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   xnegtr     ! Array used to indicate negative tracer values
+   REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   xnegtr   ! Array used to indicate negative tracer values
 
    !!----------------------------------------------------------------------
@@ -95 +102 @@
       ENDIF
 
-      IF( ( neuler == 0 .AND. kt == nittrc000 ) .OR. ln_top_euler ) THEN
+      IF( l_1st_euler .OR. ln_top_euler ) THEN
          DO jn = jp_pcs0, jp_pcs1              !   SMS on tracer without Asselin time-filter
             trb(:,:,:,jn) = trn(:,:,:,jn)
@@ -277 +284 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) ' p4z_rst : Read specific variables from pisces model '
-         IF(lwp) WRITE(numout,*) ' ~~~~~~~~~~~~~~'
+         IF(lwp) WRITE(numout,*) ' ~~~~~~~'
          ! 
          IF( iom_varid( numrtr, 'PH', ldstop = .FALSE. ) > 0 ) THEN
@@ -407 +414 @@
       !!
       !!---------------------------------------------------------------------
-      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
+      INTEGER, INTENT( in ) ::   kt      ! ocean time-step index
+      !
       REAL(wp)             ::  zrdenittot, zsdenittot, znitrpottot
       CHARACTER(LEN=100)   ::   cltxt
-      INTEGER :: jk
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwork
+      INTEGER ::   jk
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zwork
       !!----------------------------------------------------------------------
       !