Changeset 9863 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/trcsub.F90

Timestamp:

2018-06-30T12:51:02+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): simplified implementation of the Euler stepping at nit000

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/TOP/trcsub.F90 (modified) (4 diffs)

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

@@ -466 +466 @@
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(wp) ::   zcoefu, zcoefv, zcoeff, z2dt, z1_2dt, z1_rau0   ! local scalars
+      REAL(wp) ::   zcoefu, zcoefv, zcoeff, z1_2rau0   ! local scalars
       REAL(wp), DIMENSION(jpi,jpj) :: zhdiv
       !!---------------------------------------------------------------------
@@ -486 +486 @@
       CALL div_hor( kt )                              ! Horizontal divergence & Relative vorticity
       !
-      z2dt = 2._wp * rdt                              ! set time step size (Euler/Leapfrog)
-      IF( neuler == 0 .AND. kt == nittrc000 )   z2dt = rdt
-
       !                                           !------------------------------!
       !                                           !   After Sea Surface Height   !
@@ -499 +496 @@
       ! In forward Euler time stepping case, the same formulation as in the leap-frog case can be used
       ! because emp_b field is initialized with the vlaues of emp field. Hence, 0.5 * ( emp + emp_b ) = emp
-      z1_rau0 = 0.5 / rau0
-      ssha(:,:) = (  sshb(:,:) - z2dt * ( z1_rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
+      z1_2rau0 = 0.5 * r1_rau0
+      ssha(:,:) = (  sshb(:,:) - r2dt * ( z1_2rau0 * ( emp_b(:,:) + emp(:,:) ) + zhdiv(:,:) )  ) * tmask(:,:,1)
 
       IF( .NOT.ln_dynspg_ts ) THEN
@@ -517 +514 @@
       !                                           !     Now Vertical Velocity    !
       !                                           !------------------------------!
-      z1_2dt = 1.e0 / z2dt
       DO jk = jpkm1, 1, -1                             ! integrate from the bottom the hor. divergence
          ! - ML - need 3 lines here because replacement of e3t by its expression yields too long lines otherwise
          wn(:,:,jk) = wn(:,:,jk+1) -   e3t_n(:,:,jk) * hdivn(:,:,jk)        &
             &                      - ( e3t_a(:,:,jk) - e3t_b(:,:,jk) )    &
-            &                         * tmask(:,:,jk) * z1_2dt
+            &                         * tmask(:,:,jk) * r1_2dt
          IF( ln_bdy ) wn(:,:,jk) = wn(:,:,jk) * bdytmask(:,:)
       END DO