Changeset 14276 for NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/SED/sedwri.F90

Timestamp:

2021-01-07T23:09:56+01:00 (3 years ago)

Author:

aumont

Message:

numerous updates to PISCES, PISCES-QUOTA and the sediment module

File:

• NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/SED/sedwri.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r11708_aumont_PISCES_QUOTA/src/TOP/PISCES/SED/sedwri.F90

@@ -53 +53 @@
       IF (lwp) WRITE(numsed,*) ' '
       
-      ALLOCATE( zdta(jpoce,jpksed) )    ;   ALLOCATE( zflx(jpoce,jpwatp1) )
+      ALLOCATE( zdta(jpoce,jpksed) )    ;   ALLOCATE( zflx(jpoce,jptrased+1) )
 
       ! Initialize variables
@@ -87 +87 @@
       CALL unpack_arr( jpoce, flxsedi3d(1:jpi,1:jpj,1:jpksed,2)  , iarroce(1:jpoce), &
          &                   co3por(1:jpoce,1:jpksed)  )
+
+      CALL unpack_arr( jpoce, flxsedi3d(1:jpi,1:jpj,1:jpksed,3)  , iarroce(1:jpoce), &
+         &                   sedligand(1:jpoce,1:jpksed)  )
       
 !      flxsedi3d = 0.
@@ -94 +97 @@
          DO ji = 1, jpoce
             zflx(ji,jw) = ( pwcp(ji,1,jw) - pwcp_dta(ji,jw) ) &
-               &         * 1.e3 / 1.e2 * dzkbot(ji) / r2dttrc
+               &         * 1.e3 / ( 1.e2 * dzkbot(ji) ) / 1.E4 / r2dttrc
+         ENDDO
+      ENDDO
+
+      ! Calculation of fluxes g/cm2/s
+      DO js = 1, jpsol
+         zrate =  1.0 / ( por1(jpksed) ) / r2dttrc
+         DO ji = 1, jpoce
+            zflx(ji,jpwat+js) = zflx(ji,jpwat+js) + ( tosed(ji,js) - fromsed(ji,js) ) * zrate
          ENDDO
       ENDDO
@@ -100 +111 @@
       ! Calculation of accumulation rate per dt
       DO js = 1, jpsol
-         zrate =  1.0 / ( denssol * por1(jpksed) ) / r2dttrc
+         zrate =  1.0 / ( por1(jpksed) ) / r2dttrc
          DO ji = 1, jpoce
-            zflx(ji,jpwatp1) = zflx(ji,jpwatp1) + ( tosed(ji,js) - fromsed(ji,js) ) * zrate
+            zflx(ji,jptrased+1) = zflx(ji,jptrased+1) + ( tosed(ji,js) - fromsed(ji,js) ) * zrate
          ENDDO
       ENDDO
@@ -109 +120 @@
          CALL unpack_arr( jpoce, flxsedi2d(1:jpi,1:jpj,jn), iarroce(1:jpoce), zflx(1:jpoce,jn)  )
       END DO
+
       zflx(:,1) = dzdep(:) / dtsed
       CALL unpack_arr( jpoce, flxsedi2d(1:jpi,1:jpj,jpdia2dsed), iarroce(1:jpoce), zflx(1:jpoce,1) )
 
-       ! Start writing data
-       ! ---------------------
-       DO jn = 1, jptrased
-          cltra = sedtrcd(jn) ! short title for 3D diagnostic
-          CALL iom_put( cltra, trcsedi(:,:,:,jn) )
-       END DO
+      ! Start writing data
+      ! ---------------------
+      DO jn = 1, jptrased
+         cltra = sedtrcd(jn) ! short title for 3D diagnostic
+         CALL iom_put( cltra, trcsedi(:,:,:,jn) )
+      END DO
 
-       DO jn = 1, jpdia3dsed
-          cltra = seddia3d(jn) ! short title for 3D diagnostic
-          CALL iom_put( cltra, flxsedi3d(:,:,:,jn) )
-       END DO
+      DO jn = 1, jpdia3dsed
+         cltra = seddia3d(jn) ! short title for 3D diagnostic
+         CALL iom_put( cltra, flxsedi3d(:,:,:,jn) )
+      END DO
 
-       DO jn = 1, jpdia2dsed
-          cltra = seddia2d(jn) ! short title for 2D diagnostic
-          CALL iom_put( cltra, flxsedi2d(:,:,jn) )
-       END DO
+      DO jn = 1, jpdia2dsed
+         cltra = seddia2d(jn) ! short title for 2D diagnostic
+         CALL iom_put( cltra, flxsedi2d(:,:,jn) )
+      END DO