Changeset 13710 for NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves/src/TOP/PISCES/P2Z
- Timestamp:
- 2020-11-02T10:56:42+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves
- Files:
-
- 5 edited
-
. (modified) (1 prop)
-
src/TOP/PISCES/P2Z/p2zbio.F90 (modified) (6 diffs)
-
src/TOP/PISCES/P2Z/p2zexp.F90 (modified) (12 diffs)
-
src/TOP/PISCES/P2Z/p2zopt.F90 (modified) (6 diffs)
-
src/TOP/PISCES/P2Z/p2zsed.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/sette@ HEADsette10 ^/utils/CI/sette@13559 sette
-
- Property svn:externals
-
NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves/src/TOP/PISCES/P2Z/p2zbio.F90
r12377 r13710 19 19 ! 20 20 USE lbclnk ! 21 USE prtctl _trc! Print control for debbuging21 USE prtctl ! Print control for debbuging 22 22 USE iom ! 23 23 … … 58 58 !! * Substitutions 59 59 # include "do_loop_substitute.h90" 60 # include "domzgr_substitute.h90" 60 61 !!---------------------------------------------------------------------- 61 62 !! NEMO/TOP 4.0 , NEMO Consortium (2018) … … 121 122 DO jk = 1, jpkbm1 ! Upper ocean (bio-layers) ! 122 123 ! ! -------------------------- ! 123 DO_2D _00_00124 DO_2D( 0, 0, 0, 0 ) 124 125 ! trophic variables( det, zoo, phy, no3, nh4, dom) 125 126 ! ------------------------------------------------ … … 241 242 DO jk = jpkb, jpkm1 ! Upper ocean (bio-layers) ! 242 243 ! ! -------------------------- ! 243 DO_2D _00_00244 DO_2D( 0, 0, 0, 0 ) 244 245 ! remineralisation of all quantities towards nitrate 245 246 … … 338 339 ! 339 340 IF( lk_iomput ) THEN 340 CALL lbc_lnk( 'p2zbio', zw2d(:,:,:),'T', 1. )341 CALL lbc_lnk_multi( 'p2zbio', zw3d(:,:,:,1),'T', 1. , zw3d(:,:,:,2),'T', 1., zw3d(:,:,:,3),'T', 1.)341 CALL lbc_lnk( 'p2zbio', zw2d(:,:,:),'T', 1.0_wp ) 342 CALL lbc_lnk_multi( 'p2zbio', zw3d(:,:,:,1),'T', 1.0_wp, zw3d(:,:,:,2),'T', 1.0_wp, zw3d(:,:,:,3),'T', 1.0_wp ) 342 343 ! Save diagnostics 343 344 CALL iom_put( "TNO3PHY", zw2d(:,:,1) ) … … 366 367 IF(sn_cfctl%l_prttrc) THEN ! print mean trends (used for debugging) 367 368 WRITE(charout, FMT="('bio')") 368 CALL prt_ctl_ trc_info(charout)369 CALL prt_ctl _trc(tab4d=tr(:,:,:,:,Krhs), mask=tmask, clinfo=ctrcnm)369 CALL prt_ctl_info( charout, cdcomp = 'top' ) 370 CALL prt_ctl(tab4d_1=tr(:,:,:,:,Krhs), mask1=tmask, clinfo=ctrcnm) 370 371 ENDIF 371 372 ! -
NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves/src/TOP/PISCES/P2Z/p2zexp.F90
r12489 r13710 17 17 USE p2zsed 18 18 USE lbclnk 19 USE prtctl _trc! Print control for debbuging19 USE prtctl ! Print control for debbuging 20 20 USE trd_oce 21 21 USE trdtrc … … 39 39 !! * Substitutions 40 40 # include "do_loop_substitute.h90" 41 # include "domzgr_substitute.h90" 41 42 !!---------------------------------------------------------------------- 42 43 !! NEMO/TOP 4.0 , NEMO Consortium (2018) … … 81 82 ! LAYERS IS DETERMINED BY DMIN3 DEFINED IN sms_p2z.F90 82 83 ! ---------------------------------------------------------------------- 83 DO_3D _00_00(1, jpkm1 )84 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) 84 85 ze3t = 1. / e3t(ji,jj,jk,Kmm) 85 86 tr(ji,jj,jk,jpno3,Krhs) = tr(ji,jj,jk,jpno3,Krhs) + ze3t * dmin3(ji,jj,jk) * xksi(ji,jj) … … 92 93 zgeolpoc = 0.e0 ! Initialization 93 94 ! Release of nutrients from the "simple" sediment 94 DO_2D _00_0095 DO_2D( 0, 0, 0, 0 ) 95 96 ikt = mbkt(ji,jj) 96 97 tr(ji,jj,ikt,jpno3,Krhs) = tr(ji,jj,ikt,jpno3,Krhs) + sedlam * sedpocn(ji,jj) / e3t(ji,jj,ikt,Kmm) … … 102 103 END_2D 103 104 104 DO_2D _00_00105 DO_2D( 0, 0, 0, 0 ) 105 106 tr(ji,jj,1,jpno3,Krhs) = tr(ji,jj,1,jpno3,Krhs) + zgeolpoc * cmask(ji,jj) / areacot / e3t(ji,jj,1,Kmm) 106 107 END_2D 107 108 108 CALL lbc_lnk( 'p2zexp', sedpocn, 'T', 1. )109 CALL lbc_lnk( 'p2zexp', sedpocn, 'T', 1.0_wp ) 109 110 110 111 ! Oa & Ek: diagnostics depending on jpdia2d ! left as example … … 120 121 ELSE 121 122 ! 122 DO_2D _11_11123 DO_2D( 1, 1, 1, 1 ) 123 124 zsedpocd = zsedpoca(ji,jj) - 2. * sedpocn(ji,jj) + sedpocb(ji,jj) ! time laplacian on tracers 124 125 sedpocb(ji,jj) = sedpocn(ji,jj) + rn_atfp * zsedpocd ! sedpocb <-- filtered sedpocn … … 139 140 IF(sn_cfctl%l_prttrc) THEN ! print mean trends (used for debugging) 140 141 WRITE(charout, FMT="('exp')") 141 CALL prt_ctl_ trc_info(charout)142 CALL prt_ctl _trc(tab4d=tr(:,:,:,:,Krhs), mask=tmask, clinfo=ctrcnm)142 CALL prt_ctl_info( charout, cdcomp = 'top' ) 143 CALL prt_ctl(tab4d_1=tr(:,:,:,:,Krhs), mask1=tmask, clinfo=ctrcnm) 143 144 ENDIF 144 145 ! … … 173 174 zdm0 = 0._wp 174 175 zrro = 1._wp 175 DO_3D _11_11(jpkb, jpkm1 )176 DO_3D( 1, 1, 1, 1, jpkb, jpkm1 ) 176 177 zfluo = ( gdepw(ji,jj,jk ,Kmm) / gdepw(ji,jj,jpkb,Kmm) )**xhr 177 178 zfluu = ( gdepw(ji,jj,jk+1,Kmm) / gdepw(ji,jj,jpkb,Kmm) )**xhr … … 190 191 dminl(:,:) = 0._wp 191 192 dmin3(:,:,:) = zdm0 192 DO_3D _11_11(1, jpk )193 DO_3D( 1, 1, 1, 1, 1, jpk ) 193 194 IF( tmask(ji,jj,jk) == 0._wp ) THEN 194 195 dminl(ji,jj) = dminl(ji,jj) + dmin3(ji,jj,jk) … … 197 198 END_3D 198 199 199 DO_2D _11_11200 DO_2D( 1, 1, 1, 1 ) 200 201 IF( tmask(ji,jj,1) == 0 ) dmin3(ji,jj,1) = 0._wp 201 202 END_2D … … 203 204 ! Coastal mask 204 205 cmask(:,:) = 0._wp 205 DO_2D _00_00206 DO_2D( 0, 0, 0, 0 ) 206 207 IF( tmask(ji,jj,1) /= 0. ) THEN 207 208 zmaskt = tmask(ji+1,jj,1) * tmask(ji-1,jj,1) * tmask(ji,jj+1,1) * tmask(ji,jj-1,1) … … 209 210 END IF 210 211 END_2D 211 CALL lbc_lnk( 'p2zexp', cmask , 'T', 1. ) ! lateral boundary conditions on cmask (sign unchanged)212 CALL lbc_lnk( 'p2zexp', cmask , 'T', 1.0_wp ) ! lateral boundary conditions on cmask (sign unchanged) 212 213 areacot = glob_sum( 'p2zexp', e1e2t(:,:) * cmask(:,:) ) 213 214 ! 214 215 IF( ln_rsttr ) THEN 215 CALL iom_get( numrtr, jpdom_auto glo, 'SEDB'//ctrcnm(jpdet), sedpocb(:,:) )216 CALL iom_get( numrtr, jpdom_auto glo, 'SEDN'//ctrcnm(jpdet), sedpocn(:,:) )216 CALL iom_get( numrtr, jpdom_auto, 'SEDB'//ctrcnm(jpdet), sedpocb(:,:) ) 217 CALL iom_get( numrtr, jpdom_auto, 'SEDN'//ctrcnm(jpdet), sedpocn(:,:) ) 217 218 ELSE 218 219 sedpocb(:,:) = 0._wp -
NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves/src/TOP/PISCES/P2Z/p2zopt.F90
r12377 r13710 18 18 USE trc 19 19 USE sms_pisces 20 USE prtctl _trc! Print control for debbuging20 USE prtctl ! Print control for debbuging 21 21 22 22 IMPLICIT NONE … … 40 40 !! * Substitutions 41 41 # include "do_loop_substitute.h90" 42 # include "domzgr_substitute.h90" 42 43 !!---------------------------------------------------------------------- 43 44 !! NEMO/TOP 4.0 , NEMO Consortium (2018) … … 94 95 ! ! Photosynthetically Available Radiation (PAR) 95 96 zcoef = 12 * redf / rcchl / rpig ! -------------------------------------- 96 DO_3D _11_11( 2, jpk )97 DO_3D( 1, 1, 1, 1, 2, jpk ) ! local par at w-levels 97 98 zpig = LOG( MAX( TINY(0.), tr(ji,jj,jk-1,jpphy,Kmm) ) * zcoef ) 98 99 zkr = xkr0 + xkrp * EXP( xlr * zpig ) … … 101 102 zparg(ji,jj,jk) = zparg(ji,jj,jk-1) * EXP( -zkg * e3t(ji,jj,jk-1,Kmm) ) 102 103 END_3D 103 DO_3D _11_11( 1, jpkm1 )104 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) ! mean par at t-levels 104 105 zpig = LOG( MAX( TINY(0.), tr(ji,jj,jk,jpphy,Kmm) ) * zcoef ) 105 106 zkr = xkr0 + xkrp * EXP( xlr * zpig ) … … 113 114 ! ! -------------- 114 115 neln(:,:) = 1 ! euphotic layer level 115 DO_3D _11_11( 1, jpkm1)116 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) ! (i.e. 1rst T-level strictly below EL bottom) 116 117 IF( etot(ji,jj,jk) >= zpar100(ji,jj) ) neln(ji,jj) = jk + 1 117 118 END_3D 118 119 ! ! Euphotic layer depth 119 DO_2D _11_11120 DO_2D( 1, 1, 1, 1 ) 120 121 heup(ji,jj) = gdepw(ji,jj,neln(ji,jj),Kmm) 121 122 END_2D … … 124 125 IF(sn_cfctl%l_prttrc) THEN ! print mean trends (used for debugging) 125 126 WRITE(charout, FMT="('opt')") 126 CALL prt_ctl_ trc_info( charout)127 CALL prt_ctl _trc( tab4d=tr(:,:,:,:,Kmm), mask=tmask, clinfo=ctrcnm )127 CALL prt_ctl_info( charout, cdcomp = 'top' ) 128 CALL prt_ctl( tab4d_1=tr(:,:,:,:,Kmm), mask1=tmask, clinfo=ctrcnm ) 128 129 ENDIF 129 130 ! -
NEMO/branches/2020/dev_r12702_ASINTER-02_emanuelaclementi_Waves/src/TOP/PISCES/P2Z/p2zsed.F90
r12377 r13710 18 18 USE lbclnk ! 19 19 USE iom ! 20 USE prtctl _trc! Print control for debbuging20 USE prtctl ! Print control for debbuging 21 21 22 22 IMPLICIT NONE … … 33 33 !! * Substitutions 34 34 # include "do_loop_substitute.h90" 35 # include "domzgr_substitute.h90" 35 36 !!---------------------------------------------------------------------- 36 37 !! NEMO/TOP 4.0 , NEMO Consortium (2018) … … 88 89 89 90 ! tracer flux divergence at t-point added to the general trend 90 DO_3D _11_11(1, jpkm1 )91 DO_3D( 1, 1, 1, 1, 1, jpkm1 ) 91 92 ztra(ji,jj,jk) = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / e3t(ji,jj,jk,Kmm) 92 93 tr(ji,jj,jk,jpdet,Krhs) = tr(ji,jj,jk,jpdet,Krhs) + ztra(ji,jj,jk) … … 108 109 IF(sn_cfctl%l_prttrc) THEN ! print mean trends (used for debugging) 109 110 WRITE(charout, FMT="('sed')") 110 CALL prt_ctl_ trc_info(charout)111 CALL prt_ctl _trc(tab4d=tr(:,:,:,:,Krhs), mask=tmask, clinfo=ctrcnm)111 CALL prt_ctl_info( charout, cdcomp = 'top' ) 112 CALL prt_ctl(tab4d_1=tr(:,:,:,:,Krhs), mask1=tmask, clinfo=ctrcnm) 112 113 ENDIF 113 114 !
Note: See TracChangeset
for help on using the changeset viewer.
