Changeset 3062 for branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

Timestamp:

2011-11-09T11:47:32+01:00 (12 years ago)

Author:

rfurner

Message:

ticket #885. added in changes from branches/2011/UKMO_MERCATOR_obc_bdy_merge@2888

File:

• branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (4 diffs)

branches/2011/dev_UKM0_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -26 +26 @@
    USE sbc_oce         ! surface boundary condition: ocean
    USE obc_oce         ! Lateral open boundary condition
+   USE bdy_oce         ! Lateral open boundary condition
    USE sol_oce         ! ocean elliptic solver
    USE phycst          ! physical constants
@@ -33 +34 @@
    USE solpcg          ! preconditionned conjugate gradient solver
    USE solsor          ! Successive Over-relaxation solver
-   USE obcdyn          ! ocean open boundary condition (obc_dyn routines)
-   USE obcvol          ! ocean open boundary condition (obc_vol routines)
-   USE bdy_oce         ! Unstructured open boundaries condition
-   USE bdydyn          ! Unstructured open boundaries condition (bdy_dyn routine) 
-   USE bdyvol          ! Unstructured open boundaries condition (bdy_vol routine)
+   USE obcdyn          ! ocean open boundary condition on dynamics
+   USE obcvol          ! ocean open boundary condition (obc_vol routine)
+   USE bdydyn          ! ocean open boundary condition on dynamics
+   USE bdyvol          ! ocean open boundary condition (bdy_vol routine)
    USE cla             ! cross land advection
    USE in_out_manager  ! I/O manager
@@ -187 +187 @@
 #endif
 #if defined key_bdy
-      CALL bdy_dyn_frs( kt )       ! Update velocities on unstructured boundary using the Flow Relaxation Scheme
-      CALL bdy_vol( kt )           ! Correction of the barotropic component velocity to control the volume of the system
+      CALL bdy_dyn( kt )      ! Update velocities on each open boundary
+      CALL bdy_vol( kt )      ! Correction of the barotropic component velocity to control the volume of the system
 #endif
 #if defined key_agrif
@@ -304 +304 @@
 #if defined key_obc
             ! caution : grad D = 0 along open boundaries
+            ! Remark: The filtering force could be reduced here in the FRS zone
+            !         by multiplying spgu/spgv by (1-alpha) ??  
             spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj)
             spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj)
 #elif defined key_bdy
             ! caution : grad D = 0 along open boundaries
-            ! Remark: The filtering force could be reduced here in the FRS zone
-            !         by multiplying spgu/spgv by (1-alpha) ??  
             spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj)
-            spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)           
+            spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj)
 #else
             spgu(ji,jj) = z2dt * ztdgu