Changeset 6605 for branches/UKMO/dev_r5518_sshinc_with_VVL
- Timestamp:
- 2016-05-23T16:16:30+02:00 (8 years ago)
- Location:
- branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
r6589 r6605 75 75 INTEGER, INTENT(in) :: kt ! time step 76 76 ! 77 INTEGER :: j k ! dummy loop indice77 INTEGER :: ji, jj, jk ! dummy loop indices 78 78 REAL(wp) :: z2dt, z1_rau0 ! local scalars 79 79 !!---------------------------------------------------------------------- … … 103 103 #if defined key_vvl 104 104 ! Don't directly adjust ssh but change hdivn at all levels instead 105 ! In trasbc also add in the heat and salt content associated with these changes at each level 105 ! In trasbc also add in the heat and salt content associated with these changes at each level 106 call lbc_lnk( ssh_iau, 'T', 1.0) 106 107 DO jk = 1, jpkm1 107 hdivn(:,:,jk) = hdivn(:,:,jk) - ( ssh_iau(:,:) / fse3t_n(:,:,jk) ) * ( e3t_0(:,:,jk) / ht_0(:,:) ) * tmask(:,:,jk) 108 DO jj = 2, jpjm1 109 DO ji = fs_2, fs_jpim1 ! vector opt. 110 hdivn(ji,jj,jk) = hdivn(ji,jj,jk) - ( ssh_iau(ji,jj) / ( ht_0(ji,jj) + 1.0 - tmask(ji,jj,jk) ) ) * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) * tmask(ji,jj,jk) 111 END DO 112 END DO 108 113 END DO 114 CALL lbc_lnk( hdivn, 'T', 1. ) ! Not sure that's necessary 109 115 ENDIF 110 116 #endif -
branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r6590 r6605 33 33 USE timing ! Timing 34 34 USE eosbn2 35 #if defined key_asminc36 USE asminc ! Assimilation increment37 #endif38 35 39 36 IMPLICIT NONE … … 290 287 END DO 291 288 ENDIF 292 293 #if defined key_asminc294 ! WARNING: THIS MAY WELL NOT BE REQUIRED - WE DON'T WANT TO CHANGE T&S BUT THIS MAY COMPENSATE ANOTHER TERM...295 ! Rate of change in e3t for each level is ssh_iau*e3t_0/ht_0296 ! Contribution to tsa should be rate of change in level / per m of ocean? (hence the division by fse3t_n)297 IF( ln_sshinc ) THEN ! input of heat and salt due to assimilation298 DO jj = 2, jpj299 DO ji = fs_2, fs_jpim1300 zdep = ssh_iau(ji,jj) / ht_0(ji,jj)301 DO jk = 1, jpkm1302 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) &303 & * ( 1.0 + zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) )304 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) &305 & * ( 1.0 + zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) )306 END DO307 END DO308 END DO309 ENDIF310 #endif311 289 312 290 IF( l_trdtra ) THEN ! send trends for further diagnostics
Note: See TracChangeset
for help on using the changeset viewer.