- Timestamp:
- 2020-02-24T14:00:21+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/BENCH/EXPREF/namelist_cfg_orca025_like
r12406 r12443 189 189 ln_dynspg_ts = .true. ! split-explicit free surface 190 190 ln_bt_auto = .false. ! Number of sub-step defined from: 191 nn_ baro= 30 ! =F : the number of sub-step in rn_Dt seconds191 nn_e = 30 ! =F : the number of sub-step in rn_Dt seconds 192 192 / 193 193 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/BENCH/EXPREF/namelist_cfg_orca12_like
r12406 r12443 188 188 ln_dynspg_ts = .true. ! split-explicit free surface 189 189 ln_bt_auto = .false. ! Number of sub-step defined from: 190 nn_ baro= 30 ! =F : the number of sub-step in rn_Dt seconds190 nn_e = 30 ! =F : the number of sub-step in rn_Dt seconds 191 191 / 192 192 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/BENCH/EXPREF/namelist_cfg_orca1_like
r12406 r12443 188 188 ln_dynspg_ts = .true. ! split-explicit free surface 189 189 ln_bt_auto = .false. ! Number of sub-step defined from: 190 nn_ baro= 30 ! =F : the number of sub-step in rn_Dt seconds190 nn_e = 30 ! =F : the number of sub-step in rn_Dt seconds 191 191 / 192 192 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/BENCH/MY_SRC/diawri.F90
r12377 r12443 169 169 170 170 IF ( iom_use("taubot") ) THEN ! bottom stress 171 zztmp = r au0 * 0.25171 zztmp = rho0 * 0.25 172 172 z2d(:,:) = 0._wp 173 173 DO jj = 2, jpjm1 … … 214 214 IF( iom_use('w_masstr') .OR. iom_use('w_masstr2') ) THEN ! vertical mass transport & its square value 215 215 ! Caution: in the VVL case, it only correponds to the baroclinic mass transport. 216 z2d(:,:) = r au0 * e1e2t(:,:)216 z2d(:,:) = rho0 * e1e2t(:,:) 217 217 DO jk = 1, jpk 218 218 z3d(:,:,jk) = ww(:,:,jk) * z2d(:,:) … … 257 257 END DO 258 258 END DO 259 CALL iom_put( "heatc", r au0_rcp * z2d ) ! vertically integrated heat content (J/m2)259 CALL iom_put( "heatc", rho0_rcp * z2d ) ! vertically integrated heat content (J/m2) 260 260 ENDIF 261 261 … … 269 269 END DO 270 270 END DO 271 CALL iom_put( "saltc", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)271 CALL iom_put( "saltc", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 272 272 ENDIF 273 273 ! … … 295 295 z2d(:,:) = 0.e0 296 296 DO jk = 1, jpkm1 297 z3d(:,:,jk) = r au0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk)297 z3d(:,:,jk) = rho0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk) 298 298 z2d(:,:) = z2d(:,:) + z3d(:,:,jk) 299 299 END DO … … 332 332 z3d(:,:,jpk) = 0.e0 333 333 DO jk = 1, jpkm1 334 z3d(:,:,jk) = r au0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk)334 z3d(:,:,jk) = rho0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk) 335 335 END DO 336 336 CALL iom_put( "v_masstr", z3d ) ! mass transport in j-direction … … 373 373 END DO 374 374 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 375 CALL iom_put( "tosmint", r au0 * z2d ) ! Vertical integral of temperature375 CALL iom_put( "tosmint", rho0 * z2d ) ! Vertical integral of temperature 376 376 ENDIF 377 377 IF( iom_use("somint") ) THEN … … 385 385 END DO 386 386 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 387 CALL iom_put( "somint", r au0 * z2d ) ! Vertical integral of salinity387 CALL iom_put( "somint", rho0 * z2d ) ! Vertical integral of salinity 388 388 ENDIF 389 389 -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/BENCH/MY_SRC/zdfiwm.F90
r12377 r12443 85 85 !! This is divided into three components: 86 86 !! 1. Bottom-intensified low-mode dissipation at critical slopes 87 !! zemx_iwm(z) = ( ecri_iwm / r au0 ) * EXP( -(H-z)/hcri_iwm )87 !! zemx_iwm(z) = ( ecri_iwm / rho0 ) * EXP( -(H-z)/hcri_iwm ) 88 88 !! / ( 1. - EXP( - H/hcri_iwm ) ) * hcri_iwm 89 89 !! where hcri_iwm is the characteristic length scale of the bottom 90 90 !! intensification, ecri_iwm a map of available power, and H the ocean depth. 91 91 !! 2. Pycnocline-intensified low-mode dissipation 92 !! zemx_iwm(z) = ( epyc_iwm / r au0 ) * ( sqrt(rn2(z))^nn_zpyc )92 !! zemx_iwm(z) = ( epyc_iwm / rho0 ) * ( sqrt(rn2(z))^nn_zpyc ) 93 93 !! / SUM( sqrt(rn2(z))^nn_zpyc * e3w(z) ) 94 94 !! where epyc_iwm is a map of available power, and nn_zpyc … … 96 96 !! energy dissipation. 97 97 !! 3. WKB-height dependent high mode dissipation 98 !! zemx_iwm(z) = ( ebot_iwm / r au0 ) * rn2(z) * EXP(-z_wkb(z)/hbot_iwm)98 !! zemx_iwm(z) = ( ebot_iwm / rho0 ) * rn2(z) * EXP(-z_wkb(z)/hbot_iwm) 99 99 !! / SUM( rn2(z) * EXP(-z_wkb(z)/hbot_iwm) * e3w(z) ) 100 100 !! where hbot_iwm is the characteristic length scale of the WKB bottom … … 150 150 DO ji = 1, jpi 151 151 zhdep(ji,jj) = gdepw_0(ji,jj,mbkt(ji,jj)+1) ! depth of the ocean 152 zfact(ji,jj) = r au0 * ( 1._wp - EXP( -zhdep(ji,jj) / hcri_iwm(ji,jj) ) )152 zfact(ji,jj) = rho0 * ( 1._wp - EXP( -zhdep(ji,jj) / hcri_iwm(ji,jj) ) ) 153 153 IF( zfact(ji,jj) /= 0._wp ) zfact(ji,jj) = ecri_iwm(ji,jj) / zfact(ji,jj) 154 154 END DO … … 179 179 DO jj = 1, jpj 180 180 DO ji = 1, jpi 181 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = epyc_iwm(ji,jj) / ( r au0 * zfact(ji,jj) )181 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = epyc_iwm(ji,jj) / ( rho0 * zfact(ji,jj) ) 182 182 END DO 183 183 END DO … … 196 196 DO jj= 1, jpj 197 197 DO ji = 1, jpi 198 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = epyc_iwm(ji,jj) / ( r au0 * zfact(ji,jj) )198 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = epyc_iwm(ji,jj) / ( rho0 * zfact(ji,jj) ) 199 199 END DO 200 200 END DO … … 246 246 DO jj = 1, jpj 247 247 DO ji = 1, jpi 248 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = ebot_iwm(ji,jj) / ( r au0 * zfact(ji,jj) )248 IF( zfact(ji,jj) /= 0 ) zfact(ji,jj) = ebot_iwm(ji,jj) / ( rho0 * zfact(ji,jj) ) 249 249 END DO 250 250 END DO … … 259 259 ! Calculate molecular kinematic viscosity 260 260 znu_t(:,:,:) = 1.e-4_wp * ( 17.91_wp - 0.53810_wp * ts(:,:,:,jp_tem,Kmm) + 0.00694_wp * ts(:,:,:,jp_tem,Kmm) * ts(:,:,:,jp_tem,Kmm) & 261 & + 0.02305_wp * ts(:,:,:,jp_sal,Kmm) ) * tmask(:,:,:) * r1_r au0261 & + 0.02305_wp * ts(:,:,:,jp_sal,Kmm) ) * tmask(:,:,:) * r1_rho0 262 262 DO jk = 2, jpkm1 263 263 znu_w(:,:,jk) = 0.5_wp * ( znu_t(:,:,jk-1) + znu_t(:,:,jk) ) * wmask(:,:,jk) … … 305 305 END DO 306 306 CALL mpp_sum( 'zdfiwm', zztmp ) 307 zztmp = r au0 * zztmp ! Global integral of rauo * Kz * N^2 = power contributing to mixing307 zztmp = rho0 * zztmp ! Global integral of rauo * Kz * N^2 = power contributing to mixing 308 308 ! 309 309 IF(lwp) THEN … … 349 349 !* output useful diagnostics: Kz*N^2 , 350 350 !!gm Kz*N2 should take into account the ratio avs/avt if it is used.... (see diaar5) 351 ! vertical integral of r au0 * Kz * N^2 , energy density (zemx_iwm)351 ! vertical integral of rho0 * Kz * N^2 , energy density (zemx_iwm) 352 352 IF( iom_use("bflx_iwm") .OR. iom_use("pcmap_iwm") ) THEN 353 353 ALLOCATE( z2d(jpi,jpj) , z3d(jpi,jpj,jpk) ) … … 357 357 z2d(:,:) = z2d(:,:) + e3w(:,:,jk,Kmm) * z3d(:,:,jk) * wmask(:,:,jk) 358 358 END DO 359 z2d(:,:) = r au0 * z2d(:,:)359 z2d(:,:) = rho0 * z2d(:,:) 360 360 CALL iom_put( "bflx_iwm", z3d ) 361 361 CALL iom_put( "pcmap_iwm", z2d ) -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/CANAL/EXPREF/namelist_cfg
r12406 r12443 208 208 ln_bt_av = .true. ! Time filtering of barotropic variables 209 209 nn_bt_flt = 1 ! Time filter choice = 0 None 210 ! ! = 1 Boxcar over nn_ barosub-steps211 ! ! = 2 Boxcar over 2*nn_ baro" "210 ! ! = 1 Boxcar over nn_e sub-steps 211 ! ! = 2 Boxcar over 2*nn_e " " 212 212 ln_bt_auto = .false. ! Number of sub-step defined from: 213 nn_ baro= 24 ! =F : the number of sub-step in rn_Dt seconds213 nn_e = 24 ! =F : the number of sub-step in rn_Dt seconds 214 214 / 215 215 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/CANAL/MY_SRC/diawri.F90
r12406 r12443 169 169 170 170 IF ( iom_use("taubot") ) THEN ! bottom stress 171 zztmp = r au0 * 0.25171 zztmp = rho0 * 0.25 172 172 z2d(:,:) = 0._wp 173 173 DO jj = 2, jpjm1 … … 212 212 IF( iom_use('w_masstr') .OR. iom_use('w_masstr2') ) THEN ! vertical mass transport & its square value 213 213 ! Caution: in the VVL case, it only correponds to the baroclinic mass transport. 214 z2d(:,:) = r au0 * e1e2t(:,:)214 z2d(:,:) = rho0 * e1e2t(:,:) 215 215 DO jk = 1, jpk 216 216 z3d(:,:,jk) = ww(:,:,jk) * z2d(:,:) … … 272 272 END DO 273 273 END DO 274 CALL iom_put( "heatc", r au0_rcp * z2d ) ! vertically integrated heat content (J/m2)274 CALL iom_put( "heatc", rho0_rcp * z2d ) ! vertically integrated heat content (J/m2) 275 275 ENDIF 276 276 … … 284 284 END DO 285 285 END DO 286 CALL iom_put( "saltc", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)286 CALL iom_put( "saltc", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 287 287 ENDIF 288 288 ! … … 296 296 END DO 297 297 END DO 298 CALL iom_put( "salt2c", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)298 CALL iom_put( "salt2c", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 299 299 ENDIF 300 300 ! … … 395 395 z2d(:,:) = 0.e0 396 396 DO jk = 1, jpkm1 397 z3d(:,:,jk) = r au0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk)397 z3d(:,:,jk) = rho0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk) 398 398 z2d(:,:) = z2d(:,:) + z3d(:,:,jk) 399 399 END DO … … 432 432 z3d(:,:,jpk) = 0.e0 433 433 DO jk = 1, jpkm1 434 z3d(:,:,jk) = r au0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk)434 z3d(:,:,jk) = rho0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk) 435 435 END DO 436 436 CALL iom_put( "v_masstr", z3d ) ! mass transport in j-direction … … 473 473 END DO 474 474 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 475 CALL iom_put( "tosmint", r au0 * z2d ) ! Vertical integral of temperature475 CALL iom_put( "tosmint", rho0 * z2d ) ! Vertical integral of temperature 476 476 ENDIF 477 477 IF( iom_use("somint") ) THEN … … 485 485 END DO 486 486 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 487 CALL iom_put( "somint", r au0 * z2d ) ! Vertical integral of salinity487 CALL iom_put( "somint", rho0 * z2d ) ! Vertical integral of salinity 488 488 ENDIF 489 489 -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/CANAL/MY_SRC/domvvl.F90
r12424 r12443 609 609 ELSE 610 610 tilde_e3t_b(:,:,:) = tilde_e3t_n(:,:,:) & 611 & + atfp * ( tilde_e3t_b(:,:,:) - 2.0_wp * tilde_e3t_n(:,:,:) + tilde_e3t_a(:,:,:) )611 & + rn_atfp * ( tilde_e3t_b(:,:,:) - 2.0_wp * tilde_e3t_n(:,:,:) + tilde_e3t_a(:,:,:) ) 612 612 ENDIF 613 613 tilde_e3t_n(:,:,:) = tilde_e3t_a(:,:,:) -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/CANAL/MY_SRC/usrdef_istate.F90
r10425 r12443 218 218 ! 219 219 zr_lambda2 = 1._wp / zlambda**2 220 zP0 = r au0 * zf0 * zumax * zlambda * SQRT(EXP(1._wp)/2._wp)220 zP0 = rho0 * zf0 * zumax * zlambda * SQRT(EXP(1._wp)/2._wp) 221 221 ! 222 222 DO jj=1, jpj … … 225 225 zy = gphit(ji,jj) * 1.e3 226 226 ! Surface pressure: P(x,y,z) = F(z) * Psurf(x,y) 227 zpsurf = zP0 * EXP(-(zx**2+zy**2)*zr_lambda2) - r au0 * ff_t(ji,jj) * rn_uzonal * zy227 zpsurf = zP0 * EXP(-(zx**2+zy**2)*zr_lambda2) - rho0 * ff_t(ji,jj) * rn_uzonal * zy 228 228 ! Sea level: 229 229 pssh(ji,jj) = 0. … … 231 231 zdt = pssh(ji,jj) 232 232 zdzF = (1._wp - EXP(zdt-zH)) / (zH - 1._wp + EXP(-zH)) ! F'(z) 233 zrho1 = r au0 * (1._wp + zn2*zdt/grav) - zdzF * zpsurf / grav ! -1/g Dz(P) = -1/g * F'(z) * Psurf(x,y)233 zrho1 = rho0 * (1._wp + zn2*zdt/grav) - zdzF * zpsurf / grav ! -1/g Dz(P) = -1/g * F'(z) * Psurf(x,y) 234 234 pssh(ji,jj) = zpsurf / (zrho1*grav) * ptmask(ji,jj,1) ! ssh = Psurf / (Rho*g) 235 235 END DO … … 237 237 DO jk=1,jpk 238 238 zdt = pdept(ji,jj,jk) 239 zrho1 = r au0 * (1._wp + zn2*zdt/grav)239 zrho1 = rho0 * (1._wp + zn2*zdt/grav) 240 240 IF (zdt < zH) THEN 241 241 zdzF = (1._wp-EXP(zdt-zH)) / (zH-1._wp + EXP(-zH)) ! F'(z) 242 242 zrho1 = zrho1 - zdzF * zpsurf / grav ! -1/g Dz(P) = -1/g * F'(z) * Psurf(x,y) 243 243 ENDIF 244 ! pts(ji,jj,jk,jp_tem) = (20._wp + (r au0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)245 pts(ji,jj,jk,jp_tem) = (10._wp + (r au0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)244 ! pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk) 245 pts(ji,jj,jk,jp_tem) = (10._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk) 246 246 END DO 247 247 END DO … … 261 261 IF (zdu < zH) THEN 262 262 zf = (zH-1._wp-zdu+EXP(zdu-zH)) / (zH-1._wp+EXP(-zH)) 263 zdyPs = - za * zy * EXP(-(zx**2+zy**2)*zr_lambda2) - r au0 * ff_t(ji,jj) * rn_uzonal264 pu(ji,jj,jk) = - zf / ( r au0 * ff_t(ji,jj) ) * zdyPs * ptmask(ji,jj,jk) * ptmask(ji+1,jj,jk)263 zdyPs = - za * zy * EXP(-(zx**2+zy**2)*zr_lambda2) - rho0 * ff_t(ji,jj) * rn_uzonal 264 pu(ji,jj,jk) = - zf / ( rho0 * ff_t(ji,jj) ) * zdyPs * ptmask(ji,jj,jk) * ptmask(ji+1,jj,jk) 265 265 ELSE 266 266 pu(ji,jj,jk) = 0._wp … … 279 279 zf = (zH-1._wp-zdv+EXP(zdv-zH)) / (zH-1._wp+EXP(-zH)) 280 280 zdxPs = - za * zx * EXP(-(zx**2+zy**2)*zr_lambda2) 281 pv(ji,jj,jk) = zf / ( r au0 * ff_f(ji,jj) ) * zdxPs * ptmask(ji,jj,jk) * ptmask(ji,jj+1,jk)281 pv(ji,jj,jk) = zf / ( rho0 * ff_f(ji,jj) ) * zdxPs * ptmask(ji,jj,jk) * ptmask(ji,jj+1,jk) 282 282 ELSE 283 283 pv(ji,jj,jk) = 0._wp -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/ISOMIP+/MY_SRC/eosbn2.F90
r12353 r12443 191 191 !! *** ROUTINE eos_insitu *** 192 192 !! 193 !! ** Purpose : Compute the in situ density (ratio rho/r au0) from193 !! ** Purpose : Compute the in situ density (ratio rho/rho0) from 194 194 !! potential temperature and salinity using an equation of state 195 195 !! selected in the nameos namelist 196 196 !! 197 !! ** Method : prd(t,s,z) = ( rho(t,s,z) - r au0 ) / rau0197 !! ** Method : prd(t,s,z) = ( rho(t,s,z) - rho0 ) / rho0 198 198 !! with prd in situ density anomaly no units 199 199 !! t TEOS10: CT or EOS80: PT Celsius … … 201 201 !! z depth meters 202 202 !! rho in situ density kg/m^3 203 !! r au0 reference density kg/m^3203 !! rho0 reference density kg/m^3 204 204 !! 205 205 !! ln_teos10 : polynomial TEOS-10 equation of state is used for rho(t,s,z). … … 210 210 !! 211 211 !! ln_seos : simplified equation of state 212 !! prd(t,s,z) = ( -a0*(1+lambda/2*(T-T0)+mu*z+nu*(S-S0))*(T-T0) + b0*(S-S0) ) / r au0212 !! prd(t,s,z) = ( -a0*(1+lambda/2*(T-T0)+mu*z+nu*(S-S0))*(T-T0) + b0*(S-S0) ) / rho0 213 213 !! linear case function of T only: rn_alpha<>0, other coefficients = 0 214 214 !! linear eos function of T and S: rn_alpha and rn_beta<>0, other coefficients=0 … … 216 216 !! 217 217 !! ln_leos : linear ISOMIP equation of state 218 !! prd(t,s,z) = ( -a0*(T-T0) + b0*(S-S0) ) / r au0218 !! prd(t,s,z) = ( -a0*(T-T0) + b0*(S-S0) ) / rho0 219 219 !! setup for ISOMIP linear eos 220 220 !! … … 273 273 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 274 274 ! 275 prd(ji,jj,jk) = ( zn * r1_r au0 - 1._wp ) * ztm ! density anomaly (masked)275 prd(ji,jj,jk) = ( zn * r1_rho0 - 1._wp ) * ztm ! density anomaly (masked) 276 276 ! 277 277 END DO … … 293 293 & - rn_nu * zt * zs 294 294 ! 295 prd(ji,jj,jk) = zn * r1_r au0 * ztm ! density anomaly (masked)295 prd(ji,jj,jk) = zn * r1_rho0 * ztm ! density anomaly (masked) 296 296 END DO 297 297 END DO … … 308 308 ztm = tmask(ji,jj,jk) 309 309 ! 310 zn = r au0 * ( - rn_a0 * zt + rn_b0 * zs )310 zn = rho0 * ( - rn_a0 * zt + rn_b0 * zs ) 311 311 ! 312 prd(ji,jj,jk) = zn * r1_r au0 * ztm ! density anomaly (masked)312 prd(ji,jj,jk) = zn * r1_rho0 * ztm ! density anomaly (masked) 313 313 END DO 314 314 END DO … … 328 328 !! *** ROUTINE eos_insitu_pot *** 329 329 !! 330 !! ** Purpose : Compute the in situ density (ratio rho/r au0) and the330 !! ** Purpose : Compute the in situ density (ratio rho/rho0) and the 331 331 !! potential volumic mass (Kg/m3) from potential temperature and 332 332 !! salinity fields using an equation of state selected in the … … 410 410 prhop(ji,jj,jk) = prhop(ji,jj,jk) + zn0_sto(jsmp) ! potential density referenced at the surface 411 411 ! 412 prd(ji,jj,jk) = prd(ji,jj,jk) + ( zn_sto(jsmp) * r1_r au0 - 1._wp ) ! density anomaly (masked)412 prd(ji,jj,jk) = prd(ji,jj,jk) + ( zn_sto(jsmp) * r1_rho0 - 1._wp ) ! density anomaly (masked) 413 413 END DO 414 414 prhop(ji,jj,jk) = 0.5_wp * prhop(ji,jj,jk) * ztm / nn_sto_eos … … 454 454 prhop(ji,jj,jk) = zn0 * ztm ! potential density referenced at the surface 455 455 ! 456 prd(ji,jj,jk) = ( zn * r1_r au0 - 1._wp ) * ztm ! density anomaly (masked)456 prd(ji,jj,jk) = ( zn * r1_rho0 - 1._wp ) * ztm ! density anomaly (masked) 457 457 END DO 458 458 END DO … … 473 473 & + rn_b0 * ( 1._wp - 0.5_wp*rn_lambda2*zs ) * zs & 474 474 & - rn_nu * zt * zs 475 prhop(ji,jj,jk) = ( r au0 + zn ) * ztm475 prhop(ji,jj,jk) = ( rho0 + zn ) * ztm 476 476 ! ! density anomaly (masked) 477 477 zn = zn - ( rn_a0 * rn_mu1 * zt + rn_b0 * rn_mu2 * zs ) * zh 478 prd(ji,jj,jk) = zn * r1_r au0 * ztm478 prd(ji,jj,jk) = zn * r1_rho0 * ztm 479 479 ! 480 480 END DO … … 492 492 ztm = tmask(ji,jj,jk) 493 493 ! ! potential density referenced at the surface 494 zn = r au0 * ( - rn_a0 * zt + rn_b0 * zs )495 prhop(ji,jj,jk) = ( r au0 + zn ) * ztm494 zn = rho0 * ( - rn_a0 * zt + rn_b0 * zs ) 495 prhop(ji,jj,jk) = ( rho0 + zn ) * ztm 496 496 ! ! density anomaly (masked) 497 prd(ji,jj,jk) = zn * r1_r au0 * ztm497 prd(ji,jj,jk) = zn * r1_rho0 * ztm 498 498 ! 499 499 END DO … … 514 514 !! *** ROUTINE eos_insitu_2d *** 515 515 !! 516 !! ** Purpose : Compute the in situ density (ratio rho/r au0) from516 !! ** Purpose : Compute the in situ density (ratio rho/rho0) from 517 517 !! potential temperature and salinity using an equation of state 518 518 !! selected in the nameos namelist. * 2D field case … … 569 569 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 570 570 ! 571 prd(ji,jj) = zn * r1_r au0 - 1._wp ! unmasked in situ density anomaly571 prd(ji,jj) = zn * r1_rho0 - 1._wp ! unmasked in situ density anomaly 572 572 ! 573 573 END DO … … 589 589 & - rn_nu * zt * zs 590 590 ! 591 prd(ji,jj) = zn * r1_r au0 ! unmasked in situ density anomaly591 prd(ji,jj) = zn * r1_rho0 ! unmasked in situ density anomaly 592 592 ! 593 593 END DO … … 605 605 zh = pdep (ji,jj) ! depth at the partial step level 606 606 ! 607 zn = r au0 * ( - rn_a0 * zt + rn_b0 * zs )608 ! 609 prd(ji,jj) = zn * r1_r au0 ! unmasked in situ density anomaly607 zn = rho0 * ( - rn_a0 * zt + rn_b0 * zs ) 608 ! 609 prd(ji,jj) = zn * r1_rho0 ! unmasked in situ density anomaly 610 610 ! 611 611 END DO … … 676 676 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 677 677 ! 678 pab(ji,jj,jk,jp_tem) = zn * r1_r au0 * ztm678 pab(ji,jj,jk,jp_tem) = zn * r1_rho0 * ztm 679 679 ! 680 680 ! beta … … 697 697 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 698 698 ! 699 pab(ji,jj,jk,jp_sal) = zn / zs * r1_r au0 * ztm699 pab(ji,jj,jk,jp_sal) = zn / zs * r1_rho0 * ztm 700 700 ! 701 701 END DO … … 714 714 ! 715 715 zn = rn_a0 * ( 1._wp + rn_lambda1*zt + rn_mu1*zh ) + rn_nu*zs 716 pab(ji,jj,jk,jp_tem) = zn * r1_r au0 * ztm ! alpha716 pab(ji,jj,jk,jp_tem) = zn * r1_rho0 * ztm ! alpha 717 717 ! 718 718 zn = rn_b0 * ( 1._wp - rn_lambda2*zs - rn_mu2*zh ) - rn_nu*zt 719 pab(ji,jj,jk,jp_sal) = zn * r1_r au0 * ztm ! beta719 pab(ji,jj,jk,jp_sal) = zn * r1_rho0 * ztm ! beta 720 720 ! 721 721 END DO … … 733 733 ztm = tmask(ji,jj,jk) ! land/sea bottom mask = surf. mask 734 734 ! 735 zn = rn_a0 * r au0736 pab(ji,jj,jk,jp_tem) = zn * r1_r au0 * ztm ! alpha737 ! 738 zn = rn_b0 * r au0739 pab(ji,jj,jk,jp_sal) = zn * r1_r au0 * ztm ! beta735 zn = rn_a0 * rho0 736 pab(ji,jj,jk,jp_tem) = zn * r1_rho0 * ztm ! alpha 737 ! 738 zn = rn_b0 * rho0 739 pab(ji,jj,jk,jp_sal) = zn * r1_rho0 * ztm ! beta 740 740 ! 741 741 END DO … … 809 809 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 810 810 ! 811 pab(ji,jj,jp_tem) = zn * r1_r au0811 pab(ji,jj,jp_tem) = zn * r1_rho0 812 812 ! 813 813 ! beta … … 830 830 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 831 831 ! 832 pab(ji,jj,jp_sal) = zn / zs * r1_r au0832 pab(ji,jj,jp_sal) = zn / zs * r1_rho0 833 833 ! 834 834 ! … … 848 848 ! 849 849 zn = rn_a0 * ( 1._wp + rn_lambda1*zt + rn_mu1*zh ) + rn_nu*zs 850 pab(ji,jj,jp_tem) = zn * r1_r au0 ! alpha850 pab(ji,jj,jp_tem) = zn * r1_rho0 ! alpha 851 851 ! 852 852 zn = rn_b0 * ( 1._wp - rn_lambda2*zs - rn_mu2*zh ) - rn_nu*zt 853 pab(ji,jj,jp_sal) = zn * r1_r au0 ! beta853 pab(ji,jj,jp_sal) = zn * r1_rho0 ! beta 854 854 ! 855 855 END DO … … 867 867 zh = pdep (ji,jj) ! depth at the partial step level 868 868 ! 869 zn = rn_a0 * r au0870 pab(ji,jj,jp_tem) = zn * r1_r au0 ! alpha871 ! 872 zn = rn_b0 * r au0873 pab(ji,jj,jp_sal) = zn * r1_r au0 ! beta869 zn = rn_a0 * rho0 870 pab(ji,jj,jp_tem) = zn * r1_rho0 ! alpha 871 ! 872 zn = rn_b0 * rho0 873 pab(ji,jj,jp_sal) = zn * r1_rho0 ! beta 874 874 ! 875 875 END DO … … 941 941 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 942 942 ! 943 pab(jp_tem) = zn * r1_r au0943 pab(jp_tem) = zn * r1_rho0 944 944 ! 945 945 ! beta … … 962 962 zn = ( ( zn3 * zh + zn2 ) * zh + zn1 ) * zh + zn0 963 963 ! 964 pab(jp_sal) = zn / zs * r1_r au0964 pab(jp_sal) = zn / zs * r1_rho0 965 965 ! 966 966 ! … … 973 973 ! 974 974 zn = rn_a0 * ( 1._wp + rn_lambda1*zt + rn_mu1*zh ) + rn_nu*zs 975 pab(jp_tem) = zn * r1_r au0 ! alpha975 pab(jp_tem) = zn * r1_rho0 ! alpha 976 976 ! 977 977 zn = rn_b0 * ( 1._wp - rn_lambda2*zs - rn_mu2*zh ) - rn_nu*zt 978 pab(jp_sal) = zn * r1_r au0 ! beta978 pab(jp_sal) = zn * r1_rho0 ! beta 979 979 ! 980 980 CASE( np_leos ) !== linear ISOMIP EOS ==! … … 984 984 zh = pdep ! depth at the partial step level 985 985 ! 986 zn = rn_a0 * r au0987 pab(jp_tem) = zn * r1_r au0 ! alpha988 ! 989 zn = rn_b0 * r au0990 pab(jp_sal) = zn * r1_r au0 ! beta986 zn = rn_a0 * rho0 987 pab(jp_tem) = zn * r1_rho0 ! alpha 988 ! 989 zn = rn_b0 * rho0 990 pab(jp_sal) = zn * r1_rho0 ! beta 991 991 ! 992 992 CASE DEFAULT … … 1214 1214 !! ** Method : PE is defined analytically as the vertical 1215 1215 !! primitive of EOS times -g integrated between 0 and z>0. 1216 !! pen is the nonlinear bsq-PE anomaly: pen = ( PE - r au0 gz ) / rau0 gz - rd1216 !! pen is the nonlinear bsq-PE anomaly: pen = ( PE - rho0 gz ) / rho0 gz - rd 1217 1217 !! = 1/z * /int_0^z rd dz - rd 1218 1218 !! where rd is the density anomaly (see eos_rhd function) 1219 1219 !! ab_pe are partial derivatives of PE anomaly with respect to T and S: 1220 !! ab_pe(1) = - 1/(r au0 gz) * dPE/dT + drd/dT = - d(pen)/dT1221 !! ab_pe(2) = 1/(r au0 gz) * dPE/dS + drd/dS = d(pen)/dS1220 !! ab_pe(1) = - 1/(rho0 gz) * dPE/dT + drd/dT = - d(pen)/dT 1221 !! ab_pe(2) = 1/(rho0 gz) * dPE/dS + drd/dS = d(pen)/dS 1222 1222 !! 1223 1223 !! ** Action : - pen : PE anomaly given at T-points … … 1267 1267 zn = ( zn2 * zh + zn1 ) * zh + zn0 1268 1268 ! 1269 ppen(ji,jj,jk) = zn * zh * r1_r au0 * ztm1269 ppen(ji,jj,jk) = zn * zh * r1_rho0 * ztm 1270 1270 ! 1271 1271 ! alphaPE non-linear anomaly … … 1282 1282 zn = ( zn2 * zh + zn1 ) * zh + zn0 1283 1283 ! 1284 pab_pe(ji,jj,jk,jp_tem) = zn * zh * r1_r au0 * ztm1284 pab_pe(ji,jj,jk,jp_tem) = zn * zh * r1_rho0 * ztm 1285 1285 ! 1286 1286 ! betaPE non-linear anomaly … … 1297 1297 zn = ( zn2 * zh + zn1 ) * zh + zn0 1298 1298 ! 1299 pab_pe(ji,jj,jk,jp_sal) = zn / zs * zh * r1_r au0 * ztm1299 pab_pe(ji,jj,jk,jp_sal) = zn / zs * zh * r1_rho0 * ztm 1300 1300 ! 1301 1301 END DO … … 1312 1312 zh = gdept(ji,jj,jk,Kmm) ! depth in meters at t-point 1313 1313 ztm = tmask(ji,jj,jk) ! tmask 1314 zn = 0.5_wp * zh * r1_r au0 * ztm1314 zn = 0.5_wp * zh * r1_rho0 * ztm 1315 1315 ! ! Potential Energy 1316 1316 ppen(ji,jj,jk) = ( rn_a0 * rn_mu1 * zt + rn_b0 * rn_mu2 * zs ) * zn … … 1332 1332 zh = gdept(ji,jj,jk,Kmm) ! depth in meters at t-point 1333 1333 ztm = tmask(ji,jj,jk) ! tmask 1334 zn = 0.5_wp * zh * r1_r au0 * ztm1334 zn = 0.5_wp * zh * r1_rho0 * ztm 1335 1335 ! ! Potential Energy 1336 1336 ppen(ji,jj,jk) = 0. … … 1379 1379 IF(lwm) WRITE( numond, nameos ) 1380 1380 ! 1381 r au0 = 1027.51_wp !: volumic mass of reference [kg/m3]1381 rho0 = 1027.51_wp !: volumic mass of reference [kg/m3] 1382 1382 rcp = 3974.00_wp !: heat capacity [J/K] 1383 1383 ! … … 1793 1793 WRITE(numout,*) ' ==>>> use of simplified eos: ' 1794 1794 WRITE(numout,*) ' rhd(dT=T-10,dS=S-35,Z) = [-a0*(1+lambda1/2*dT+mu1*Z)*dT ' 1795 WRITE(numout,*) ' + b0*(1+lambda2/2*dT+mu2*Z)*dS - nu*dT*dS] / r au0'1795 WRITE(numout,*) ' + b0*(1+lambda2/2*dT+mu2*Z)*dS - nu*dT*dS] / rho0' 1796 1796 WRITE(numout,*) ' with the following coefficients :' 1797 1797 WRITE(numout,*) ' thermal exp. coef. rn_a0 = ', rn_a0 … … 1810 1810 WRITE(numout,*) 1811 1811 WRITE(numout,*) ' use of linear ISOMIP eos: rhd(dT=T-(-1),dS=S-(34.2),Z) = ' 1812 WRITE(numout,*) ' [ -a0*dT + b0*dS ]/r au0'1812 WRITE(numout,*) ' [ -a0*dT + b0*dS ]/rho0' 1813 1813 WRITE(numout,*) 1814 1814 WRITE(numout,*) ' thermal exp. coef. rn_a0 = ', rn_a0 … … 1822 1822 END SELECT 1823 1823 ! 1824 r au0_rcp = rau0 * rcp1825 r1_r au0 = 1._wp / rau01824 rho0_rcp = rho0 * rcp 1825 r1_rho0 = 1._wp / rho0 1826 1826 r1_rcp = 1._wp / rcp 1827 r1_r au0_rcp = 1._wp / rau0_rcp1827 r1_rho0_rcp = 1._wp / rho0_rcp 1828 1828 ! 1829 1829 IF(lwp) THEN … … 1840 1840 IF(lwp) WRITE(numout,*) 1841 1841 IF(lwp) WRITE(numout,*) ' Associated physical constant' 1842 IF(lwp) WRITE(numout,*) ' volumic mass of reference r au0 = ', rau0 , ' kg/m^3'1843 IF(lwp) WRITE(numout,*) ' 1. / r au0 r1_rau0 = ', r1_rau0, ' m^3/kg'1842 IF(lwp) WRITE(numout,*) ' volumic mass of reference rho0 = ', rho0 , ' kg/m^3' 1843 IF(lwp) WRITE(numout,*) ' 1. / rho0 r1_rho0 = ', r1_rho0, ' m^3/kg' 1844 1844 IF(lwp) WRITE(numout,*) ' ocean specific heat rcp = ', rcp , ' J/Kelvin' 1845 IF(lwp) WRITE(numout,*) ' r au0 * rcp rau0_rcp = ', rau0_rcp1846 IF(lwp) WRITE(numout,*) ' 1. / ( r au0 * rcp ) r1_rau0_rcp = ', r1_rau0_rcp1845 IF(lwp) WRITE(numout,*) ' rho0 * rcp rho0_rcp = ', rho0_rcp 1846 IF(lwp) WRITE(numout,*) ' 1. / ( rho0 * rcp ) r1_rho0_rcp = ', r1_rho0_rcp 1847 1847 ! 1848 1848 END SUBROUTINE eos_init -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/ISOMIP+/MY_SRC/sbcfwb.F90
r12406 r12443 122 122 ! avoid the model to blow up for large ssh drop (isomip OCEAN3 with melt switch off and uniform T/S) 123 123 IF (ln_isfcpl .AND. ln_isfcpl_cons) THEN 124 z_fwf = z_fwf + glob_sum( 'sbcfwb', e1e2t(:,:) * risfcpl_cons_ssh(:,:) * r au0 )124 z_fwf = z_fwf + glob_sum( 'sbcfwb', e1e2t(:,:) * risfcpl_cons_ssh(:,:) * rho0 ) 125 125 END IF 126 126 ! … … 155 155 a_fwb_b = a_fwb ! mean sea level taking into account the ice+snow 156 156 ! sum over the global domain 157 a_fwb = glob_sum( 'sbcfwb', e1e2t(:,:) * ( ssh(:,:,Kmm) + snwice_mass(:,:) * r1_r au0 ) )157 a_fwb = glob_sum( 'sbcfwb', e1e2t(:,:) * ( ssh(:,:,Kmm) + snwice_mass(:,:) * r1_rho0 ) ) 158 158 a_fwb = a_fwb * 1.e+3 / ( area * rday * 365. ) ! convert in Kg/m3/s = mm/s 159 159 !!gm ! !!bug 365d year -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_cen2_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg
r12406 r12443 216 216 ln_bt_av = .true. ! Time filtering of barotropic variables 217 217 nn_bt_flt = 1 ! Time filter choice = 0 None 218 ! ! = 1 Boxcar over nn_ barosub-steps219 ! ! = 2 Boxcar over 2*nn_ baro" "218 ! ! = 1 Boxcar over nn_e sub-steps 219 ! ! = 2 Boxcar over 2*nn_e " " 220 220 ln_bt_auto = .true. ! Number of sub-step defined from: 221 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds221 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 222 222 / 223 223 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_eenH_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_een_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ene_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_cen2_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_flux_ubs_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_eenH_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_een_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ene_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT4_vect_ens_cfg
r12406 r12443 144 144 ln_bt_av = .true. ! Time filtering of barotropic variables 145 145 nn_bt_flt = 1 ! Time filter choice = 0 None 146 ! ! = 1 Boxcar over nn_ barosub-steps147 ! ! = 2 Boxcar over 2*nn_ baro" "146 ! ! = 1 Boxcar over nn_e sub-steps 147 ! ! = 2 Boxcar over 2*nn_e " " 148 148 ln_bt_auto = .true. ! Number of sub-step defined from: 149 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds149 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 150 150 / 151 151 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/LOCK_EXCHANGE/MY_SRC/usrdef_istate.F90
r10074 r12443 60 60 ! 61 61 ! rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1) 62 ! rho = r au0 - rn_a0 * (T-10)62 ! rho = rho0 - rn_a0 * (T-10) 63 63 ! delta_T = 25 degrees ==>> delta_rho = 25 * rn_a0 = 5 kg/m3 64 64 ! -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg
r12406 r12443 216 216 ln_bt_av = .true. ! Time filtering of barotropic variables 217 217 nn_bt_flt = 1 ! Time filter choice = 0 None 218 ! ! = 1 Boxcar over nn_ barosub-steps219 ! ! = 2 Boxcar over 2*nn_ baro" "218 ! ! = 1 Boxcar over nn_e sub-steps 219 ! ! = 2 Boxcar over 2*nn_e " " 220 220 ln_bt_auto = .true. ! Number of sub-step defined from: 221 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds221 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 222 222 / 223 223 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg
r12406 r12443 155 155 ln_bt_av = .true. ! Time filtering of barotropic variables 156 156 nn_bt_flt = 1 ! Time filter choice = 0 None 157 ! ! = 1 Boxcar over nn_ barosub-steps158 ! ! = 2 Boxcar over 2*nn_ baro" "157 ! ! = 1 Boxcar over nn_e sub-steps 158 ! ! = 2 Boxcar over 2*nn_e " " 159 159 ln_bt_auto = .true. ! Number of sub-step defined from: 160 nn_ baro= 1 ! =F : the number of sub-step in rn_Dt seconds160 nn_e = 1 ! =F : the number of sub-step in rn_Dt seconds 161 161 / 162 162 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/OVERFLOW/MY_SRC/usrdef_istate.F90
r10074 r12443 60 60 ! 61 61 ! rn_a0 = 0.2 ! thermal expension coefficient (nn_eos= 1) 62 ! rho = r au0 - rn_a0 * (T-10)62 ! rho = rho0 - rn_a0 * (T-10) 63 63 ! delta_T = 10 degrees ==>> delta_rho = 10 * rn_a0 = 2 kg/m3 64 64 ! -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/VORTEX/EXPREF/1_namelist_cfg
r12406 r12443 213 213 ln_bt_av = .true. ! Time filtering of barotropic variables 214 214 nn_bt_flt = 1 ! Time filter choice = 0 None 215 ! ! = 1 Boxcar over nn_ barosub-steps216 ! ! = 2 Boxcar over 2*nn_ baro" "215 ! ! = 1 Boxcar over nn_e sub-steps 216 ! ! = 2 Boxcar over 2*nn_e " " 217 217 ln_bt_auto = .false. ! Number of sub-step defined from: 218 nn_ baro= 24 ! =F : the number of sub-step in rn_Dt seconds218 nn_e = 24 ! =F : the number of sub-step in rn_Dt seconds 219 219 / 220 220 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/VORTEX/EXPREF/namelist_cfg
r12406 r12443 204 204 ln_bt_av = .true. ! Time filtering of barotropic variables 205 205 nn_bt_flt = 1 ! Time filter choice = 0 None 206 ! ! = 1 Boxcar over nn_ barosub-steps207 ! ! = 2 Boxcar over 2*nn_ baro" "206 ! ! = 1 Boxcar over nn_e sub-steps 207 ! ! = 2 Boxcar over 2*nn_e " " 208 208 ln_bt_auto = .false. ! Number of sub-step defined from: 209 nn_ baro= 24 ! =F : the number of sub-step in rn_Dt seconds209 nn_e = 24 ! =F : the number of sub-step in rn_Dt seconds 210 210 / 211 211 !----------------------------------------------------------------------- -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/VORTEX/MY_SRC/domvvl.F90
r12424 r12443 637 637 ELSE 638 638 tilde_e3t_b(:,:,:) = tilde_e3t_n(:,:,:) & 639 & + atfp * ( tilde_e3t_b(:,:,:) - 2.0_wp * tilde_e3t_n(:,:,:) + tilde_e3t_a(:,:,:) )639 & + rn_atfp * ( tilde_e3t_b(:,:,:) - 2.0_wp * tilde_e3t_n(:,:,:) + tilde_e3t_a(:,:,:) ) 640 640 ENDIF 641 641 tilde_e3t_n(:,:,:) = tilde_e3t_a(:,:,:) -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/VORTEX/MY_SRC/usrdef_istate.F90
r10425 r12443 69 69 zH = 0.5_wp * 5000._wp 70 70 ! 71 zP0 = r au0 * zf0 * zumax * zlambda * SQRT(EXP(1._wp)/2._wp)71 zP0 = rho0 * zf0 * zumax * zlambda * SQRT(EXP(1._wp)/2._wp) 72 72 ! 73 73 ! Sea level: … … 77 77 zx = glamt(ji,jj) * 1.e3 78 78 zy = gphit(ji,jj) * 1.e3 79 zrho1 = r au0 + za * EXP(-(zx**2+zy**2)/zlambda**2)79 zrho1 = rho0 + za * EXP(-(zx**2+zy**2)/zlambda**2) 80 80 pssh(ji,jj) = zP0 * EXP(-(zx**2+zy**2)/zlambda**2)/(zrho1*grav) * ptmask(ji,jj,1) 81 81 END DO … … 89 89 DO jk=1,jpk 90 90 zdt = pdept(ji,jj,jk) 91 zrho1 = r au0 * (1._wp + zn2*zdt/grav)91 zrho1 = rho0 * (1._wp + zn2*zdt/grav) 92 92 IF (zdt < zH) THEN 93 93 zrho1 = zrho1 - zP0 * (1._wp-EXP(zdt-zH)) & 94 94 & * EXP(-(zx**2+zy**2)/zlambda**2) / (grav*(zH -1._wp + exp(-zH))); 95 95 ENDIF 96 pts(ji,jj,jk,jp_tem) = (20._wp + (r au0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)96 pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk) 97 97 END DO 98 98 END DO … … 103 103 ! 104 104 ! velocities: 105 za = 2._wp * zP0 / (zf0 * r au0 * zlambda**2)105 za = 2._wp * zP0 / (zf0 * rho0 * zlambda**2) 106 106 DO ji=1, jpim1 107 107 DO jj=1, jpj -
NEMO/branches/2020/KERNEL-03_Storkey_Coward_RK3_stage2/tests/WAD/EXPREF/namelist_cfg
r12406 r12443 344 344 ln_dynspg_ts = .true. ! split-explicit free surface 345 345 ln_bt_auto = .false. ! Number of sub-step defined from: 346 nn_ baro= 12 ! =F : the number of sub-step in rn_Dt seconds346 nn_e = 12 ! =F : the number of sub-step in rn_Dt seconds 347 347 / 348 348 !-----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.