Changeset 62 for trunk/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2004-04-22T13:53:53+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX036 : # Loop indice correction for the North fold in rigid lid and mpp case PLUS

# Use logical key "lk_isl" instead of "l_isl"
# Addition of the logical key lk_dynspg_fsc_atsk in parallel to the lk_dynspg_fsc one

File:

• trunk/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -19 +19 @@
    USE solisl          ! ???
    USE dynspg_fsc      !
+   USE dynspg_fsc_atsk !
 
    IMPLICIT NONE
@@ -46 +47 @@
       !!      tropic stream function  points (b).
       !!        Set mbathy to the number of non-zero w-levels of a water column
-      !!      (if island in the domain (l_isl=T), this is done latter in
+      !!      (if island in the domain (lk_isl=T), this is done latter in
       !!      routine solver_init)
       !!
@@ -139 +140 @@
          WRITE(numout,*) 'dommsk : ocean mask '
          WRITE(numout,*) '~~~~~~'
+         WRITE(numout,*) '         Namelist namlbc'
          WRITE(numout,*) '            lateral momentum boundary cond. shlat = ',shlat
       ENDIF
 
-      IF(lwp)WRITE(numout,*) '     ocean lateral:'
       IF ( shlat == 0. ) THEN
-          IF(lwp)WRITE(numout,*) '         free-slip '
+          IF(lwp) WRITE(numout,*) '         ocean lateral free-slip '
         ELSEIF ( shlat  ==  2. ) THEN
-          IF(lwp) WRITE(numout,*) '        no-slip '
+          IF(lwp) WRITE(numout,*) '         ocean lateral  no-slip '
         ELSEIF ( 0. < shlat .AND. shlat < 2. ) THEN
-          IF(lwp) WRITE(numout,*) '        partial-slip '
+          IF(lwp) WRITE(numout,*) '         ocean lateral  partial-slip '
         ELSEIF ( 2. < shlat ) THEN
-          IF(lwp) WRITE(numout,*) '        strong-slip '
+          IF(lwp) WRITE(numout,*) '         ocean lateral  strong-slip '
         ELSE
-          IF(lwp)WRITE(numout,cform_err)
-          IF(lwp)WRITE(numout,*) ' shlat is negative = ', shlat
+          IF(lwp) WRITE(numout,cform_err)
+          IF(lwp) WRITE(numout,*) ' shlat is negative = ', shlat
           nstop = nstop + 1
       ENDIF
-
 
       ! 1. Ocean/land mask at t-point (computed from mbathy)
@@ -215 +215 @@
                vmask(ji,jj,jk) = tmask(ji,jj  ,jk) * tmask(ji  ,jj+1,jk)
                fmask(ji,jj,jk) = tmask(ji,jj  ,jk) * tmask(ji+1,jj  ,jk)   &
-                               * tmask(ji,jj+1,jk) * tmask(ji+1,jj+1,jk)
+                  &            * tmask(ji,jj+1,jk) * tmask(ji+1,jj+1,jk)
             END DO
          END DO
@@ -246 +246 @@
       
       ! Computation
-      IF( lk_dynspg_fsc ) THEN
+      IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
          bmask(:,:) = tmask(:,:,1)       ! elliptic equation is written at t-point
       ELSE
@@ -266 +266 @@
       !   north fold : 
       IF( nperio == 3 .OR. nperio == 4 ) THEN
-         IF( lk_dynspg_fsc ) THEN
+         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
             ! T-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj and on half jpjglo-1 row
             DO ji = 1, jpi
@@ -280 +280 @@
       ENDIF
       IF( nperio == 5 .OR. nperio == 6 ) THEN
-         IF( lk_dynspg_fsc ) THEN
+         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
             ! F-pt pivot and T-pt elliptic eq. : bmask set to 0. on row jpj
             bmask(:,jpj) = 0.e0
@@ -304 +304 @@
          ! north fold : bmask must be set to 0. on rows jpj-1 and jpj 
          IF( npolj == 3 .OR. npolj == 4 ) THEN
-            IF( lk_dynspg_fsc ) THEN
+            IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
                DO ji = 1, nlci
                   ii = ji + nimpp - 1
@@ -318 +318 @@
          ENDIF
          IF( npolj == 5 .OR. npolj == 6 ) THEN
-            IF( lk_dynspg_fsc ) THEN
+            IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
                DO ji = 1, nlci
-                  ii = ji + nimpp - 1
                   bmask(ji,nlcj  ) = 0.e0
                END DO
             ELSE
                DO ji = 1, nlci
+                  ii = ji + nimpp - 1
                   bmask(ji,nlcj-1) = bmask(ji,nlcj-1) * fpol(ii)
                   bmask(ji,nlcj  ) = 0.e0
@@ -410 +410 @@
       ! Mbathy set to the number of w-level (minimum value 2)
       ! -----------------------------------
-      IF( l_isl ) THEN
+      IF( lk_isl ) THEN
          ! this is done at the end of solver_init routine
       ELSE