Changeset 15529
- Timestamp:
- 2021-11-23T16:00:19+01:00 (2 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 6 edited
-
src/OCE/DOM/domzgr.F90 (modified) (4 diffs)
-
src/OCE/DOM/domzgr_substitute.h90 (modified) (1 diff)
-
src/OCE/DYN/dynhpg.F90 (modified) (4 diffs)
-
src/OCE/ISF/isfload.F90 (modified) (3 diffs)
-
src/OCE/ISF/isfstp.F90 (modified) (1 diff)
-
tests/ISOMIP+/MY_SRC/tradmp.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/DOM/domzgr.F90
r15052 r15529 236 236 INTEGER , DIMENSION(:,:) , INTENT(out) :: k_top , k_bot ! first & last ocean level 237 237 ! 238 INTEGER :: j k ! dummy loop index238 INTEGER :: ji,jj,jk ! dummy loop index 239 239 INTEGER :: inum, iatt 240 240 REAL(WP) :: z_zco, z_zps, z_sco, z_cav … … 270 270 ENDIF 271 271 ! ------- keep compatibility with OLD VERSION... end ------- 272 ! 273 ! !* ocean top and bottom level 274 CALL iom_get( inum, jpdom_global, 'top_level' , z2d ) ! 1st wet T-points (ISF) 275 k_top(:,:) = NINT( z2d(:,:) ) 276 CALL iom_get( inum, jpdom_global, 'bottom_level' , z2d ) ! last wet T-points 277 k_bot(:,:) = NINT( z2d(:,:) ) 272 278 ! 273 279 ! !* vertical scale factors … … 299 305 CALL e3_to_depth( pe3t_1d, pe3w_1d, pdept_1d, pdepw_1d ) ! 1D reference depth 300 306 CALL e3_to_depth( pe3t , pe3w , pdept , pdepw ) ! 3D depths 307 #if defined key_qco && key_isf 308 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 2, jpk ) ! vertical sum at partial cell xxxx other level 309 IF( jk == k_top(ji,jj) ) THEN ! first ocean point : partial cell 310 gdept_0(ji,jj,jk) = gdepw_0(ji,jj,jk ) + 0.5_wp * e3w_0(ji,jj,jk) ! = risfdep + 1/2 e3w_0(mikt) 311 ELSE ! other levels 312 gdept_0(ji,jj,jk) = gdept_0(ji,jj,jk-1) + e3w_0(ji,jj,jk) 313 ENDIF 314 END_3D 315 #endif 301 316 IF(lwp) THEN 302 317 WRITE(numout,*) … … 307 322 ENDIF 308 323 ! 309 ! !* ocean top and bottom level310 CALL iom_get( inum, jpdom_global, 'top_level' , z2d ) ! 1st wet T-points (ISF)311 k_top(:,:) = NINT( z2d(:,:) )312 CALL iom_get( inum, jpdom_global, 'bottom_level' , z2d ) ! last wet T-points313 k_bot(:,:) = NINT( z2d(:,:) )314 !315 324 ! reference depth for negative bathy (wetting and drying only) 316 325 IF( ll_wd ) CALL iom_get( inum, 'rn_wd_ref_depth' , ssh_ref ) -
NEMO/trunk/src/OCE/DOM/domzgr_substitute.h90
r14143 r15529 25 25 # define r1_hu(i,j,t) (r1_hu_0(i,j)/(1._wp+r3u(i,j,t))) 26 26 # define r1_hv(i,j,t) (r1_hv_0(i,j)/(1._wp+r3v(i,j,t))) 27 # if defined key_isf 28 # define gdept(i,j,k,t) ((gdept_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j)) 29 # define gdepw(i,j,k,t) ((gdepw_0(i,j,k)-risfdep(i,j))*(1._wp+r3t(i,j,t))+risfdep(i,j)) 30 # else 27 31 # define gdept(i,j,k,t) (gdept_0(i,j,k)*(1._wp+r3t(i,j,t))) 28 32 # define gdepw(i,j,k,t) (gdepw_0(i,j,k)*(1._wp+r3t(i,j,t))) 29 # define gde3w(i,j,k) (gdept_0(i,j,k)*(1._wp+r3t(i,j,Kmm))-ssh(i,j,Kmm)) 33 # endif 34 # define gde3w(i,j,k) (gdept(i,j,k,Kmm)-ssh(i,j,Kmm)) 30 35 #elif defined key_linssh 31 36 # define e3t(i,j,k,t) e3t_0(i,j,k) -
NEMO/trunk/src/OCE/DYN/dynhpg.F90
r14834 r15529 189 189 & CALL ctl_stop( 'dyn_hpg_init : ln_hpg_isf=T requires ln_isfcav=T and vice versa' ) 190 190 ! 191 #if defined key_qco192 IF( ln_hpg_isf ) THEN193 CALL ctl_stop( 'dyn_hpg_init : key_qco and ln_hpg_isf not yet compatible' )194 ENDIF195 #endif196 191 ! 197 192 ! ! Set nhpg from ln_hpg_... flags & consistency check … … 555 550 REAL(wp), DIMENSION(A2D(nn_hls),jpk ) :: zhpi, zhpj 556 551 REAL(wp), DIMENSION(A2D(nn_hls),jpts) :: zts_top 557 REAL(wp), DIMENSION(A2D(nn_hls)) :: zrhd top_oce552 REAL(wp), DIMENSION(A2D(nn_hls)) :: zrhd_top, zdep_top 558 553 !!---------------------------------------------------------------------- 559 554 ! … … 569 564 zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm) 570 565 zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm) 571 END_2D 572 CALL eos( zts_top, risfdep, zrhdtop_oce ) 566 zdep_top(ji,jj) = MAX( risfdep(ji,jj) , gdept(ji,jj,1,Kmm) ) 567 END_2D 568 CALL eos( zts_top, zdep_top, zrhd_top ) 573 569 574 570 ! !===========================! … … 582 578 ! ! we assume ISF is in isostatic equilibrium 583 579 zhpi(ji,jj,1) = zcoef0 * r1_e1u(ji,jj) * ( risfload(ji+1,jj) - risfload(ji,jj) & 584 & + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhd top_oce(ji+1,jj) ) &585 & - ze3w * ( rhd(ji ,jj,ikt ) + zrhd top_oce(ji ,jj) ) ) )580 & + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhd_top(ji+1,jj) ) & 581 & - ze3w * ( rhd(ji ,jj,ikt ) + zrhd_top(ji ,jj) ) ) ) 586 582 zhpj(ji,jj,1) = zcoef0 * r1_e2v(ji,jj) * ( risfload(ji,jj+1) - risfload(ji,jj) & 587 & + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhd top_oce(ji,jj+1) ) &588 & - ze3w * ( rhd(ji,jj ,ikt ) + zrhd top_oce(ji,jj ) ) ) )583 & + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhd_top(ji,jj+1) ) & 584 & - ze3w * ( rhd(ji,jj ,ikt ) + zrhd_top(ji,jj ) ) ) ) 589 585 ! ! s-coordinate pressure gradient correction (=0 if z coordinate) 590 586 zuap = -zcoef0 * ( rhd (ji+1,jj,1) + rhd (ji,jj,1) ) & -
NEMO/trunk/src/OCE/ISF/isfload.F90
r15053 r15529 84 84 zts_top(:,:,jp_tem) = rn_isfload_T ; zts_top(:,:,jp_sal) = rn_isfload_S 85 85 ! 86 DO jk = 1, jpk !- compute density of the water displaced by the ice shelf 86 DO jk = 1, jpk !- compute density of the water displaced by the ice shelf 87 #if defined key_qco && key_isf 88 CALL eos( zts_top(:,:,:), gdept_0(:,:,jk), zrhd(:,:,jk) ) 89 #else 87 90 CALL eos( zts_top(:,:,:), gdept(:,:,jk,Kmm), zrhd(:,:,jk) ) 88 !!st ==>> CALL eos( zts_top(:,:,:), gdept_0(:,:,jk), zrhd(:,:,jk) ) 91 #endif 89 92 END DO 90 93 ! … … 99 102 IF ( ikt > 1 ) THEN 100 103 ! ! top layer of the ice shelf 104 #if defined key_qco && key_isf 105 pload(ji,jj) = pload(ji,jj) + zrhd(ji,jj,1) * e3w_0(ji,jj,1) 106 ! 107 DO jk = 2, ikt-1 ! core layers of the ice shelf 108 pload(ji,jj) = pload(ji,jj) + (zrhd(ji,jj,jk-1) + zrhd(ji,jj,jk)) * e3w_0(ji,jj,jk) 109 END DO 110 ! ! deepest part of the ice shelf (between deepest T point and ice/ocean interface 111 pload(ji,jj) = pload(ji,jj) + ( zrhdtop_isf(ji,jj) + zrhd(ji,jj,ikt-1) ) & 112 & * ( risfdep(ji,jj) - gdept_0(ji,jj,ikt-1) ) 113 #else 101 114 pload(ji,jj) = pload(ji,jj) & 102 115 & + zrhd (ji,jj,1) * e3w(ji,jj,1,Kmm) … … 109 122 pload(ji,jj) = pload(ji,jj) + ( zrhdtop_isf(ji,jj) + zrhd(ji,jj,ikt-1) ) & 110 123 & * ( risfdep(ji,jj) - gdept(ji,jj,ikt-1,Kmm) ) 111 !!st ==>> & * ( risfdep(ji,jj) - gdept_0(ji,jj,ikt-1) ) 124 #endif 112 125 ! 113 126 END IF -
NEMO/trunk/src/OCE/ISF/isfstp.F90
r14995 r15529 195 195 ! 196 196 IF ( ln_isf ) THEN 197 #if key_qco 198 # if ! defined key_isf 199 CALL ctl_stop( 'STOP', 'isf_ctl: ice shelf requires both ln_isf=T AND key_isf activated' ) 200 # endif 201 #endif 197 202 WRITE(numout,*) ' Add debug print in isf module ln_isfdebug = ', ln_isfdebug 198 203 WRITE(numout,*) -
NEMO/trunk/tests/ISOMIP+/MY_SRC/tradmp.F90
r14995 r15529 53 53 !! * Substitutions 54 54 # include "do_loop_substitute.h90" 55 # include "domzgr_substitute.h90" 55 56 !!---------------------------------------------------------------------- 56 57 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 96 97 INTEGER :: ji, jj, jk, jn ! dummy loop indices 97 98 REAL(wp), DIMENSION(A2D(nn_hls),jpk,jpts) :: zts_dta 99 REAL(wp), DIMENSION(jpi,jpj,jpk) :: ze3t 98 100 REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE :: ztrdts 99 101 !!---------------------------------------------------------------------- … … 141 143 ! 142 144 ! outputs (clem trunk) 145 DO jk = 1, jpk 146 ze3t(:,:,jk) = e3t(:,:,jk,Kmm) 147 END DO 148 ! 143 149 IF( iom_use('hflx_dmp_cea') ) & 144 150 & CALL iom_put('hflx_dmp_cea', & 145 & SUM( ( pts(:,:,:,jp_tem,Krhs) - ztrdts(:,:,:,jp_tem) ) * e3t(:,:,:,Kmm), dim=3 ) * rcp * rho0 ) ! W/m2151 & SUM( ( pts(:,:,:,jp_tem,Krhs) - ztrdts(:,:,:,jp_tem) ) * ze3t(:,:,:), dim=3 ) * rcp * rho0 ) ! W/m2 146 152 IF( iom_use('sflx_dmp_cea') ) & 147 153 & CALL iom_put('sflx_dmp_cea', & 148 & SUM( ( pts(:,:,:,jp_sal,Krhs) - ztrdts(:,:,:,jp_sal) ) * e3t(:,:,:,Kmm), dim=3 ) * rho0 ) ! g/m2/s154 & SUM( ( pts(:,:,:,jp_sal,Krhs) - ztrdts(:,:,:,jp_sal) ) * ze3t(:,:,:), dim=3 ) * rho0 ) ! g/m2/s 149 155 ! 150 156 IF( l_trdtra ) THEN ! trend diagnostic
Note: See TracChangeset
for help on using the changeset viewer.
