New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11822 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z – NEMO

Ignore:
Timestamp:
2019-10-29T11:41:36+01:00 (5 years ago)
Author:
acc
Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Sette tested updates to branch to align with trunk changes between 10721 and 11740. Sette tests are passing but results differ from branch before these changes (except for GYRE_PISCES and VORTEX) and branch results already differed from trunk because of algorithmic fixes. Will need more checks to confirm correctness.

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zfechem.F90

    r10975 r11822  
    257257      REWIND( numnatp_ref )            ! Namelist nampisfer in reference namelist : Pisces iron chemistry 
    258258      READ  ( numnatp_ref, nampisfer, IOSTAT = ios, ERR = 901) 
    259 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisfer in reference namelist', lwp ) 
     259901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisfer in reference namelist' ) 
    260260      REWIND( numnatp_cfg )            ! Namelist nampisfer in configuration namelist : Pisces iron chemistry 
    261261      READ  ( numnatp_cfg, nampisfer, IOSTAT = ios, ERR = 902 ) 
    262 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisfer in configuration namelist', lwp ) 
     262902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisfer in configuration namelist' ) 
    263263      IF(lwm) WRITE( numonp, nampisfer ) 
    264264 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zflx.F90

    r10975 r11822  
    242242      REWIND( numnatp_ref )              ! Namelist nampisext in reference namelist : Pisces atm. conditions 
    243243      READ  ( numnatp_ref, nampisext, IOSTAT = ios, ERR = 901) 
    244 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisext in reference namelist', lwp ) 
     244901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisext in reference namelist' ) 
    245245      REWIND( numnatp_cfg )              ! Namelist nampisext in configuration namelist : Pisces atm. conditions 
    246246      READ  ( numnatp_cfg, nampisext, IOSTAT = ios, ERR = 902 ) 
    247 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisext in configuration namelist', lwp ) 
     247902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisext in configuration namelist' ) 
    248248      IF(lwm) WRITE ( numonp, nampisext ) 
    249249      ! 
    … …  
    323323         REWIND( numnatp_ref )              ! Namelist nampisatm in reference namelist : Pisces atm. sea level pressure file 
    324324         READ  ( numnatp_ref, nampisatm, IOSTAT = ios, ERR = 901) 
    325 901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisatm in reference namelist', lwp ) 
     325901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisatm in reference namelist' ) 
    326326         REWIND( numnatp_cfg )              ! Namelist nampisatm in configuration namelist : Pisces atm. sea level pressure file  
    327327         READ  ( numnatp_cfg, nampisatm, IOSTAT = ios, ERR = 902 ) 
    328 902      IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisatm in configuration namelist', lwp ) 
     328902      IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisatm in configuration namelist' ) 
    329329         IF(lwm) WRITE ( numonp, nampisatm ) 
    330330         ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zligand.F90

    r10975 r11822  
    128128      REWIND( numnatp_ref )              ! Namelist nampislig in reference namelist : Pisces remineralization 
    129129      READ  ( numnatp_ref, nampislig, IOSTAT = ios, ERR = 901) 
    130 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampislig in reference namelist', lwp ) 
     130901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampislig in reference namelist' ) 
    131131      REWIND( numnatp_cfg )              ! Namelist nampislig in configuration namelist : Pisces remineralization 
    132132      READ  ( numnatp_cfg, nampislig, IOSTAT = ios, ERR = 902 ) 
    133 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampislig in configuration namelist', lwp ) 
     133902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampislig in configuration namelist' ) 
    134134      IF(lwm) WRITE ( numonp, nampislig ) 
    135135      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zlim.F90

    r10975 r11822  
    255255      REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    256256      READ  ( numnatp_ref, namp4zlim, IOSTAT = ios, ERR = 901) 
    257 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zlim in reference namelist', lwp ) 
     257901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zlim in reference namelist' ) 
    258258      REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    259259      READ  ( numnatp_cfg, namp4zlim, IOSTAT = ios, ERR = 902 ) 
    260 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zlim in configuration namelist', lwp ) 
     260902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zlim in configuration namelist' ) 
    261261      IF(lwm) WRITE( numonp, namp4zlim ) 
    262262      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zlys.F90

    r10975 r11822  
    165165      REWIND( numnatp_ref )              ! Namelist nampiscal in reference namelist : Pisces CaCO3 dissolution 
    166166      READ  ( numnatp_ref, nampiscal, IOSTAT = ios, ERR = 901) 
    167 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampiscal in reference namelist', lwp ) 
     167901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampiscal in reference namelist' ) 
    168168      REWIND( numnatp_cfg )              ! Namelist nampiscal in configuration namelist : Pisces CaCO3 dissolution 
    169169      READ  ( numnatp_cfg, nampiscal, IOSTAT = ios, ERR = 902 ) 
    170 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampiscal in configuration namelist', lwp ) 
     170902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampiscal in configuration namelist' ) 
    171171      IF(lwm) WRITE( numonp, nampiscal ) 
    172172      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zmeso.F90

    r10975 r11822  
    293293      REWIND( numnatp_ref )              ! Namelist nampismes in reference namelist : Pisces mesozooplankton 
    294294      READ  ( numnatp_ref, namp4zmes, IOSTAT = ios, ERR = 901) 
    295 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmes in reference namelist', lwp ) 
     295901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmes in reference namelist' ) 
    296296      REWIND( numnatp_cfg )              ! Namelist nampismes in configuration namelist : Pisces mesozooplankton 
    297297      READ  ( numnatp_cfg, namp4zmes, IOSTAT = ios, ERR = 902 ) 
    298 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmes in configuration namelist', lwp ) 
     298902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmes in configuration namelist' ) 
    299299      IF(lwm) WRITE( numonp, namp4zmes ) 
    300300      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zmicro.F90

    r10975 r11822  
    246246      REWIND( numnatp_ref )              ! Namelist nampiszoo in reference namelist : Pisces microzooplankton 
    247247      READ  ( numnatp_ref, namp4zzoo, IOSTAT = ios, ERR = 901) 
    248 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zzoo in reference namelist', lwp ) 
     248901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zzoo in reference namelist' ) 
    249249      REWIND( numnatp_cfg )              ! Namelist nampiszoo in configuration namelist : Pisces microzooplankton 
    250250      READ  ( numnatp_cfg, namp4zzoo, IOSTAT = ios, ERR = 902 ) 
    251 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zzoo in configuration namelist', lwp ) 
     251902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zzoo in configuration namelist' ) 
    252252      IF(lwm) WRITE( numonp, namp4zzoo ) 
    253253      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zmort.F90

    r10975 r11822  
    232232      REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton 
    233233      READ  ( numnatp_ref, namp4zmort, IOSTAT = ios, ERR = 901) 
    234 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmort in reference namelist', lwp ) 
     234901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zmort in reference namelist' ) 
    235235      REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton 
    236236      READ  ( numnatp_cfg, namp4zmort, IOSTAT = ios, ERR = 902 ) 
    237 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmort in configuration namelist', lwp ) 
     237902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zmort in configuration namelist' ) 
    238238      IF(lwm) WRITE( numonp, namp4zmort ) 
    239239      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zopt.F90

    r10975 r11822  
    404404      REWIND( numnatp_ref )              ! Namelist nampisopt in reference namelist : Pisces attenuation coef. and PAR 
    405405      READ  ( numnatp_ref, nampisopt, IOSTAT = ios, ERR = 901) 
    406 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisopt in reference namelist', lwp ) 
     406901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisopt in reference namelist' ) 
    407407      REWIND( numnatp_cfg )              ! Namelist nampisopt in configuration namelist : Pisces attenuation coef. and PAR 
    408408      READ  ( numnatp_cfg, nampisopt, IOSTAT = ios, ERR = 902 ) 
    409 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisopt in configuration namelist', lwp ) 
     409902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisopt in configuration namelist' ) 
    410410      IF(lwm) WRITE ( numonp, nampisopt ) 
    411411 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zpoc.F90

    r10975 r11822  
    103103     ! particle scheme. Does not work with Kriest parameterization. 
    104104     ! ----------------------------------------------------------------------- 
     105     ztremint(:,:,:) = zremigoc(:,:,:) 
    105106     DO jk = 2, jpkm1 
    106107        DO jj = 1, jpj 
    … …  
    167168                       &   + zsizek1 ) ) * zpoc + ( prodgoc(ji,jj,jk-1) / tgfunc(ji,jj,jk-1) * ( 1.           & 
    168169                       &   - exp( -reminp(jn) * zsizek1 ) ) * exp( -reminp(jn) * zsizek ) + prodgoc(ji,jj,jk) & 
    169                        &   / tgfunc(ji,jj,jk) * ( 1. - exp( -reminp(jn) * zsizek ) ) ) * rday / rfact2 / reminp(jn)  
     170                       &   / tgfunc(ji,jj,jk) * ( 1. - exp( -reminp(jn) * zsizek ) ) ) * rday / rfact2 / reminp(jn) * alphan(jn)  
    170171                       alphat = alphat + alphag(ji,jj,jk,jn) 
    171172                       remint = remint + alphag(ji,jj,jk,jn) * reminp(jn) 
    … …  
    286287     ! layer, this spectrum is supposed to be uniform. 
    287288     ! --------------------------------------------------------------------- 
     289     ztremint(:,:,:) = zremipoc(:,:,:) 
    288290     DO jk = 1, jpkm1 
    289291        DO jj = 1, jpj 
    … …  
    498500      REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization 
    499501      READ  ( numnatp_ref, nampispoc, IOSTAT = ios, ERR = 901) 
    500 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampispoc in reference namelist', lwp ) 
     502901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampispoc in reference namelist' ) 
    501503      REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization 
    502504      READ  ( numnatp_cfg, nampispoc, IOSTAT = ios, ERR = 902 ) 
    503 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampispoc in configuration namelist', lwp ) 
     505902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampispoc in configuration namelist' ) 
    504506      IF(lwm) WRITE( numonp, nampispoc ) 
    505507 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zprod.F90

    r10975 r11822  
    226226         DO jj = 1, jpj 
    227227            DO ji = 1, jpi 
    228                zprbio(ji,jj,jk) = zprbio(ji,jj,jk) * ( 1. - fr_i(ji,jj) ) 
    229                zprdia(ji,jj,jk) = zprdia(ji,jj,jk) * ( 1. - fr_i(ji,jj) ) 
    230228               zprbio(ji,jj,jk) = zprbio(ji,jj,jk) * ( 1. - fr_i(ji,jj) ) 
    231229               zprdia(ji,jj,jk) = zprdia(ji,jj,jk) * ( 1. - fr_i(ji,jj) ) 
    … …  
    323321     ! 
    324322     IF( ln_ligand ) THEN 
     323         zpligprod1(:,:,:) = 0._wp    ;    zpligprod2(:,:,:) = 0._wp 
    325324         DO jk = 1, jpkm1 
    326325            DO jj = 1, jpj 
    … …  
    494493      REWIND( numnatp_ref )              ! Namelist nampisprod in reference namelist : Pisces phytoplankton production 
    495494      READ  ( numnatp_ref, namp4zprod, IOSTAT = ios, ERR = 901) 
    496 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zprod in reference namelist', lwp ) 
     495901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namp4zprod in reference namelist' ) 
    497496      REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production 
    498497      READ  ( numnatp_cfg, namp4zprod, IOSTAT = ios, ERR = 902 ) 
    499 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zprod in configuration namelist', lwp ) 
     498902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namp4zprod in configuration namelist' ) 
    500499      IF(lwm) WRITE( numonp, namp4zprod ) 
    501500 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zrem.F90

    r10975 r11822  
    330330      REWIND( numnatp_ref )              ! Namelist nampisrem in reference namelist : Pisces remineralization 
    331331      READ  ( numnatp_ref, nampisrem, IOSTAT = ios, ERR = 901) 
    332 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisrem in reference namelist', lwp ) 
     332901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisrem in reference namelist' ) 
    333333      REWIND( numnatp_cfg )              ! Namelist nampisrem in configuration namelist : Pisces remineralization 
    334334      READ  ( numnatp_cfg, nampisrem, IOSTAT = ios, ERR = 902 ) 
    335 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisrem in configuration namelist', lwp ) 
     335902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisrem in configuration namelist' ) 
    336336      IF(lwm) WRITE( numonp, nampisrem ) 
    337337 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zsbc.F90

    r10975 r11822  
    2727   LOGICAL , PUBLIC ::   ln_ironsed   !: boolean for Fe input from sediments 
    2828   LOGICAL , PUBLIC ::   ln_hydrofe   !: boolean for Fe input from hydrothermal vents 
    29    LOGICAL , PUBLIC ::   ln_ironice   !: boolean for Fe input from sea ice 
    3029   REAL(wp), PUBLIC ::   sedfeinput   !: Coastal release of Iron 
    3130   REAL(wp), PUBLIC ::   dustsolub    !: Solubility of the dust 
    … …  
    110109         IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_dust > 1 ) ) THEN 
    111110            CALL fld_read( kt, 1, sf_dust ) 
    112             IF( nn_ice_tr == -1 .AND. .NOT.ln_ironice ) THEN   ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) 
    113             ELSE                                               ;   dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) * ( 1.-fr_i(:,:) ) ) 
    114             ENDIF 
     111            dust(:,:) = MAX( rtrn, sf_dust(1)%fnow(:,:,1) ) * ( 1.0 - fr_i(:,:) ) 
    115112         ENDIF 
    116113      ENDIF 
    … …  
    176173      IF( ln_ndepo ) THEN 
    177174         IF( kt == nit000 .OR. ( kt /= nit000 .AND. ntimes_ndep > 1 ) ) THEN 
    178              zcoef = rno3 * 14E6 * ryyss 
     175             zcoef = 14. * rno3 
    179176             CALL fld_read( kt, 1, sf_ndepo ) 
    180177             nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t(:,:,1,Kmm) ) 
    181178         ENDIF 
    182179         IF( .NOT.ln_linssh ) THEN 
    183            zcoef = rno3 * 14E6 * ryyss 
    184            nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t(:,:,1,Kmm) ) 
     180            zcoef = 14. * rno3 
     181            nitdep(:,:) = MAX( rtrn, sf_ndepo(1)%fnow(:,:,1) / zcoef / e3t(:,:,1,Kmm) ) 
    185182         ENDIF 
    186183      ENDIF 
    … …  
    237234      REWIND( numnatp_ref )              ! Namelist nampissbc in reference namelist : Pisces external sources of nutrients 
    238235      READ  ( numnatp_ref, nampissbc, IOSTAT = ios, ERR = 901) 
    239 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampissbc in reference namelist', lwp ) 
     236901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampissbc in reference namelist' ) 
    240237      REWIND( numnatp_cfg )              ! Namelist nampissbc in configuration namelist : Pisces external sources of nutrients 
    241238      READ  ( numnatp_cfg, nampissbc, IOSTAT = ios, ERR = 902 ) 
    242 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampissbc in configuration namelist', lwp ) 
     239902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampissbc in configuration namelist' ) 
    243240      IF(lwm) WRITE ( numonp, nampissbc ) 
    244241 
    … …  
    267264      END IF 
    268265 
    269       IF( nn_ice_tr >= 0 .AND. ln_ironice ) THEN 
    270          IF(lwp) THEN 
    271             WRITE(numout,*) '   ==>>>   ln_ironice incompatible with nn_ice_tr = ', nn_ice_tr 
    272             WRITE(numout,*) '           Specify your sea ice iron concentration in nampisice instead ' 
    273             WRITE(numout,*) '           ln_ironice is forced to .FALSE. ' 
    274          ENDIF 
    275          ln_ironice = .FALSE. 
    276       ENDIF 
    277  
    278266      IF( ln_dust .OR. ln_river .OR. ln_ndepo ) THEN   ;   ll_sbc = .TRUE. 
    279267      ELSE                                             ;   ll_sbc = .FALSE. 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zsed.F90

    r10975 r11822  
    5454      INTEGER  ::  ji, jj, jk, ikt 
    5555      REAL(wp) ::  zrivalk, zrivsil, zrivno3 
    56       REAL(wp) ::  zwflux, zfminus, zfplus 
    57       REAL(wp) ::  zlim, zfact, zfactcal 
     56      REAL(wp) ::  zwflux, zlim, zfact, zfactcal 
    5857      REAL(wp) ::  zo2, zno3, zflx, zpdenit, z1pdenit, zolimit 
    5958      REAL(wp) ::  zsiloss, zcaloss, zws3, zws4, zwsc, zdep 
    … …  
    105104               zdep    = rfact2 / e3t(ji,jj,1,Kmm) 
    106105               zwflux  = fmmflx(ji,jj) / 1000._wp 
    107                zfminus = MIN( 0._wp, -zwflux ) * tr(ji,jj,1,jpfer,Kbb) * zdep 
    108                zfplus  = MAX( 0._wp, -zwflux ) * icefeinput * zdep 
    109                zironice(ji,jj) =  zfplus + zfminus 
     106               zironice(ji,jj) =  MAX( -0.99 * tr(ji,jj,1,jpfer,Kbb), -zwflux * icefeinput * zdep ) 
    110107            END DO 
    111108         END DO 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p4zsms.F90

    r11504 r11822  
    204204      REWIND( numnatp_ref )              ! Namelist nampisbio in reference namelist : Pisces variables 
    205205      READ  ( numnatp_ref, nampisbio, IOSTAT = ios, ERR = 901) 
    206 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisbio in reference namelist', lwp ) 
     206901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisbio in reference namelist' ) 
    207207      REWIND( numnatp_cfg )              ! Namelist nampisbio in configuration namelist : Pisces variables 
    208208      READ  ( numnatp_cfg, nampisbio, IOSTAT = ios, ERR = 902 ) 
    209 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisbio in configuration namelist', lwp ) 
     209902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisbio in configuration namelist' ) 
    210210      IF(lwm) WRITE( numonp, nampisbio ) 
    211211      ! 
    … …  
    235235      REWIND( numnatp_ref )              ! Namelist nampisdmp in reference namelist : Pisces damping 
    236236      READ  ( numnatp_ref, nampisdmp, IOSTAT = ios, ERR = 905) 
    237 905   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisdmp in reference namelist', lwp ) 
     237905   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampisdmp in reference namelist' ) 
    238238      REWIND( numnatp_cfg )              ! Namelist nampisdmp in configuration namelist : Pisces damping 
    239239      READ  ( numnatp_cfg, nampisdmp, IOSTAT = ios, ERR = 906 ) 
    240 906   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisdmp in configuration namelist', lwp ) 
     240906   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampisdmp in configuration namelist' ) 
    241241      IF(lwm) WRITE( numonp, nampisdmp ) 
    242242      ! 
    … …  
    250250      REWIND( numnatp_ref )              ! Namelist nampismass in reference namelist : Pisces mass conservation check 
    251251      READ  ( numnatp_ref, nampismass, IOSTAT = ios, ERR = 907) 
    252 907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampismass in reference namelist', lwp ) 
     252907   IF( ios /= 0 )   CALL ctl_nam ( ios , 'nampismass in reference namelist' ) 
    253253      REWIND( numnatp_cfg )              ! Namelist nampismass in configuration namelist : Pisces mass conservation check  
    254254      READ  ( numnatp_cfg, nampismass, IOSTAT = ios, ERR = 908 ) 
    255 908   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampismass in configuration namelist', lwp ) 
     255908   IF( ios >  0 )   CALL ctl_nam ( ios , 'nampismass in configuration namelist' ) 
    256256      IF(lwm) WRITE( numonp, nampismass ) 
    257257 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p5zlim.F90

    r10975 r11822  
    451451      REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    452452      READ  ( numnatp_ref, namp5zlim, IOSTAT = ios, ERR = 901) 
    453 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampislim in reference namelist', lwp ) 
     453901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampislim in reference namelist' ) 
    454454      ! 
    455455      REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    456456      READ  ( numnatp_cfg, namp5zlim, IOSTAT = ios, ERR = 902 ) 
    457 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampislim in configuration namelist', lwp ) 
     457902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampislim in configuration namelist' ) 
    458458      IF(lwm) WRITE ( numonp, namp5zlim ) 
    459459      ! 
    … …  
    492492      REWIND( numnatp_ref )              ! Namelist nampislim in reference namelist : Pisces nutrient limitation parameters 
    493493      READ  ( numnatp_ref, namp5zquota, IOSTAT = ios, ERR = 903) 
    494 903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisquota in reference namelist', lwp ) 
     494903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampisquota in reference namelist' ) 
    495495      ! 
    496496      REWIND( numnatp_cfg )              ! Namelist nampislim in configuration namelist : Pisces nutrient limitation parameters  
    497497      READ  ( numnatp_cfg, namp5zquota, IOSTAT = ios, ERR = 904 ) 
    498 904   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampisquota in configuration namelist', lwp ) 
     498904   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampisquota in configuration namelist' ) 
    499499      IF(lwm) WRITE ( numonp, namp5zquota ) 
    500500      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p5zmeso.F90

    r10975 r11822  
    410410      REWIND( numnatp_ref )              ! Namelist nampismes in reference namelist : Pisces mesozooplankton 
    411411      READ  ( numnatp_ref, namp5zmes, IOSTAT = ios, ERR = 901) 
    412 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampismes in reference namelist', lwp ) 
     412901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nampismes in reference namelist' ) 
    413413      ! 
    414414      REWIND( numnatp_cfg )              ! Namelist nampismes in configuration namelist : Pisces mesozooplankton 
    415415      READ  ( numnatp_cfg, namp5zmes, IOSTAT = ios, ERR = 902 ) 
    416 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampismes in configuration namelist', lwp ) 
     416902   IF( ios >  0 ) CALL ctl_nam ( ios , 'nampismes in configuration namelist' ) 
    417417      IF(lwm) WRITE ( numonp, namp5zmes ) 
    418418      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p5zmicro.F90

    r10975 r11822  
    352352      REWIND( numnatp_ref )              ! Namelist nampiszoo in reference namelist : Pisces microzooplankton 
    353353      READ  ( numnatp_ref, namp5zzoo, IOSTAT = ios, ERR = 901) 
    354 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zzoo in reference namelist', lwp ) 
     354901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zzoo in reference namelist' ) 
    355355      ! 
    356356      REWIND( numnatp_cfg )              ! Namelist nampiszoo in configuration namelist : Pisces microzooplankton 
    357357      READ  ( numnatp_cfg, namp5zzoo, IOSTAT = ios, ERR = 902 ) 
    358 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zzoo in configuration namelist', lwp ) 
     358902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zzoo in configuration namelist' ) 
    359359      IF(lwm) WRITE ( numonp, namp5zzoo ) 
    360360      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p5zmort.F90

    r10975 r11822  
    292292      REWIND( numnatp_ref )              ! Namelist nampismort in reference namelist : Pisces phytoplankton 
    293293      READ  ( numnatp_ref, namp5zmort, IOSTAT = ios, ERR = 901) 
    294 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zmort in reference namelist', lwp ) 
     294901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zmort in reference namelist' ) 
    295295 
    296296      REWIND( numnatp_cfg )              ! Namelist nampismort in configuration namelist : Pisces phytoplankton 
    297297      READ  ( numnatp_cfg, namp5zmort, IOSTAT = ios, ERR = 902 ) 
    298 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zmort in configuration namelist', lwp ) 
     298902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zmort in configuration namelist' ) 
    299299      IF(lwm) WRITE ( numonp, namp5zmort ) 
    300300 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/TOP/PISCES/P4Z/p5zprod.F90

    r10975 r11822  
    445445     ! 
    446446     IF( ln_ligand ) THEN 
     447         zpligprod1(:,:,:) = 0._wp    ;    zpligprod2(:,:,:) = 0._wp 
    447448         DO jk = 1, jpkm1 
    448449            DO jj = 1, jpj 
    … …  
    584585      REWIND( numnatp_ref )              ! Namelist nampisprod in reference namelist : Pisces phytoplankton production 
    585586      READ  ( numnatp_ref, namp5zprod, IOSTAT = ios, ERR = 901) 
    586 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zprod in reference namelist', lwp ) 
     587901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namp5zprod in reference namelist' ) 
    587588 
    588589      REWIND( numnatp_cfg )              ! Namelist nampisprod in configuration namelist : Pisces phytoplankton production 
    589590      READ  ( numnatp_cfg, namp5zprod, IOSTAT = ios, ERR = 902 ) 
    590 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zprod in configuration namelist', lwp ) 
     591902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namp5zprod in configuration namelist' ) 
    591592      IF(lwm) WRITE ( numonp, namp5zprod ) 
    592593 
Note: See TracChangeset for help on using the changeset viewer.