Changeset 6589

Timestamp:

2016-05-20T14:29:30+02:00 (8 years ago)

Author:

drew

Message:

Committing Chris Harris' changes to the application of the ssh increments to the whole water column (through hdiv) instead of into the ssh field. Note: This changes are expermental and currently under test.

File:

• branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_sshinc_with_VVL/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90

@@ -96 +96 @@
       IF( neuler == 0 .AND. kt == nit000 )   z2dt = rdt
 
+
+#if defined key_asminc
+      !                                                ! Include the IAU weighted SSH increment
+      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
+         CALL ssh_asm_inc( kt )
+#if defined key_vvl
+! Don't directly adjust ssh but change hdivn at all levels instead
+! In trasbc also add in the heat and salt content associated with these changes at each level
+        DO jk = 1, jpkm1                                 
+          hdivn(:,:,jk) = hdivn(:,:,jk) - ( ssh_iau(:,:) / fse3t_n(:,:,jk) ) * ( e3t_0(:,:,jk) / ht_0(:,:) ) * tmask(:,:,jk) 
+        END DO
+      ENDIF
+#endif
+#endif
+
+
       !                                           !------------------------------!
       !                                           !   After Sea Surface Height   !
@@ -124 +140 @@
 #endif
 
-#if defined key_asminc
-      !                                                ! Include the IAU weighted SSH increment
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau ) THEN
-         CALL ssh_asm_inc( kt )
-         ssha(:,:) = ssha(:,:) + z2dt * ssh_iau(:,:)
-#if defined key_vvl
-! Also add heat and salt fluxes associated with this volume change to keep heat and salt content unchanged.
-         qns(:,:) = qns(:,:) + ssh_iau(:,:) * rau0_rcp * tsn(:,:,1,jp_tem)
-         sfx(:,:) = sfx(:,:) + ssh_iau(:,:) * rau0     * tsn(:,:,1,jp_sal)       
-      ENDIF
-#endif
-#endif
 
       !                                           !------------------------------!