Changeset 3095 for branches/2011/dev_LOCEAN_CMCC_2011

Timestamp:

2011-11-14T16:41:21+01:00 (12 years ago)

Author:

cetlod

Message:

dev_LOCEAN_CMCC_2011:Move the fmask modification from dommsk to dynvor

Location:

branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/dommsk.F90 (modified) (2 diffs)
• DYN/dynvor.F90 (modified) (1 diff)

branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -26 +26 @@
    USE dom_oce         ! ocean space and time domain
    USE obc_oce         ! ocean open boundary conditions
-   USE dynvor          ! vorticity term
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
@@ -391 +390 @@
       CALL lbc_lnk( fmask, 'F', 1._wp )      ! Lateral boundary conditions on fmask
 
-
-      ! If energy, enstrophy or mixed advection of momentum in vector form change the value for masks
-      ! at angles with three ocean points and one land point
-       IF( ln_dynvor_con .AND. (ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) ) THEN
-        DO jj = 2, jpjm1
-          DO ji = 2, jpim1
-          IF( tmask(ji,jj,jk)+tmask(ji+1,jj,jk)+tmask(ji,jj+1,jk)+tmask(ji+1,jj+1,jk) == 3._wp ) THEN
-                  fmask(ji,jj,jk) = 1._wp
-           ENDIF
-          END DO
-        END DO
-       ENDIF
-
+      ! CAUTION : The fmask may be further modified in dyn_vor_init ( dynvor.F90 )
             
       IF( nprint == 1 .AND. lwp ) THEN      ! Control print

branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -712 +712 @@
       ENDIF
 
+      ! If energy, enstrophy or mixed advection of momentum in vector form change the value for masks
+      ! at angles with three ocean points and one land point
+      IF( ln_dynvor_con .AND. (ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) ) THEN
+          DO jj = 2, jpjm1
+            DO ji = 2, jpim1
+               IF( tmask(ji,jj,jk)+tmask(ji+1,jj,jk)+tmask(ji,jj+1,jk)+tmask(ji+1,jj+1,jk) == 3._wp ) &
+                   fmask(ji,jj,jk) = 1._wp
+            END DO
+          END DO
+          !
+          CALL lbc_lnk( fmask, 'F', 1._wp )      ! Lateral boundary conditions on fmask
+          !
+      ENDIF
+
       ioptio = 0                     ! Control of vorticity scheme options
       IF( ln_dynvor_ene )   ioptio = ioptio + 1