Changeset 13420 for NEMO/branches

Timestamp:

2020-08-21T13:42:12+02:00 (4 years ago)

Author:

smueller

Message:

Addition of interior masks as suggested in ticket #1499

Location:

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO

Files:

• OPATAM_SRC/oce_tam.F90 (modified) (4 diffs)
• OPA_SRC/DOM/domwri.F90 (modified) (4 diffs)

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPATAM_SRC/oce_tam.F90

@@ -26 +26 @@
    USE par_oce
    USE lib_mpp
+   USE dom_oce
+   USE domwri
 
    IMPLICIT NONE
@@ -103 +105 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #endif
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: &
+      & tmsk_i, &
+      & umsk_i, &
+      & vmsk_i, &
+      & fmsk_i
 
    !!----------------------------------------------------------------------
@@ -122 +129 @@
       INTEGER :: ierr(5)
       INTEGER :: jmode
+      INTEGER :: jk
+      REAL(wp), DIMENSION(jpi,jpj) :: &
+         & z_tmsk_i, &
+         & z_umsk_i, &
+         & z_vmsk_i, &
+         & z_fmsk_i
+
       !!----------------------------------------------------------------------
       !
@@ -128 +142 @@
       ELSE
          jmode = 0
+      END IF
+
+      IF (.NOT. ALLOCATED ( tmsk_i ) ) THEN
+         ALLOCATE ( tmsk_i (jpi, jpj, jpk), &
+            &       umsk_i (jpi, jpj, jpk), &
+            &       vmsk_i (jpi, jpj, jpk), &
+            &       fmsk_i (jpi, jpj, jpk) )
+
+         CALL dom_uniq( z_tmsk_i, 'T', 1 )
+         CALL dom_uniq( z_umsk_i, 'U', 1 )
+         CALL dom_uniq( z_vmsk_i, 'V', 1 )
+         CALL dom_uniq( z_fmsk_i, 'F', 1 )
+
+         DO jk = 1, jpk
+            tmsk_i(:,:,jk) = tmask(:,:,jk) * z_tmsk_i(:,:)
+            umsk_i(:,:,jk) = umask(:,:,jk) * z_umsk_i(:,:)
+            vmsk_i(:,:,jk) = vmask(:,:,jk) * z_vmsk_i(:,:)
+            fmsk_i(:,:,jk) = fmask(:,:,jk) * z_fmsk_i(:,:)
+         END DO
+
       END IF
 

NEMO/branches/NERC/dev_release-3.4_NEMOTAM_consolidated/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90

@@ -27 +27 @@
 
    PUBLIC dom_wri        ! routine called by inidom.F90
+   PUBLIC dom_uniq       ! required for NEMOTAM
 
    !! * Substitutions
@@ -271 +272 @@
 
 
-   SUBROUTINE dom_uniq( puniq, cdgrd )
+   SUBROUTINE dom_uniq( puniq, cdgrd, kindic )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dom_uniq  ***
@@ -281 +282 @@
       !!----------------------------------------------------------------------
       !
-      CHARACTER(len=1)        , INTENT(in   ) ::   cdgrd   ! 
-      REAL(wp), DIMENSION(:,:), INTENT(inout) ::   puniq   ! 
+      CHARACTER(len=1)        , INTENT(in   )           ::   cdgrd   ! 
+      REAL(wp), DIMENSION(:,:), INTENT(inout)           ::   puniq   ! 
+      INTEGER                 , INTENT(in)   , OPTIONAL ::   kindic  !
       !
       REAL(wp) ::  zshift   ! shift value link to the process number
@@ -304 +306 @@
       lldbl(:,:,1) = puniq(:,:) == ztstref(:,:)   ! check which values have been changed 
       !
-      puniq(:,:) = 1.                             ! default definition
+      IF ( PRESENT( kindic ) ) THEN
+         puniq(:,:) = 0.0_wp                      ! for generating interior mask
+      ELSE
+         puniq(:,:) = 1.0_wp                      ! default definition
+      ENDIF
       ! fill only the inner part of the cpu with llbl converted into real 
       puniq(nldi:nlei,nldj:nlej) = REAL( COUNT( lldbl(nldi:nlei,nldj:nlej,:), dim = 3 ) , wp )