Changeset 10009 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ASM

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

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ASM

Files:

• asmbkg.F90 (modified) (2 diffs)
• asminc.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ASM/asmbkg.F90

@@ -103 +103 @@
             CALL iom_rstput( kt, nitbkg_r, inum, 'tn'     , tsn(:,:,:,jp_tem) )
             CALL iom_rstput( kt, nitbkg_r, inum, 'sn'     , tsn(:,:,:,jp_sal) )
-            CALL iom_rstput( kt, nitbkg_r, inum, 'sshn'   , sshn              )
+            CALL iom_rstput( kt, nitbkg_r, inum, 'sshn'   , ssh(:,:,Nnn)      )
             IF( ln_zdftke )   CALL iom_rstput( kt, nitbkg_r, inum, 'en'     , en                )
             !
@@ -138 +138 @@
             CALL iom_rstput( kt, nitdin_r, inum, 'tn'     , tsn(:,:,:,jp_tem) )
             CALL iom_rstput( kt, nitdin_r, inum, 'sn'     , tsn(:,:,:,jp_sal) )
-            CALL iom_rstput( kt, nitdin_r, inum, 'sshn'   , sshn              )
+            CALL iom_rstput( kt, nitdin_r, inum, 'sshn'   , ssh(:,:,Nnn)      )
 #if defined key_si3
             IF( nn_ice == 2 ) THEN

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ASM/asminc.F90

@@ -728 +728 @@
             IF(lwp) THEN
                WRITE(numout,*) 
-               WRITE(numout,*) 'ssh_asm_inc : SSH IAU at time step = ', &
-                  &  kt,' with IAU weight = ', wgtiau(it)
+               WRITE(numout,*) 'ssh_asm_inc : SSH IAU at time step = ', kt,' with IAU weight = ', wgtiau(it)
                WRITE(numout,*) '~~~~~~~~~~~~'
             ENDIF
@@ -755 +754 @@
          IF ( kt == nitdin_r ) THEN
             !
-            l_1st_euler = .TRUE.                         ! Force Euler forward step
-            !
-            sshn(:,:) = ssh_bkg(:,:) + ssh_bkginc(:,:)   ! Initialize the now fields the background + increment
-            !
-            sshb(:,:) = sshn(:,:)                        ! Update before fields
-            e3t_b(:,:,:) = e3t_n(:,:,:)
+            l_1st_euler = .TRUE.                            ! Force Euler forward step
+            !
+            ssh(:,:,Nnn) = ssh_bkg(:,:) + ssh_bkginc(:,:)   ! Initialize the now fields the background + increment
+            !
+            ssh  (:,:,Nbb) = ssh  (:,:,Nnn)                 ! Update before fields
+            e3t_b(:,:,:)   = e3t_n(:,:,:)
             
 !!gm BUG :   missing the update of all other scale factors (e3u e3v e3w  etc... _n and _b)