Changeset 12065 for NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/TOP/PISCES/P4Z/p4zpoc.F90

Timestamp:

2019-12-05T12:06:36+01:00 (4 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@12055 (ticket #2194)}

File:

• NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/TOP/PISCES/P4Z/p4zpoc.F90 (modified) (4 diffs)

NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/TOP/PISCES/P4Z/p4zpoc.F90

@@ -102 +102 @@
      ! particle scheme. Does not work with Kriest parameterization.
      ! -----------------------------------------------------------------------
+     ztremint(:,:,:) = zremigoc(:,:,:)
      DO jk = 2, jpkm1
         DO jj = 1, jpj
@@ -166 +167 @@
                        &   + zsizek1 ) ) * zpoc + ( prodgoc(ji,jj,jk-1) / tgfunc(ji,jj,jk-1) * ( 1.           &
                        &   - exp( -reminp(jn) * zsizek1 ) ) * exp( -reminp(jn) * zsizek ) + prodgoc(ji,jj,jk) &
-                       &   / tgfunc(ji,jj,jk) * ( 1. - exp( -reminp(jn) * zsizek ) ) ) * rday / rfact2 / reminp(jn) 
+                       &   / tgfunc(ji,jj,jk) * ( 1. - exp( -reminp(jn) * zsizek ) ) ) * rday / rfact2 / reminp(jn) * alphan(jn) 
                        alphat = alphat + alphag(ji,jj,jk,jn)
                        remint = remint + alphag(ji,jj,jk,jn) * reminp(jn)
@@ -285 +286 @@
      ! layer, this spectrum is supposed to be uniform.
      ! ---------------------------------------------------------------------
+     ztremint(:,:,:) = zremipoc(:,:,:)
      DO jk = 1, jpkm1
         DO jj = 1, jpj
@@ -497 +499 @@
       REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization
       READ  ( numnatp_ref, nampispoc, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampispoc in reference namelist', lwp )
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampispoc in reference namelist' )
       REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization
       READ  ( numnatp_cfg, nampispoc, IOSTAT = ios, ERR = 902 )
-902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampispoc in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampispoc in configuration namelist' )
       IF(lwm) WRITE( numonp, nampispoc )