Changeset 1384

Timestamp:

2009-04-06T15:53:51+02:00 (15 years ago)

Author:

rblod

Message:

Update sshnxt for fixed volume case, to avoid useless computation

File:

• branches/dev_004_VVL/NEMO/OPA_SRC/DYN/wzvmod.F90 (modified) (1 diff)

branches/dev_004_VVL/NEMO/OPA_SRC/DYN/wzvmod.F90

@@ -200 +200 @@
       ! -------------------------------
 
-
-     IF( neuler == 0 .AND. kt == nit000 ) THEN   ! Euler time stepping
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ! before <-- now
-               sshb  (ji,jj) = sshn(ji,jj) 
-               sshu_b(ji,jj) = sshu_n(ji,jj) 
-               sshv_b(ji,jj) = sshv_n(ji,jj)
-               sshf_b(ji,jj) = sshf_n(ji,jj)
-               ! now <-- after
-               sshn  (ji,jj) = ssha  (ji,jj)
-               sshu_n(ji,jj) = sshu_a(ji,jj)
-               sshv_n(ji,jj) = sshv_a(ji,jj)
-               sshf_n(ji,jj) = sshf_a(ji,jj)
+      IF( lk_vvl ) THEN      ! Variable volume levels :   ssh at t-, u-, v, f-points
+         !                   ! ---------------------- !
+         IF( neuler == 0 .AND. kt == nit000 ) THEN      ! Euler time-stepping at first time-step : no filter
+            sshn  (:,:) = ssha  (:,:)                        ! now <-- after  (before already = now)
+            sshu_n(:,:) = sshu_a(:,:)
+            sshv_n(:,:) = sshv_a(:,:)
+            sshf_n(:,:) = sshf_a(:,:)
+         ELSE                                           ! Leap-Frog time-stepping: Asselin filter + swap
+            DO jj = 1, jpj
+               DO ji = 1, jpi                                ! before <-- now filtered
+                  sshb  (ji,jj) = sshn(ji,jj)   + atfp * ( sshb  (ji,jj) - 2 * sshn  (ji,jj) + ssha  (ji,jj) )
+                  sshu_b(ji,jj) = sshu_n(ji,jj) + atfp * ( sshu_b(ji,jj) - 2 * sshu_n(ji,jj) + sshu_a(ji,jj) )
+                  sshv_b(ji,jj) = sshv_n(ji,jj) + atfp * ( sshv_b(ji,jj) - 2 * sshv_n(ji,jj) + sshv_a(ji,jj) )
+                  sshf_b(ji,jj) = sshf_n(ji,jj) + atfp * ( sshf_b(ji,jj) - 2 * sshf_n(ji,jj) + sshf_a(ji,jj) )
+                  sshn  (ji,jj) = ssha  (ji,jj)              ! now <-- after
+                  sshu_n(ji,jj) = sshu_a(ji,jj)
+                  sshv_n(ji,jj) = sshv_a(ji,jj)
+                  sshf_n(ji,jj) = sshf_a(ji,jj)
+               END DO
             END DO
-         END DO
-     ELSE                                         ! Leap-frog time stepping
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               ! before <-- now filtered
-               sshb  (ji,jj) = sshn(ji,jj)   + atfp * ( sshb  (ji,jj) - 2 * sshn  (ji,jj) + ssha  (ji,jj) )    !&
-               sshu_b(ji,jj) = sshu_n(ji,jj) + atfp * ( sshu_b(ji,jj) - 2 * sshu_n(ji,jj) + sshu_a(ji,jj) )    !&
-               sshv_b(ji,jj) = sshv_n(ji,jj) + atfp * ( sshv_b(ji,jj) - 2 * sshv_n(ji,jj) + sshv_a(ji,jj) )    !&
-               sshf_b(ji,jj) = sshf_n(ji,jj) + atfp * ( sshf_b(ji,jj) - 2 * sshf_n(ji,jj) + sshf_a(ji,jj) )    !&
-               ! now <-- after
-               sshn  (ji,jj) = ssha  (ji,jj)
-               sshu_n(ji,jj) = sshu_a(ji,jj)
-               sshv_n(ji,jj) = sshv_a(ji,jj)
-               sshf_n(ji,jj) = sshf_a(ji,jj)
+         ENDIF
+         !
+      ELSE                   ! fixed levels :   ssh at t-point only
+         !                   ! ------------ !
+         IF( neuler == 0 .AND. kt == nit000 ) THEN      ! Euler time-stepping at first time-step : no filter
+            sshn(:,:) = ssha(:,:)                            ! now <-- after  (before already = now)
+            !
+         ELSE                                           ! Leap-Frog time-stepping: Asselin filter + swap
+            DO jj = 1, jpj
+               DO ji = 1, jpi                                ! before <-- now filtered
+                  sshb(ji,jj) = sshn(ji,jj) + atfp * ( sshb(ji,jj) - 2 * sshn(ji,jj) + ssha(ji,jj) )    
+                  sshn(ji,jj) = ssha(ji,jj)                  ! now <-- after
+               END DO
             END DO
-         END DO
-      ENDIF
+         ENDIF
+         !
+      ENDIF
+
 
       IF(ln_ctl)   CALL prt_ctl(tab2d_1=sshb    , clinfo1=' sshb  - : ', mask1=tmask, ovlap=1 )