Changeset 12303 for branches/UKMO

Timestamp:

2020-01-07T15:42:06+01:00 (4 years ago)

Author:

kingr

Message:

Precalculate ht_n and use when applying SSH increment.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_IAUtest/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/sshwzv.F90 (modified) (2 diffs)
• TRA/trasbc.F90 (modified) (2 diffs)

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

@@ -76 +76 @@
       INTEGER             ::   ji, jj, jk              ! dummy loop indices
       REAL(wp)            ::   z2dt, z1_rau0           ! local scalars
+      REAL(wp), DIMENSION(jpi,jpj) :: ht_n
+      REAL(wp), DIMENSION(:,:)  , POINTER       ::   ztim     ! local array
       !!----------------------------------------------------------------------
       !
@@ -102 +104 @@
 ! 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  
+
+        ht_n(:,:) = fse3t_n(:,:,1) * tmask(:,:,1)
+        DO jk = 2, jpkm1
+           ht_n(:,:) = ht_n(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
+        END DO
+
+        ALLOCATE( ztim(jpi,jpj) )
+        ztim(:,:) = ssh_iau(:,:) / ( ht_n(:,:) + 1.0 - ssmask(:,:) )
         DO jk = 1, jpkm1                                 
-                 hdivn(:,:,jk) = hdivn(:,:,jk) - ( ssh_iau(:,:) / ( ht_0(:,:) + 1.0 - ssmask(:,:) ) ) * ( e3t_0(:,:,jk) / fse3t_n(:,:,jk) ) * tmask(:,:,jk) 
+                 hdivn(:,:,jk) = hdivn(:,:,jk) - ztim(:,:) * tmask(:,:,jk)  
         END DO
+        DEALLOCATE(ztim)
         CALL lbc_lnk( hdivn, 'T', 1. ) ! Not sure that's necessary
       ENDIF

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

@@ -124 +124 @@
       REAL(wp) ::   zfact, z1_e3t, zdep
       REAL(wp) ::   zalpha, zhk
+      REAL(wp), DIMENSION(jpi,jpj) :: ht_n
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdt, ztrds
       !!----------------------------------------------------------------------
@@ -288 +289 @@
 ! 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
+
+         ht_n(:,:) = fse3t_n(:,:,1) * tmask(:,:,1)
+         DO jk = 2, jpkm1
+            ht_n(:,:) = ht_n(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
+         END DO
+         
          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
+               zdep = ssh_iau(ji,jj) / ( ht_n(ji,jj) + 1.0 - ssmask(ji, jj) )
+                  tsa(ji,jj,:,jp_tem) = tsa(ji,jj,:,jp_tem)   &
+                                        &            + tsn(ji,jj,:,jp_tem) * zdep
+                  tsa(ji,jj,:,jp_sal) = tsa(ji,jj,:,jp_sal)   &
+                                        &            + tsn(ji,jj,:,jp_sal) * zdep
             END DO  
          END DO