Changeset 389 for trunk/NEMO/OPA_SRC/SOL

Timestamp:

2006-03-09T18:22:04+01:00 (18 years ago)

Author:

opalod

Message:

RB:nemo_v1_update_038: first integration of Agrif :

• configuration parameters are just integer when agrif is used
• add call to agrif routines with key_agrif

Location:

trunk/NEMO/OPA_SRC/SOL

Files:

• sol_oce.F90 (modified) (1 diff)
• solmat.F90 (modified) (1 diff)
• solver.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/SOL/sol_oce.F90

@@ -67 +67 @@
       gccd             !: vector such that ca.gccd=a.d (ca-1=gcdprc)
 
+#if defined key_AGRIF
+      REAL(wp), DIMENSION(jpi,jpj) :: laplacu, laplacv
+#endif
+
 #if defined key_feti
    !!----------------------------------------------------------------------

trunk/NEMO/OPA_SRC/SOL/solmat.F90

@@ -182 +182 @@
       
 !!cr  ENDIF
+#endif
+#if defined key_AGRIF
+       IF (.NOT.AGRIF_ROOT()) THEN
+       
+       IF ( (nbondi == -1)  .OR. (nbondi == 2) ) bmask(2,:)=0.
+       IF ( (nbondi ==  1)  .OR. (nbondi == 2) ) bmask(nlci-1,:)=0.
+       IF ( (nbondj == -1)  .OR. (nbondj == 2) ) bmask(:,2)=0.
+       IF ( (nbondj ==  1)  .OR. (nbondj == 2) ) bmask(:,nlcj-1)=0.
+
+      DO jj = 2, jpjm1
+         DO ji = 2, jpim1
+            zcoef = z2dt * z2dt * grav * rnu * bmask(ji,jj)
+            !  south coefficient
+            IF( ((nbondj == -1)  .OR. (nbondj == 2)) .AND. ( jj == 3 ) ) THEN
+               zcoefs = -zcoef * hv(ji,jj-1) * e1v(ji,jj-1)/e2v(ji,jj-1)*(1.-vmask(ji,jj-1,1))
+            ELSE
+               zcoefs = -zcoef * hv(ji,jj-1) * e1v(ji,jj-1)/e2v(ji,jj-1)
+            END IF
+            gcp(ji,jj,1) = zcoefs
+
+            !  west coefficient
+       IF( ( (nbondi == -1)  .OR. (nbondi == 2) ) .AND. ( ji == 3 )  ) THEN
+               zcoefw = -zcoef * hu(ji-1,jj) * e2u(ji-1,jj)/e1u(ji-1,jj)*(1.-umask(ji-1,jj,1))
+            ELSE
+               zcoefw = -zcoef * hu(ji-1,jj) * e2u(ji-1,jj)/e1u(ji-1,jj)
+            END IF
+            gcp(ji,jj,2) = zcoefw
+
+            !   east coefficient
+            IF( ((nbondi == 1)  .OR. (nbondi == 2)) .AND. ( ji == nlci-2 ) ) THEN
+               zcoefe = -zcoef * hu(ji,jj) * e2u(ji,jj)/e1u(ji,jj)*(1.-umask(ji,jj,1))
+            ELSE
+               zcoefe = -zcoef * hu(ji,jj) * e2u(ji,jj)/e1u(ji,jj)
+            END IF
+            gcp(ji,jj,3) = zcoefe
+
+            !   north coefficient
+            IF( ((nbondj == 1)  .OR. (nbondj == 2)) .AND. ( jj == nlcj-2 ) ) THEN
+               zcoefn = -zcoef * hv(ji,jj) * e1v(ji,jj)/e2v(ji,jj)*(1.-vmask(ji,jj,1))
+            ELSE
+               zcoefn = -zcoef * hv(ji,jj) * e1v(ji,jj)/e2v(ji,jj)
+            END IF
+            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
 #endif
 

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -79 +79 @@
       !! * Local declarations
       INTEGER :: ji, jj   ! dummy loop indices
+      CHARACTER(len=80) :: clname
 
       NAMELIST/namsol/ nsolv, nsol_arp, nmin, nmax, nmod, eps, resmax, sor, epsisl, nmisl, rnu
@@ -88 +89 @@
 
       ! open elliptic solver statistics file
-      CALL ctlopn( numsol, 'solver.stat', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+      clname = 'solver.stat'
+      CALL ctlopn( numsol, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
                    1, numout, lwp, 1 )