Changeset 15036
- Timestamp:
- 2021-06-21T15:27:34+02:00 (3 years ago)
- Location:
- NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/domzgr_substitute.h90
r14143 r15036 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) … … 47 52 #endif 48 53 !!---------------------------------------------------------------------- 49 -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DYN/dynhpg.F90
r14227 r15036 188 188 IF( (.NOT.ln_hpg_isf .AND. ln_isfcav) .OR. (ln_hpg_isf .AND. .NOT.ln_isfcav) ) & 189 189 & CALL ctl_stop( 'dyn_hpg_init : ln_hpg_isf=T requires ln_isfcav=T and vice versa' ) 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 190 ! 197 191 ! ! Set nhpg from ln_hpg_... flags & consistency check … … 550 544 REAL(wp), DIMENSION(jpi,jpj,jpk ) :: zhpi, zhpj 551 545 REAL(wp), DIMENSION(jpi,jpj,jpts) :: zts_top 552 REAL(wp), DIMENSION(jpi,jpj) :: zrhd top_oce546 REAL(wp), DIMENSION(jpi,jpj) :: zrhd_top, zdep_top 553 547 !!---------------------------------------------------------------------- 554 548 ! … … 561 555 ! usefull to reduce residual current in the test case ISOMIP with no melting 562 556 DO ji = 1, jpi 563 DO jj = 1, jpj 564 ikt = mikt(ji,jj) 565 zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm) 566 zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm) 567 END DO 557 DO jj = 1, jpj 558 ikt = mikt(ji,jj) 559 zts_top(ji,jj,1) = ts(ji,jj,ikt,1,Kmm) 560 zts_top(ji,jj,2) = ts(ji,jj,ikt,2,Kmm) 561 zdep_top(ji,jj) = MAX( risfdep(ji,jj) , gdept(ji,jj,1,Kmm) ) 562 END DO 568 563 END DO 569 CALL eos( zts_top, risfdep, zrhdtop_oce ) 564 !!st CALL eos( zts_top, zdep_top, zrhd_top ) 565 CALL eos( zts_top, risfdep, zrhd_top ) 570 566 571 567 ! !===========================! … … 579 575 ! ! we assume ISF is in isostatic equilibrium 580 576 zhpi(ji,jj,1) = zcoef0 * r1_e1u(ji,jj) * ( risfload(ji+1,jj) - risfload(ji,jj) & 581 & + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhd top_oce(ji+1,jj) ) &582 & - ze3w * ( rhd(ji ,jj,ikt ) + zrhd top_oce(ji ,jj) ) ) )577 & + 0.5_wp * ( ze3wi1 * ( rhd(ji+1,jj,ikti1) + zrhd_top(ji+1,jj) ) & 578 & - ze3w * ( rhd(ji ,jj,ikt ) + zrhd_top(ji ,jj) ) ) ) 583 579 zhpj(ji,jj,1) = zcoef0 * r1_e2v(ji,jj) * ( risfload(ji,jj+1) - risfload(ji,jj) & 584 & + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhd top_oce(ji,jj+1) ) &585 & - ze3w * ( rhd(ji,jj ,ikt ) + zrhd top_oce(ji,jj ) ) ) )580 & + 0.5_wp * ( ze3wj1 * ( rhd(ji,jj+1,iktj1) + zrhd_top(ji,jj+1) ) & 581 & - ze3w * ( rhd(ji,jj ,ikt ) + zrhd_top(ji,jj ) ) ) ) 586 582 ! ! s-coordinate pressure gradient correction (=0 if z coordinate) 587 583 zuap = -zcoef0 * ( rhd (ji+1,jj,1) + rhd (ji,jj,1) ) & -
NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/ISF/isfstp.F90
r14143 r15036 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,*)
Note: See TracChangeset
for help on using the changeset viewer.