Changeset 16 for trunk/NEMO/OPA_SRC/SOL/solmat.F90

Timestamp:

2004-02-17T09:06:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/SOL/solmat.F90 (modified) (14 diffs)

trunk/NEMO/OPA_SRC/SOL/solmat.F90

@@ -18 +18 @@
    USE obc_oce         ! ocean open boundary conditions
    USE lib_mpp         ! distributed memory computing
+   USE dynspg_rl
+   USE dynspg_fsc
 
    IMPLICIT NONE
@@ -38 +40 @@
       !!
       !! ** Method  :   The matrix depends on the type of free surface:
-      !!       * default option: rigid lid and bsf
+      !!       * lk_dynspg_rl=T: rigid lid formulation
       !!      The matrix is built for the barotropic stream function system.
       !!      a diagonal preconditioning matrix is also defined.
-      !!       * 'key_dynspg_fsc' defined: free surface
+      !!       * lk_dynspg_fsc=T: free surface formulation
       !!      The matrix is built for the divergence of the transport system
       !!      a diagonal preconditioning matrix is also defined.
@@ -67 +69 @@
       INTEGER ::   ii, ij, iiend, ijend      ! temporary integers
       REAL(wp) ::   zcoefs, zcoefw, zcoefe, zcoefn  ! temporary scalars
-      REAL(wp) ::   z2dt
-#if defined key_dynspg_fsc
-      REAL(wp) ::   zcoef
-#endif
+      REAL(wp) ::   z2dt, zcoef
       !!----------------------------------------------------------------------
 
@@ -83 +82 @@
       
       ! initialize to zero
+      zcoef = 0.e0
       gcp(:,:,1) = 0.e0
       gcp(:,:,2) = 0.e0
@@ -94 +94 @@
 
 #if defined key_dynspg_fsc && ! defined key_obc
+!!cr      IF( lk_dynspg_fsc .AND. .NOT.lk_obc ) THEN
 
       ! defined the coefficients for free surface elliptic system
@@ -99 +100 @@
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
-            zcoef = z2dt * z2dt * g * rnu * bmask(ji,jj)
+            zcoef = z2dt * z2dt * grav * rnu * bmask(ji,jj)
             zcoefs = -zcoef * hv(ji  ,jj-1) * e1v(ji  ,jj-1) / e2v(ji  ,jj-1)    ! south coefficient
             zcoefw = -zcoef * hu(ji-1,jj  ) * e2u(ji-1,jj  ) / e1u(ji-1,jj  )    ! west coefficient
@@ -109 +110 @@
             gcp(ji,jj,4) = zcoefn
             gcdmat(ji,jj) = e1t(ji,jj) * e2t(ji,jj) * bmask(ji,jj)    &          ! diagonal coefficient
-                          - zcoefs -zcoefw -zcoefe -zcoefn
+               &          - zcoefs -zcoefw -zcoefe -zcoefn
          END DO
       END DO
       
 #  elif defined key_dynspg_fsc && defined key_obc
+!!cr      ELSEIF( lk_dynspg_fsc .AND. lk_obc ) THEN
 
       !   defined gcdmat in the case of open boundaries
@@ -119 +121 @@
       DO jj = 2, jpjm1
          DO ji = 2, jpim1
-            zcoef = z2dt * z2dt * g * rnu * bmask(ji,jj)
+            zcoef = z2dt * z2dt * grav * rnu * bmask(ji,jj)
             !  south coefficient
             IF( ( lpsouthobc ) .AND. ( jj == njs0p1 ) ) THEN
@@ -159 +161 @@
 
 #  else
+!!cr      ELSE
 
       !   defined the coefficients for bsf elliptic system
@@ -173 +176 @@
             gcp(ji,jj,4) = zcoefn
             gcdmat(ji,jj) = -zcoefs -zcoefw -zcoefe -zcoefn                             ! diagonal coefficient
-            
          END DO
       END DO
       
+!!cr  ENDIF
 #endif
 
@@ -194 +197 @@
       ! account for the existence of the south symmetric bassin.
       
+!!cr      IF( .NOT.lk_dynspg_fsc ) THEN
 #if ! defined key_dynspg_fsc
       IF( nperio == 2 ) THEN
@@ -203 +207 @@
          END DO
       ENDIF
+!!cr      ENDIF
 #endif
       
@@ -225 +230 @@
          gcp(:,:,3) = gcp(:,:,3) * gcdprc(:,:)
          gcp(:,:,4) = gcp(:,:,4) * gcdprc(:,:)
+         IF( nsolv == 2 )   gccd(:,:) = sor * gcp(:,:,2)
 
       ELSE
@@ -467 +473 @@
       nnitot = nni
 
-      CALL mpp_sum(nnitot,1,numit0ete)
+      CALL mpp_sum( nnitot, 1, numit0ete )
       CALL feti_creadr(malxm,malxmax,nxm,npe*npe,maae,'ae')