Changeset 10009 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/TOP/trcsub.F90

Timestamp:

2018-07-29T11:23:51+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.1 time-level dimension on ssh

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/TOP/trcsub.F90 (modified) (11 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/TOP/trcsub.F90

@@ -104 +104 @@
            IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
            !
-           sshb_hold  (:,:) = sshn  (:,:)
+           sshb_hold  (:,:) = ssh   (:,:,Nnn)
            emp_b_hold (:,:) = emp_b (:,:)
            !
@@ -136 +136 @@
          ENDIF 
          !
-         sshn_tm  (:,:)         = sshn_tm  (:,:)         + sshn  (:,:) 
+         sshn_tm  (:,:)         = sshn_tm  (:,:)         + ssh   (:,:,Nnn) 
          rnf_tm   (:,:)         = rnf_tm   (:,:)         + rnf   (:,:) 
          h_rnf_tm (:,:)         = h_rnf_tm (:,:)         + h_rnf (:,:) 
@@ -168 +168 @@
             ENDIF
          ENDIF 
-         sshn_temp  (:,:)        = sshn  (:,:)
-         sshb_temp  (:,:)        = sshb  (:,:)
-         ssha_temp  (:,:)        = ssha  (:,:)
+         sshn_temp  (:,:)        = ssh   (:,:,Nnn)
+         sshb_temp  (:,:)        = ssh   (:,:,Nbb)
+         ssha_temp  (:,:)        = ssh   (:,:,Naa)
          rnf_temp   (:,:)        = rnf   (:,:)
          h_rnf_temp (:,:)        = h_rnf (:,:)
@@ -206 +206 @@
             ENDIF
          ENDIF 
-         sshn_tm  (:,:)          = sshn_tm    (:,:)       + sshn  (:,:) 
-         rnf_tm   (:,:)          = rnf_tm     (:,:)       + rnf   (:,:) 
-         h_rnf_tm (:,:)          = h_rnf_tm   (:,:)       + h_rnf (:,:) 
+         sshn_tm  (:,:)          = sshn_tm    (:,:)       + ssh   (:,:,Nnn) 
+         rnf_tm   (:,:)          = rnf_tm     (:,:)       + rnf   (:,:)
+         h_rnf_tm (:,:)          = h_rnf_tm   (:,:)       + h_rnf (:,:)
          hmld_tm  (:,:)          = hmld_tm    (:,:)       + hmld  (:,:)
          fr_i_tm  (:,:)          = fr_i_tm    (:,:)       + fr_i  (:,:)
@@ -216 +216 @@
          wndm_tm  (:,:)          = wndm_tm    (:,:)       + wndm  (:,:)
          !
-         sshn     (:,:)          = sshn_tm    (:,:) * r1_ndttrcp1 
-         sshb     (:,:)          = sshb_hold  (:,:)
+         ssh      (:,:,Nnn)      = sshn_tm    (:,:) * r1_ndttrcp1 
+         ssh      (:,:,Nbb)      = sshb_hold  (:,:)
          rnf      (:,:)          = rnf_tm     (:,:) * r1_ndttrcp1 
          h_rnf    (:,:)          = h_rnf_tm   (:,:) * r1_ndttrcp1 
@@ -324 +324 @@
          vslp_tm (:,:,:)     = vslp (:,:,:)
       ENDIF
-      sshn_tm  (:,:) = sshn  (:,:) 
+      sshn_tm  (:,:) = ssh   (:,:,Nnn) 
       rnf_tm   (:,:) = rnf   (:,:) 
       h_rnf_tm (:,:) = h_rnf (:,:) 
@@ -377 +377 @@
          vslp  (:,:,:)=  vslp_temp  (:,:,:)
       ENDIF
-      sshn  (:,:)     =  sshn_temp  (:,:)
-      sshb  (:,:)     =  sshb_temp  (:,:)
-      ssha  (:,:)     =  ssha_temp  (:,:)
+      ssh   (:,:,Nnn) =  sshn_temp  (:,:)
+      ssh   (:,:,Nbb) =  sshb_temp  (:,:)
+      ssh   (:,:,Naa) =  ssha_temp  (:,:)
       rnf   (:,:)     =  rnf_temp   (:,:)
       h_rnf (:,:)     =  h_rnf_temp (:,:)
@@ -417 +417 @@
       ENDIF
       !
-      sshb_hold  (:,:) = sshn  (:,:)
+      sshb_hold  (:,:) = ssh   (:,:,Nnn)
       emp_b_hold (:,:) = emp   (:,:)
-      sshn_tm    (:,:) = sshn  (:,:) 
+      sshn_tm    (:,:) = ssh   (:,:,Nnn) 
       rnf_tm     (:,:) = rnf   (:,:) 
       h_rnf_tm   (:,:) = h_rnf (:,:) 
@@ -449 +449 @@
       !!                ***  ROUTINE trc_sub_ssh  ***
       !!                   
-      !! ** Purpose :   compute the after ssh (ssha), the now vertical velocity
+      !! ** Purpose :   compute the after ssh, the now vertical velocity
       !!              and update the now vertical coordinate (ln_linssh=F).
       !!
@@ -497 +497 @@
       ! because emp_b field is initialized with the vlaues of emp field. Hence, 0.5 * ( emp + emp_b ) = emp
       z1_2rho0 = 0.5 * r1_rho0
-      ssha(:,:) = (  sshb(:,:) - rDt * ( z1_2rho0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
+      ssh(:,:,Naa) = (  ssh(:,:,Nbb) - rDt * ( z1_2rho0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * ssmask(:,:)
 
       IF( .NOT.ln_dynspg_ts ) THEN
@@ -506 +506 @@
 #endif
          IF( ln_bdy ) THEN
-            ssha(:,:) = ssha(:,:) * bdytmask(:,:)
-            CALL lbc_lnk( ssha, 'T', 1. ) 
+            ssh(:,:,Naa) = ssh(:,:,Naa) * bdytmask(:,:)
+            CALL lbc_lnk( ssh(:,:,Naa), 'T', 1. ) 
          ENDIF
       ENDIF