Changeset 14161

Timestamp:

2020-12-11T13:57:22+01:00 (3 years ago)

Author:

kingr

Message:

Allow heat/salt conservation when assimilating SSH to be namelist controlled.

Location:

branches/UKMO/dev_r5518_GO6_package_FOAMv14_sshiau/NEMOGCM/NEMO/OPA_SRC

Files:

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

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

@@ -70 +70 @@
    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
@@ -149 +150 @@
          &                 ln_pno3inc, ln_psi4inc, ln_pdicinc, ln_palkinc, &
          &                 ln_pphinc, ln_po2inc,                           &
-         &                 ln_asmdin, ln_asmiau,                           &
+         &                 ln_asmdin, ln_asmiau, ln_ssh_hs_cons,           &
          &                 nitbkg, nitdin, nitiaustr, nitiaufin, niaufn,   &
          &                 ln_salfix, salfixmin, nn_divdmp,                &
@@ -159 +160 @@
       ! Read Namelist nam_asminc : assimilation increment interface
       !-----------------------------------------------------------------------
+      ln_ssh_hs_cons = .FALSE.
       ln_seaiceinc = .FALSE.
       ln_sitinc = .FALSE.
@@ -183 +185 @@
          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/dev_r5518_GO6_package_FOAMv14_sshiau/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -291 +291 @@
       IF( iom_use('rnf_x_sss') )   CALL iom_put( "rnf_x_sss", rnf*tsn(:,:,1,jp_sal) )   ! runoff term on sss
 
+#if defined key_asminc
+      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
+               zdep = ssh_iau(ji,jj) / ( ht_0(ji,jj) + 1.0 - ssmask(ji, jj) )
+               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) )* 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) )* tmask(ji,jj,jk) 
+               END DO
+            END DO  
+         END DO  
+      ENDIF
+#endif
+
       IF( l_trdtra )   THEN                      ! send trends for further diagnostics
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)