Changeset 14194 for branches/UKMO
- Timestamp:
- 2020-12-16T13:39:35+01:00 (3 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r12613 r14194 70 70 LOGICAL, PUBLIC :: ln_trainc = .FALSE. !: No tracer (T and S) assimilation increments 71 71 LOGICAL, PUBLIC :: ln_dyninc = .FALSE. !: No dynamics (u and v) assimilation increments 72 LOGICAL, PUBLIC :: ln_ssh_hs_cons = .FALSE. !: Conserve heat and salt when adding SSH increment 72 73 LOGICAL, PUBLIC :: ln_sshinc = .FALSE. !: No sea surface height assimilation increment 73 74 LOGICAL, PUBLIC :: ln_seaiceinc = .FALSE. !: No sea ice concentration increment … … 149 150 & ln_pno3inc, ln_psi4inc, ln_pdicinc, ln_palkinc, & 150 151 & ln_pphinc, ln_po2inc, & 151 & ln_asmdin, ln_asmiau, 152 & ln_asmdin, ln_asmiau, ln_ssh_hs_cons, & 152 153 & nitbkg, nitdin, nitiaustr, nitiaufin, niaufn, & 153 154 & ln_salfix, salfixmin, nn_divdmp, & … … 159 160 ! Read Namelist nam_asminc : assimilation increment interface 160 161 !----------------------------------------------------------------------- 162 ln_ssh_hs_cons = .FALSE. 161 163 ln_seaiceinc = .FALSE. 162 164 ln_sitinc = .FALSE. … … 183 185 WRITE(numout,*) ' Logical switch for applying tracer increments ln_trainc = ', ln_trainc 184 186 WRITE(numout,*) ' Logical switch for applying velocity increments ln_dyninc = ', ln_dyninc 187 WRITE(numout,*) ' Logical switch for conserving heat/salt when applying SSH increments ln_ssh_hs_cons = ', ln_ssh_hs_cons 185 188 WRITE(numout,*) ' Logical switch for applying SSH increments ln_sshinc = ', ln_sshinc 186 189 WRITE(numout,*) ' Logical switch for applying SIC increments ln_seaiceinc = ', ln_seaiceinc -
branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r14155 r14194 292 292 293 293 #if defined key_asminc 294 ! 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_0 296 ! 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 assimilation 294 IF( ln_sshinc .and. ln_ssh_hs_cons ) THEN ! conserve heat and salt when assimilating SSH 298 295 DO jj = 2, jpj 299 296 DO ji = fs_2, fs_jpim1 … … 301 298 DO jk = 1, jpkm1 302 299 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) & 303 & + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) 300 & + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 304 301 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) & 305 & + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) ) 302 & + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 306 303 END DO 307 304 END DO … … 309 306 ENDIF 310 307 #endif 311 308 312 309 IF( l_trdtra ) THEN ! send trends for further diagnostics 313 310 ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
Note: See TracChangeset
for help on using the changeset viewer.