Changeset 10362 for NEMO/trunk/src/TOP/PISCES/P4Z/p4zsbc.F90

Timestamp:

2018-11-30T16:38:17+01:00 (5 years ago)

Author:

aumont

Message:

Various bug fixes and improvements

File:

• NEMO/trunk/src/TOP/PISCES/P4Z/p4zsbc.F90 (modified) (6 diffs)

NEMO/trunk/src/TOP/PISCES/P4Z/p4zsbc.F90

@@ -31 +31 @@
    REAL(wp), PUBLIC ::   dustsolub    !: Solubility of the dust
    REAL(wp), PUBLIC ::   mfrac        !: Mineral Content of the dust
+   REAL(wp), PUBLIC ::   rdustfep     !: Fraction of dust that is dissolvable
    REAL(wp), PUBLIC ::   icefeinput   !: Iron concentration in sea ice
    REAL(wp), PUBLIC ::   wdust        !: Sinking speed of the dust 
@@ -134 +135 @@
                   DO ji = 1, jpi
                      zcoef = ryyss * e1e2t(ji,jj) * h_rnf(ji,jj) 
-                     rivalk(ji,jj) =   sf_river(jr_dic)%fnow(ji,jj,1)                                    &
+                     rivalk(ji,jj) =   sf_river(jr_dic)%fnow(ji,jj,1)  &
                         &              * 1.E3        / ( 12. * zcoef + rtrn )
-                     rivdic(ji,jj) = ( sf_river(jr_dic)%fnow(ji,jj,1) + sf_river(jr_doc)%fnow(ji,jj,1) ) &
+                     rivdic(ji,jj) =   sf_river(jr_dic)%fnow(ji,jj,1)  &
                         &              * 1.E3         / ( 12. * zcoef + rtrn )
-                     rivdin(ji,jj) = ( sf_river(jr_din)%fnow(ji,jj,1) + sf_river(jr_don)%fnow(ji,jj,1) ) &
+                     rivdin(ji,jj) =   sf_river(jr_din)%fnow(ji,jj,1)  &
                         &              * 1.E3 / rno3 / ( 14. * zcoef + rtrn )
-                     rivdip(ji,jj) = ( sf_river(jr_dip)%fnow(ji,jj,1) + sf_river(jr_dop)%fnow(ji,jj,1) ) &
+                     rivdip(ji,jj) =   sf_river(jr_dip)%fnow(ji,jj,1)  &
                         &              * 1.E3 / po4r / ( 31. * zcoef + rtrn )
-                     rivdsi(ji,jj) =   sf_river(jr_dsi)%fnow(ji,jj,1)                                    &
+                     rivdsi(ji,jj) =   sf_river(jr_dsi)%fnow(ji,jj,1)  &
                         &              * 1.E3        / ( 28.1 * zcoef + rtrn )
+                     rivdoc(ji,jj) =   sf_river(jr_doc)%fnow(ji,jj,1)  &
+                        &              * 1.E3        / ( 12. * zcoef + rtrn ) 
                   END DO
                END DO
@@ -158 +161 @@
                      rivdip(ji,jj) = ( sf_river(jr_dip)%fnow(ji,jj,1) ) &
                         &              * 1.E3 / po4r / ( 31. * zcoef + rtrn ) * tmask(ji,jj,1)
-                     rivdoc(ji,jj) = ( sf_river(jr_doc)%fnow(ji,jj,1) ) &
-                        &              * 1.E3 / ( 12. * zcoef + rtrn ) * tmask(ji,jj,1)
                      rivdon(ji,jj) = ( sf_river(jr_don)%fnow(ji,jj,1) ) &
                         &              * 1.E3 / rno3 / ( 14. * zcoef + rtrn ) * tmask(ji,jj,1)
                      rivdop(ji,jj) = ( sf_river(jr_dop)%fnow(ji,jj,1) ) &
                         &              * 1.E3 / po4r / ( 31. * zcoef + rtrn ) * tmask(ji,jj,1)
+                     rivdsi(ji,jj) =   sf_river(jr_dsi)%fnow(ji,jj,1)  &
+                        &              * 1.E3        / ( 28.1 * zcoef + rtrn )
+                     rivdoc(ji,jj) =   sf_river(jr_doc)%fnow(ji,jj,1)  &
+                        &              * 1.E3        / ( 12. * zcoef + rtrn )
                   END DO
                END DO
@@ -223 +228 @@
         &                ln_dust, ln_solub, ln_river, ln_ndepo, ln_ironsed, ln_ironice, ln_hydrofe,    &
         &                sedfeinput, distcoast, dustsolub, icefeinput, wdust, mfrac, nitrfix, diazolight, concfediaz, &
-        &                hratio, fep_rats, fep_rath, lgw_rath
+        &                hratio, fep_rats, fep_rath, rdustfep, lgw_rath
       !!----------------------------------------------------------------------
       !
@@ -262 +267 @@
             WRITE(numout,*) '      Fep/Fer ratio from sed sources            fep_rats   = ', fep_rats
             WRITE(numout,*) '      Fep/Fer ratio from sed hydro sources      fep_rath   = ', fep_rath
+            WRITE(numout,*) '      Fraction of dust that is dissolvable      rdustfep   = ', rdustfep
             WRITE(numout,*) '      Weak ligand ratio from sed hydro sources  lgw_rath   = ', lgw_rath
          ENDIF
@@ -343 +349 @@
          slf_river(jr_dsi) = sn_riverdsi  
          !
-         ALLOCATE( rivdic(jpi,jpj), rivalk(jpi,jpj), rivdin(jpi,jpj), rivdip(jpi,jpj), rivdsi(jpi,jpj) ) 
-         IF( ln_p5z )  ALLOCATE( rivdon(jpi,jpj), rivdop(jpi,jpj), rivdoc(jpi,jpj) )
+         ALLOCATE( rivdic(jpi,jpj), rivalk(jpi,jpj), rivdin(jpi,jpj), rivdip(jpi,jpj), rivdsi(jpi,jpj), rivdoc(jpi,jpj) ) 
+         IF( ln_p5z )  ALLOCATE( rivdon(jpi,jpj), rivdop(jpi,jpj) )
          !
          ALLOCATE( sf_river(jpriv), rivinput(jpriv), STAT=ierr1 )    !* allocate and fill sf_river (forcing structure) with sn_river_