Changeset 14154

Timestamp:

2020-12-10T18:32:40+01:00 (3 years ago)

Author:

kingr

Message:

Removed mass/salt conservation from SSH IAU code.

File:

• branches/UKMO/dev_r5518_GO6_package_FOAMv14_sshiau/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90 (modified) (1 diff)

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
-! 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
-         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) )
-                  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) )
-               END DO
-            END DO  
-         END DO  
-      ENDIF
-#endif
- 
       IF( l_trdtra )   THEN                      ! send trends for further diagnostics
          ztrdt(:,:,:) = tsa(:,:,:,jp_tem) - ztrdt(:,:,:)