Changeset 14160
- Timestamp:
- 2020-12-11T13:56:57+01:00 (4 years ago)
- Location:
- branches/UKMO/AMM15_v3_6_STABLE_package_collate_sshiau/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/AMM15_v3_6_STABLE_package_collate_sshiau/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r13318 r14160 78 78 LOGICAL, PUBLIC :: ln_trainc = .FALSE. !: No tracer (T and S) assimilation increments 79 79 LOGICAL, PUBLIC :: ln_dyninc = .FALSE. !: No dynamics (u and v) assimilation increments 80 LOGICAL, PUBLIC :: ln_ssh_hs_cons = .FALSE. !: Conserve heat and salt when adding SSH increment 80 81 LOGICAL, PUBLIC :: ln_sshinc = .FALSE. !: No sea surface height assimilation increment 81 82 LOGICAL, PUBLIC :: ln_seaiceinc = .FALSE. !: No sea ice concentration increment … … 178 179 & ln_pno3inc, ln_psi4inc, ln_pdicinc, ln_palkinc, & 179 180 & ln_pphinc, ln_po2inc, ln_ppo4inc, & 180 & ln_asmdin, ln_asmiau, 181 & ln_asmdin, ln_asmiau, ln_ssh_hs_cons, & 181 182 & nitbkg, nitdin, nitiaustr, nitiaufin, niaufn, & 182 183 & ln_salfix, salfixmin, nn_divdmp, nitavgbkg, & … … 198 199 ln_salfix = .FALSE. 199 200 201 ln_ssh_hs_cons = .FALSE. 200 202 ln_seaiceinc = .FALSE. 201 203 ln_sitinc = .FALSE. … … 230 232 WRITE(numout,*) ' Logical switch for applying tracer increments ln_trainc = ', ln_trainc 231 233 WRITE(numout,*) ' Logical switch for applying velocity increments ln_dyninc = ', ln_dyninc 234 WRITE(numout,*) ' Logical switch for conserving heat/salt when applying SSH increments ln_ssh_hs_cons = ', ln_ssh_hs_cons 232 235 WRITE(numout,*) ' Logical switch for applying SSH increments ln_sshinc = ', ln_sshinc 233 236 WRITE(numout,*) ' Logical switch for applying SIC increments ln_seaiceinc = ', ln_seaiceinc -
branches/UKMO/AMM15_v3_6_STABLE_package_collate_sshiau/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r14153 r14160 283 283 ENDIF 284 284 285 #if defined key_asminc 286 IF( ln_sshinc .and. ln_ssh_hs_cons ) THEN ! conserve heat and salt when assimilating SSH 287 DO jj = 2, jpj 288 DO ji = fs_2, fs_jpim1 289 zdep = ssh_iau(ji,jj) / ( ht_0(ji,jj) + 1.0 - ssmask(ji, jj) ) 290 DO jk = 1, jpkm1 291 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) & 292 & + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 293 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) & 294 & + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 295 END DO 296 END DO 297 END DO 298 ENDIF 299 #endif 300 285 301 IF( l_trdtra ) THEN ! send trends for further diagnostics 286 302 ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)
Note: See TracChangeset
for help on using the changeset viewer.