Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90

Timestamp:

2010-12-27T18:33:53+01:00 (14 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90 (modified) (9 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90

@@ -15 +15 @@
    !!             3.2  ! 2009-06  (S. Masson)  distributed restart using iom
    !!              -   ! 2009-07  (R. Benshila)  suppression of rigid-lid option
+   !!             3.3  ! 2010-09  (D. Storkey) update for BDY module.
    !!----------------------------------------------------------------------
 
@@ -26 +27 @@
    USE phycst          ! physical constants
    USE obc_oce         ! ocean open boundary conditions
+   USE bdy_oce         ! unstructured open boundary conditions
    USE lbclnk          ! lateral boudary conditions
    USE lib_mpp         ! distributed memory computing
@@ -36 +38 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -80 +82 @@
       ENDIF
 
-#if defined key_dynspg_flt 
+#if defined key_dynspg_flt && ! defined key_bdy
 #   if ! defined key_obc
 
@@ -158 +160 @@
     ENDIF
 #   endif
+
+#  elif defined key_dynspg_flt && defined key_bdy 
+
+      !   defined gcdmat in the case of unstructured open boundaries
+      DO jj = 2, jpjm1
+         DO ji = 2, jpim1
+            zcoef = z2dt * z2dt * grav * bmask(ji,jj)
+
+            !  south coefficient
+            zcoefs = -zcoef * hv(ji,jj-1) * e1v(ji,jj-1)/e2v(ji,jj-1)
+            zcoefs = zcoefs * bdyvmask(ji,jj-1)
+            gcp(ji,jj,1) = zcoefs
+
+            !  west coefficient
+            zcoefw = -zcoef * hu(ji-1,jj) * e2u(ji-1,jj)/e1u(ji-1,jj)
+            zcoefw = zcoefw * bdyumask(ji-1,jj)
+            gcp(ji,jj,2) = zcoefw
+
+            !  east coefficient
+            zcoefe = -zcoef * hu(ji,jj) * e2u(ji,jj)/e1u(ji,jj)
+            zcoefe = zcoefe * bdyumask(ji,jj)
+            gcp(ji,jj,3) = zcoefe
+
+            !  north coefficient
+            zcoefn = -zcoef * hv(ji,jj) * e1v(ji,jj)/e2v(ji,jj)
+            zcoefn = zcoefn * bdyvmask(ji,jj)
+            gcp(ji,jj,4) = zcoefn
+
+            ! diagonal coefficient
+            gcdmat(ji,jj) = e1t(ji,jj)*e2t(ji,jj)*bmask(ji,jj) &
+                            - zcoefs -zcoefw -zcoefe -zcoefn
+         END DO
+      END DO
+
 #endif
 
@@ -297 +333 @@
          SELECT CASE ( cd_type )
          ! 
-         CASE ( 'T', 'S', 'U', 'W' )
+         CASE ( 'T' , 'U', 'W' )
             DO jk = 1, 4
                DO ji = 1-jpr2di, nlci+jpr2di
@@ -311 +347 @@
             END DO
             !
-         CASE ( 'F' ,'G' , 'I', 'V' )
+         CASE ( 'F' , 'I', 'V' )
             DO jk =1, 4
                DO ji = 1-jpr2di, nlci+jpr2di
@@ -325 +361 @@
          SELECT CASE (cd_type )
          !
-         CASE ( 'T'  ,'S', 'U', 'W')
+         CASE ( 'T' , 'U', 'W')
             DO jk =1, 4
                DO ji = 1-jpr2di, nlci+jpr2di
@@ -332 +368 @@
             END DO
             !
-         CASE ( 'F' ,'G' , 'I', 'V' )
+         CASE ( 'F' , 'I', 'V' )
             DO jk =1, 4
                DO ji = 1-jpr2di, nlci+jpr2di