- Timestamp:
- 2015-01-20T15:26:13+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
r4486 r5038 31 31 USE bdy_par 32 32 USE bdydyn2d ! bdy_ssh routine 33 USE diaar5, ONLY: lk_diaar534 33 USE iom 35 34 #if defined key_agrif … … 111 110 ! 112 111 z1_rau0 = 0.5_wp * r1_rau0 113 ssha(:,:) = ( sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) ) ) * tmask(:,:,1)112 ssha(:,:) = ( sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) ) ) * ssmask(:,:) 114 113 115 114 #if ! defined key_dynspg_ts … … 138 137 ! ! outputs ! 139 138 ! !------------------------------! 140 CALL iom_put( "ssh" , sshn 141 CALL iom_put( "ssh2", sshn(:,:) * sshn(:,:) ) ! square of sea surface height139 CALL iom_put( "ssh" , sshn ) ! sea surface height 140 if( iom_use('ssh2') ) CALL iom_put( "ssh2", sshn(:,:) * sshn(:,:) ) ! square of sea surface height 142 141 ! 143 142 IF(ln_ctl) CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha - : ', mask1=tmask, ovlap=1 ) … … 233 232 ! !------------------------------! 234 233 CALL iom_put( "woce", wn ) ! vertical velocity 235 IF( lk_diaar5 ) THEN! vertical mass transport & its square value234 IF( iom_use('w_masstr') .OR. iom_use('w_masstr2') ) THEN ! vertical mass transport & its square value 236 235 CALL wrk_alloc( jpi, jpj, z2d ) 237 236 CALL wrk_alloc( jpi, jpj, jpk, z3d ) … … 241 240 z3d(:,:,jk) = wn(:,:,jk) * z2d(:,:) 242 241 END DO 243 CALL iom_put( "w_masstr" , z3d 244 CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) )242 CALL iom_put( "w_masstr" , z3d ) 243 IF( iom_use('w_masstr2') ) CALL iom_put( "w_masstr2", z3d(:,:,:) * z3d(:,:,:) ) 245 244 CALL wrk_dealloc( jpi, jpj, z2d ) 246 245 CALL wrk_dealloc( jpi, jpj, jpk, z3d ) … … 291 290 ELSE !** Leap-Frog time-stepping: Asselin filter + swap 292 291 sshb(:,:) = sshn(:,:) + atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) ) ! before <-- now filtered 293 IF( lk_vvl ) sshb(:,:) = sshb(:,:) - atfp * rdt / rau0 * ( emp_b(:,:) - emp(:,:) ) * tmask(:,:,1)292 IF( lk_vvl ) sshb(:,:) = sshb(:,:) - atfp * rdt / rau0 * ( emp_b(:,:) - emp(:,:) ) * ssmask(:,:) 294 293 sshn(:,:) = ssha(:,:) ! now <-- after 295 294 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.