Changeset 4376

Timestamp:

2014-01-28T19:47:54+01:00 (10 years ago)

Author:

hliu

Message:

updating wetting/drying filter for explicit time_splitting

File:

• branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (6 diffs)

branches/2013/dev_r4050_NOC_WaD/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -126 +126 @@
       REAL(wp), POINTER, DIMENSION(:,:) :: zua, zva, zun, zvn, zun_e, zvn_e, zub_e, zvb_e 
       REAL(wp), POINTER, DIMENSION(:,:) :: zcu, zcv, zwx, zwy, zbfru, zbfrv, zu_sum, zv_sum
+
+      REAL(wp), POINTER, DIMENSION(:,:) :: zwadflt
       !!----------------------------------------------------------------------
       !
@@ -133 +135 @@
       CALL wrk_alloc( jpi, jpj, zua, zva, zun, zvn, zun_e, zvn_e, zub_e, zvb_e   )
       CALL wrk_alloc( jpi, jpj, zcu, zcv, zwx, zwy, zbfru, zbfrv, zu_sum, zv_sum )
+
+      IF(ln_wad) CALL wrk_alloc( jpi, jpj, zwadflt)
       !
       IF( kt == nit000 ) THEN             !* initialisation
@@ -180 +184 @@
         z2dt_bf = 2.0_wp * rdt
       ENDIF
+
+      IF(ln_wad) zwadflt(:,:) = 1._wp
 
       ! -----------------------------------------------------------------------------
@@ -427 +433 @@
 #endif
          !
-         DO jj = 2, jpjm1                                      ! leap-frog on ssh_e
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * ( zraur * ( emp(ji,jj)-rnf(ji,jj) ) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1) 
-            END DO
-         END DO
+         IF(ln_wad) THEN
+            DO jj = 2, jpjm1                                      ! leap-frog on ssh_e
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * &
+                                &   ( zraur * ( emp(ji,jj)-rnf(ji,jj) ) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1) 
+                  IF(ssha_e(ji,jj) <= rn_wadmin) THEN
+                    zwadflt(ji,   jj  ) = 0._wp
+                    zwadflt(ji-1, jj  ) = 0._wp
+                    zwadflt(ji,   jj-1) = 0._wp
+                    zwadflt(ji-1, jj-1) = 0._wp
+                  END IF
+               END DO
+            END DO
+         ELSE
+            DO jj = 2, jpjm1                                      ! leap-frog on ssh_e
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  ssha_e(ji,jj) = ( zsshb_e(ji,jj) - z2dt_e * &
+                                &   ( zraur * ( emp(ji,jj)-rnf(ji,jj) ) + zhdiv(ji,jj) ) ) * tmask(ji,jj,1) 
+               END DO
+            END DO
+         END IF
 
          !                                                !* after barotropic velocities (vorticity scheme dependent)
@@ -669 +691 @@
       ! 
       !                                   !* update the general momentum trend
-      DO jk=1,jpkm1
-         ua(:,:,jk) = ua(:,:,jk) + ( zu_sum(:,:) - ub_b(:,:) ) * z1_2dt_b
-         va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) * z1_2dt_b
-      END DO
+      IF(ln_wad) THEN
+         DO jk=1,jpkm1
+            ua(:,:,jk) = ua(:,:,jk) + ( zu_sum(:,:) - ub_b(:,:) ) * z1_2dt_b * zwadflt(:,:)
+            va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) * z1_2dt_b * zwadflt(:,:)
+         END DO
+      ELSE
+         DO jk=1,jpkm1
+            ua(:,:,jk) = ua(:,:,jk) + ( zu_sum(:,:) - ub_b(:,:) ) * z1_2dt_b
+            va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) * z1_2dt_b
+         END DO
+      END IF
+
       un_b  (:,:) =  zu_sum(:,:) 
       vn_b  (:,:) =  zv_sum(:,:) 
@@ -683 +713 @@
       CALL wrk_dealloc( jpi, jpj, zua, zva, zun, zvn, zun_e, zvn_e, zub_e, zvb_e   )
       CALL wrk_dealloc( jpi, jpj, zcu, zcv, zwx, zwy, zbfru, zbfrv, zu_sum, zv_sum )
+
+      IF(ln_wad) CALL wrk_dealloc( jpi, jpj, zwadflt)
       !
       IF( nn_timing == 1 )  CALL timing_stop('dyn_spg_ts')