Changeset 14737

Timestamp:

2021-04-22T12:45:41+02:00 (3 years ago)

Author:

jwhile

Message:

Fixes

Location:

branches/UKMO/dev5518_gulf18_changes/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asminc.F90 (modified) (4 diffs)
• TRA/trasbc.F90 (modified) (3 diffs)

branches/UKMO/dev5518_gulf18_changes/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -78 +78 @@
    LOGICAL, PUBLIC :: ln_trainc = .FALSE.      !: No tracer (T and S) assimilation increments
    LOGICAL, PUBLIC :: ln_dyninc = .FALSE.      !: No dynamics (u and v) assimilation increments
+   LOGICAL, PUBLIC :: ln_ssh_hs_cons = .FALSE. !: Conserve heat and salt when adding SSH increment
    LOGICAL, PUBLIC :: ln_sshinc = .FALSE.      !: No sea surface height assimilation increment
    LOGICAL, PUBLIC :: ln_seaiceinc = .FALSE.   !: No sea ice concentration increment
@@ -179 +180 @@
          &                 ln_pno3inc, ln_psi4inc, ln_pdicinc, ln_palkinc, &
          &                 ln_pphinc, ln_po2inc, ln_ppo4inc,               &
-         &                 ln_asmdin, ln_asmiau,                           &
+         &                 ln_asmdin, ln_asmiau, ln_ssh_hs_cons,           &
          &                 nitbkg, nitdin, nitiaustr, nitiaufin, niaufn,   &
          &                 ln_salfix, salfixmin, nn_divdmp, nitavgbkg,     &
@@ -201 +202 @@
       ln_salfix = .FALSE.
 
+      ln_ssh_hs_cons = .FALSE.
       ln_seaiceinc = .FALSE.
       ln_sitinc = .FALSE.
@@ -234 +236 @@
          WRITE(numout,*) '      Logical switch for applying tracer increments            ln_trainc = ', ln_trainc
          WRITE(numout,*) '      Logical switch for applying velocity increments          ln_dyninc = ', ln_dyninc
+         WRITE(numout,*) '      Logical switch for conserving heat/salt when applying SSH increments ln_ssh_hs_cons = ', ln_ssh_hs_cons
          WRITE(numout,*) '      Logical switch for applying SSH increments               ln_sshinc = ', ln_sshinc
          WRITE(numout,*) '      Logical switch for applying SIC increments               ln_seaiceinc = ', ln_seaiceinc

branches/UKMO/dev5518_gulf18_changes/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -284 +284 @@
 
 #if defined key_asminc
-! WARNING: THIS MAY WELL NOT BE REQUIRED - WE DON'T WANT TO CHANGE T&S BUT THIS MAY COMPENSATE ANOTHER TERM...
-! Rate of change in e3t for each level is ssh_iau*e3t_0/ht_0
-! Contribution to tsa should be rate of change in level / per m of ocean? (hence the division by fse3t_n)
-      IF( ln_sshinc ) THEN         ! input of heat and salt due to assimilation
+      IF( ln_sshinc .and. ln_ssh_hs_cons ) THEN         ! conserve heat and salt when assimilating SSH
          DO jj = 2, jpj 
             DO ji = fs_2, fs_jpim1
@@ -293 +290 @@
                DO jk = 1, jpkm1
                   tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem)   &
-                                        &            + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )
+                                        &            + tsn(ji,jj,jk,jp_tem) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 
                   tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal)   &
-                                        &            + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )
+                                        &            + tsn(ji,jj,jk,jp_sal) * zdep * ( e3t_0(ji,jj,jk) / fse3t_n(ji,jj,jk) )* tmask(ji,jj,jk) 
                END DO
             END DO  
@@ -301 +298 @@
       ENDIF
 #endif
- 
+
       IF( l_trdtra )   THEN                      ! send trends for further diagnostics
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)