Changeset 9923 for NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OFF

Timestamp:

2018-07-11T10:24:17+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): step I.2: dev_r9838_ENHANCE04_MLF

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OFF

Files:

• dtadyn.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OFF/dtadyn.F90

@@ -438 +438 @@
       ENDIF
 
-      sshb(:,:) = sshn(:,:) + atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:))  ! before <-- now filtered
+      sshb(:,:) = sshn(:,:) + rn_atfp * ( sshb(:,:) - 2 * sshn(:,:) + ssha(:,:) )   ! before <-- now filtered
       sshn(:,:) = ssha(:,:)
 
@@ -511 +511 @@
       INTEGER                       :: jk
       REAL(wp), DIMENSION(jpi,jpj)  :: zhdiv  
-      REAL(wp)  :: z2dt  
-      !!----------------------------------------------------------------------
-      !
-      z2dt = 2._wp * rdt
+      !!----------------------------------------------------------------------
       !
       zhdiv(:,:) = 0._wp
@@ -521 +518 @@
       END DO
       !                                                ! Sea surface  elevation time-stepping
-      pssha(:,:) = ( psshb(:,:) - z2dt * ( r1_rau0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:)
+      pssha(:,:) = ( psshb(:,:) - rDt * ( r1_rho0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:)
       !                                                 ! 
       !                                                 ! After acale factors at t-points ( z_star coordinate )

NEMO/branches/2018/dev_r9838_ENHANCE04_MLF/src/OFF/nemogcm.F90

@@ -102 +102 @@
       !                                               !== set the model time-step  ==!
       !
-      IF( l_1st_euler ) THEN   ;   r2dt =         rn_rdt   ;   l_1st_euler = .TRUE.    ! start or restart with Euler 1st time-step
-      ELSE                     ;   r2dt = 2._wp * rn_rdt   ;   l_1st_euler = .FALSE.   ! restart with leapfrog
-      ENDIF
-      r1_2dt = 1._wp / r2dt
-      ! NB: if l_1st_euler=T, r2dt will be set to 2*rdt at the end of the 1st time-step (in step.F90)
-      !     Done here (not in domain.F90) as in ASM initialization an Euler 1st time step can be forced
+      IF( l_1st_euler ) THEN   ;   rDt =         rn_Dt   ;   l_1st_euler = .TRUE.    ! start or restart with Euler 1st time-step
+      ELSE                     ;   rDt = 2._wp * rn_Dt   ;   l_1st_euler = .FALSE.   ! restart with leapfrog
+      ENDIF
+      r1_Dt = 1._wp / rDt
+      ! NB: if l_1st_euler=T, rDt will be set to 2*rn_Dt at the end of the 1st time-step (see the DO WHILE below)
       !
       !
@@ -126 +125 @@
                                 CALL stp_ctl    ( istp, indic )  ! Time loop: control and print
          IF( l_1st_euler ) THEN
-            r2dt   = 2._wp * rn_rdt                              ! recover Leap-frog time-step
-            r1_2dt = 1._wp / r2dt
+            rDt   = 2._wp * rDt                                  ! recover Leap-frog time-step
+            r1_Dt = 1._wp / rDt
             l_1st_euler = .FALSE.
          ENDIF