Changeset 15450 for NEMO/trunk/src/TOP/PISCES/SED/sedstp.F90

Timestamp:

2021-10-27T16:32:08+02:00 (3 years ago)

Author:

cetlod

Message:

Some updates to make the PISCES/SED module usable. Totally orthogonal with no effect on other parts of the code

File:

• NEMO/trunk/src/TOP/PISCES/SED/sedstp.F90 (modified) (5 diffs)

NEMO/trunk/src/TOP/PISCES/SED/sedstp.F90

@@ -8 +8 @@
    USE sedchem  ! chemical constant
    USE sedco3   ! carbonate in sediment pore water
-   USE sedorg   ! Organic reactions and diffusion
-   USE sedinorg ! Inorganic dissolution
-   USE sedbtb   ! bioturbation
+   USE sedsol   ! Organic reactions and diffusion
    USE sedadv   ! vertical advection
-   USE sedmbc   ! mass balance calculation
    USE sedsfc   ! sediment surface data
    USE sedrst   ! restart
    USE sedwri   ! outputs
+   USE sedini
    USE trcdmp_sed
    USE lib_mpp         ! distribued memory computing library
@@ -25 +23 @@
    !! * Routine accessibility
    PUBLIC sed_stp  ! called by step.F90
+
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
 
    !! $Id$
@@ -44 +46 @@
       !!        !  06-04 (C. Ethe)  Re-organization
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt                ! number of iteration
-      INTEGER, INTENT(in) ::   Kbb, Kmm, Krhs    ! time level indices
-      INTEGER :: ji,jk,js,jn,jw
+      INTEGER, INTENT(in) ::   kt       ! number of iteration
+      INTEGER, INTENT(in) ::   Kbb, Kmm, Krhs  ! time level indices
+
+      INTEGER :: ji,jk,js,jn,jw,jkmax,jsmax
       !!----------------------------------------------------------------------
-      IF( ln_timing )      CALL timing_start('sed_stp')
+      IF( ln_timing )           CALL timing_start('sed_stp')
         !
                                 CALL sed_rst_opn  ( kt )       ! Open tracer restart file 
@@ -56 +59 @@
 
       dtsed  = rDt_trc
-!      dtsed2 = dtsed
       IF (kt /= nitsed000) THEN
-         CALL sed_dta( kt, Kbb, Kmm )       ! Load  Data for bot. wat. Chem and fluxes
+         CALL sed_dta( kt, Kbb, Kmm )    ! Load  Data for bot. wat. Chem and fluxes
       ENDIF
 
@@ -66 +68 @@
          ENDIF
 
-         CALL sed_btb( kt )         ! 1st pass of bioturbation at t+1/2
-         CALL sed_org( kt )         ! Organic related reactions and diffusion
-         CALL sed_inorg( kt )       ! Dissolution reaction
-         CALL sed_btb( kt )         ! 2nd pass of bioturbation at t+1
-         tokbot(:,:) = 0.0
-         DO jw = 1, jpwat
-            DO ji = 1, jpoce
-               tokbot(ji,jw) = pwcp(ji,1,jw) * 1.e-3 * dzkbot(ji)
-            END DO
-         ENDDO
+         CALL sed_sol( kt )        ! Solute diffusion and reactions 
          CALL sed_adv( kt )         ! advection
          CALL sed_co3( kt )         ! pH actualization for saving
-         ! This routine is commented out since it does not work at all
-         CALL sed_mbc( kt )         ! cumulation for mass balance calculation
 
-         IF (ln_sed_2way) CALL sed_sfc( kt, Kbb )         ! Give back new bottom wat chem to tracer model
+         IF (ln_sed_2way) CALL sed_sfc( kt, Kbb )   ! Give back new bottom wat chem to tracer model
       ENDIF
       CALL sed_wri( kt )         ! outputs
       IF( kt == nitsed000 ) THEN
           CALL iom_close( numrsr )       ! close input tracer restart file
-          IF(lrxios) CALL iom_context_finalize(      cr_sedrst_cxt  )
-!         IF(lwm) CALL FLUSH( numont )   ! flush namelist output
+!          IF(lwm) CALL FLUSH( numont )   ! flush namelist output
       ENDIF
       IF( lrst_sed )            CALL sed_rst_wri( kt )   ! restart file output
 
-      IF( kt == nitsedend )  CLOSE( numsed )
+      IF( kt == nitsedend )     CLOSE( numsed )
 
-      IF( ln_timing )   CALL timing_stop('sed_stp')
+      IF( ln_timing )           CALL timing_stop('sed_stp')
 
    END SUBROUTINE sed_stp