Changeset 13540 for NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED
- Timestamp:
- 2020-09-29T12:41:06+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 9 edited
-
. (modified) (1 prop)
-
src/TOP/PISCES/SED/oce_sed.F90 (modified) (2 diffs)
-
src/TOP/PISCES/SED/sedchem.F90 (modified) (2 diffs)
-
src/TOP/PISCES/SED/seddta.F90 (modified) (5 diffs)
-
src/TOP/PISCES/SED/sedini.F90 (modified) (2 diffs)
-
src/TOP/PISCES/SED/sedinorg.F90 (modified) (1 diff)
-
src/TOP/PISCES/SED/sedrst.F90 (modified) (6 diffs)
-
src/TOP/PISCES/SED/sedsfc.F90 (modified) (1 diff)
-
src/TOP/PISCES/SED/trcdmp_sed.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- 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@13507 sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/oce_sed.F90
r12511 r13540 13 13 USE dom_oce , ONLY : glamt => glamt !: longitude of t-point (degre) 14 14 USE dom_oce , ONLY : gphit => gphit !: latitude of t-point (degre) 15 !!st 16 #if ! defined key_qco 15 17 USE dom_oce , ONLY : e3t => e3t !: latitude of t-point (degre) 18 #endif 16 19 USE dom_oce , ONLY : e3t_1d => e3t_1d !: reference depth of t-points (m) 17 20 USE dom_oce , ONLY : gdepw_0 => gdepw_0 !: reference depth of t-points (m) … … 53 56 54 57 END MODULE oce_sed 55 56 -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/sedchem.F90
r12377 r13540 138 138 CALL sed_chem_cst 139 139 ELSE 140 DO_2D _11_11140 DO_2D( 1, 1, 1, 1 ) 141 141 ikt = mbkt(ji,jj) 142 142 IF ( tmask(ji,jj,ikt) == 1 ) THEN … … 577 577 saltprac(:) = salt(:) * 35.0 / 35.16504 578 578 ELSE 579 saltprac(:) = temp(:)579 saltprac(:) = salt(:) 580 580 ENDIF 581 581 -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/seddta.F90
r12511 r13540 24 24 !! * Substitutions 25 25 # include "do_loop_substitute.h90" 26 # include "domzgr_substitute.h90" 26 27 !! $Id$ 27 28 CONTAINS … … 95 96 ! ----------------------------------------------------------- 96 97 IF (ln_sediment_offline) THEN 97 DO_2D _11_1198 DO_2D( 1, 1, 1, 1 ) 98 99 ikt = mbkt(ji,jj) 99 100 zwsbio4(ji,jj) = wsbio2 / rday … … 101 102 END_2D 102 103 ELSE 103 DO_2D _11_11104 DO_2D( 1, 1, 1, 1 ) 104 105 ikt = mbkt(ji,jj) 105 106 zdep = e3t(ji,jj,ikt,Kmm) / rDt_trc … … 110 111 111 112 trc_data(:,:,:) = 0. 112 DO_2D _11_11113 DO_2D( 1, 1, 1, 1 ) 113 114 ikt = mbkt(ji,jj) 114 115 IF ( tmask(ji,jj,ikt) == 1 ) THEN … … 164 165 CALL pack_arr ( jpoce, rainrm_dta(1:jpoce,jscal), trc_data(1:jpi,1:jpj,14), iarroce(1:jpoce) ) 165 166 rainrm_dta(1:jpoce,jscal) = rainrm_dta(1:jpoce,jscal) * 1e-4 166 ! vector temperature [ °C] and salinity167 ! vector temperature [�C] and salinity 167 168 CALL pack_arr ( jpoce, temp(1:jpoce), trc_data(1:jpi,1:jpj,15), iarroce(1:jpoce) ) 168 169 CALL pack_arr ( jpoce, salt(1:jpoce), trc_data(1:jpi,1:jpj,16), iarroce(1:jpoce) ) -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/sedini.F90
r12511 r13540 135 135 ! Determination of sediments number of points and allocate global variables 136 136 epkbot(:,:) = 0. 137 DO_2D _11_11137 DO_2D( 1, 1, 1, 1 ) 138 138 ikt = mbkt(ji,jj) 139 139 IF( tmask(ji,jj,ikt) == 1 ) epkbot(ji,jj) = e3t_1d(ikt) … … 247 247 ! Computation of 1D array of sediments points 248 248 indoce = 0 249 DO_2D _11_11249 DO_2D( 1, 1, 1, 1 ) 250 250 IF ( epkbot(ji,jj) > 0. ) THEN 251 251 indoce = indoce + 1 -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/sedinorg.F90
r10225 r13540 89 89 zsolcpcl = zsolcpcl + solcp(ji,jk,jsclay) * dz(jk) 90 90 END DO 91 zsolcpsi = MAX( zsolcpsi, rtrn ) 91 92 zsieq(ji) = sieqs(ji) * MAX(0.25, 1.0 - (0.045 * zsolcpcl / zsolcpsi )**0.58 ) 92 93 zsieq(ji) = MAX( rtrn, sieqs(ji) ) -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/sedrst.F90
r12511 r13540 80 80 IF(lwp) WRITE(numsed,*) & 81 81 ' open sed restart.output NetCDF file: ',TRIM(clpath)//clname 82 CALL iom_open( TRIM(clpath)//TRIM(clname), numrsw, ldwrt = .TRUE., kdlev = jpksed )82 CALL iom_open( TRIM(clpath)//TRIM(clname), numrsw, ldwrt = .TRUE., kdlev = jpksed, cdcomp = 'SED' ) 83 83 lrst_sed = .TRUE. 84 84 ENDIF … … 123 123 cltra = TRIM(sedtrcd(jn)) 124 124 IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN 125 CALL iom_get( numrsr, jpdom_auto glo, TRIM(cltra), zdta(:,:,:,jn) )125 CALL iom_get( numrsr, jpdom_auto, TRIM(cltra), zdta(:,:,:,jn) ) 126 126 ELSE 127 127 zdta(:,:,:,jn) = 0.0 … … 142 142 cltra = TRIM(seddia3d(jn)) 143 143 IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN 144 CALL iom_get( numrsr, jpdom_auto glo, TRIM(cltra), zdta1(:,:,:,jn) )144 CALL iom_get( numrsr, jpdom_auto, TRIM(cltra), zdta1(:,:,:,jn) ) 145 145 ELSE 146 146 zdta1(:,:,:,jn) = 0.0 … … 169 169 cltra = "dbioturb" 170 170 IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN 171 CALL iom_get( numrsr, jpdom_auto glo, TRIM(cltra), zdta2(:,:,:) )171 CALL iom_get( numrsr, jpdom_auto, TRIM(cltra), zdta2(:,:,:) ) 172 172 ELSE 173 173 zdta2(:,:,:) = 0.0 … … 179 179 cltra = "irrig" 180 180 IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN 181 CALL iom_get( numrsr, jpdom_auto glo, TRIM(cltra), zdta2(:,:,:) )181 CALL iom_get( numrsr, jpdom_auto, TRIM(cltra), zdta2(:,:,:) ) 182 182 ELSE 183 183 zdta2(:,:,:) = 0.0 … … 189 189 cltra = "sedligand" 190 190 IF( iom_varid( numrsr, TRIM(cltra) , ldstop = .FALSE. ) > 0 ) THEN 191 CALL iom_get( numrsr, jpdom_auto glo, TRIM(cltra), zdta2(:,:,:) )191 CALL iom_get( numrsr, jpdom_auto, TRIM(cltra), zdta2(:,:,:) ) 192 192 ELSE 193 193 zdta2(:,:,:) = 0.0 -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/sedsfc.F90
r12377 r13540 48 48 49 49 50 DO_2D _11_1150 DO_2D( 1, 1, 1, 1 ) 51 51 ikt = mbkt(ji,jj) 52 52 IF ( tmask(ji,jj,ikt) == 1 ) THEN -
NEMO/branches/2020/r12377_ticket2386/src/TOP/PISCES/SED/trcdmp_sed.F90
r12377 r13540 21 21 USE trc ! ocean passive tracers variables 22 22 USE trcdta 23 USE prtctl _trc! Print control for debbuging23 USE prtctl ! Print control for debbuging 24 24 USE iom 25 25 … … 93 93 CALL trc_dta( kt, Kmm, sf_trcdta(jl), rf_trfac(jl), ztrcdta ) ! read tracer data at nit000 94 94 ! 95 DO_2D _11_1195 DO_2D( 1, 1, 1, 1 ) 96 96 ikt = mbkt(ji,jj) 97 97 tr(ji,jj,ikt,jn,Kbb) = ztrcdta(ji,jj,ikt) + ( tr(ji,jj,ikt,jn,Kbb) - ztrcdta(ji,jj,ikt) ) & … … 107 107 IF( sn_cfctl%l_prttrc ) THEN 108 108 WRITE(charout, FMT="('dmp ')") 109 CALL prt_ctl_ trc_info(charout)110 CALL prt_ctl _trc( tab4d=tr(:,:,:,:,Krhs), mask=tmask, clinfo=ctrcnm, clinfo2='trd' )109 CALL prt_ctl_info( charout, cdcomp = 'top' ) 110 CALL prt_ctl( tab4d_1=tr(:,:,:,:,Krhs), mask1=tmask, clinfo=ctrcnm, clinfo3='trd' ) 111 111 ENDIF 112 112 !
Note: See TracChangeset
for help on using the changeset viewer.
