Changeset 12065 for NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/TOP/PISCES/P4Z/p4zsbc.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/p4zsbc.F90 (modified) (5 diffs)

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

@@ -27 +27 @@
    LOGICAL , PUBLIC ::   ln_ironsed   !: boolean for Fe input from sediments
    LOGICAL , PUBLIC ::   ln_hydrofe   !: boolean for Fe input from hydrothermal vents
-   LOGICAL , PUBLIC ::   ln_ironice   !: boolean for Fe input from sea ice
    REAL(wp), PUBLIC ::   sedfeinput   !: Coastal release of Iron
    REAL(wp), PUBLIC ::   dustsolub    !: Solubility of the dust
@@ -109 +108 @@
          IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_dust > 1 ) ) THEN
             CALL fld_read( kt, 1, sf_dust )
-            IF( nn_ice_tr == -1 .AND. .NOT.ln_ironice ) THEN   ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) )
-            ELSE                                               ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) * ( 1.-fr_i(:,:) ) )
-            ENDIF
+            dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) * ( 1.0 - fr_i(:,:) )
          ENDIF
       ENDIF
@@ -175 +172 @@
       IF( ln_ndepo ) THEN
          IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_ndep > 1 ) ) THEN
-             zcoef = rno3 * 14E6 * ryyss
+             zcoef = 14. * rno3
              CALL fld_read( kt, 1, sf_ndepo )
              nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t_n(:,:,1) )
          ENDIF
          IF( .NOT.ln_linssh ) THEN
-           zcoef = rno3 * 14E6 * ryyss
-           nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t_n(:,:,1) )
+            zcoef = 14. * rno3
+            nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t_n(:,:,1) )
          ENDIF
       ENDIF
@@ -235 +232 @@
       REWIND( numnatp_ref )              ! Namelist nampissbc in reference namelist : Pisces external sources of nutrients
       READ  ( numnatp_ref, nampissbc, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampissbc in reference namelist', lwp )
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampissbc in reference namelist' )
       REWIND( numnatp_cfg )              ! Namelist nampissbc in configuration namelist : Pisces external sources of nutrients
       READ  ( numnatp_cfg, nampissbc, IOSTAT = ios, ERR = 902 )
-902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampissbc in configuration namelist', lwp )
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampissbc in configuration namelist' )
       IF(lwm) WRITE ( numonp, nampissbc )
 
@@ -265 +262 @@
       END IF
 
-      IF( nn_ice_tr >= 0 .AND. ln_ironice ) THEN
-         IF(lwp) THEN
-            WRITE(numout,*) '   ==>>>   ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr
-            WRITE(numout,*) '           Specify your sea ice iron concentration in nampisice instead '
-            WRITE(numout,*) '           ln_ironice is forced to .FALSE. '
-         ENDIF
-         ln_ironice = .FALSE.
-      ENDIF
-
       IF( ln_dust .OR. ln_river .OR. ln_ndepo ) THEN   ;   ll_sbc = .TRUE.
       ELSE                                             ;   ll_sbc = .FALSE.