Changeset 15249 for NEMO/trunk/src/OCE/ZDF

Timestamp:

2021-09-13T11:59:09+02:00 (3 years ago)

Author:

hadcv

Message:

#2721: Fix SETTE debug failures

Location:

NEMO/trunk/src/OCE/ZDF

Files:

• zdfmxl.F90 (modified) (4 diffs)
• zdfphy.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/ZDF/zdfmxl.F90

@@ -26 +26 @@
    PRIVATE
 
-   PUBLIC   zdf_mxl, zdf_mxl_turb   ! called by zdfphy.F90
+   PUBLIC   zdf_mxl, zdf_mxl_turb, zdf_mxl_alloc   ! called by zdfphy.F90
 
    INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   nmln    !: number of level in the mixed layer (used by LDF, ZDF, TRD, TOP)
@@ -86 +86 @@
             IF(lwp) WRITE(numout,*) 'zdf_mxl : mixed layer depth'
             IF(lwp) WRITE(numout,*) '~~~~~~~ '
-            !                             ! allocate zdfmxl arrays
-            IF( zdf_mxl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_mxl : unable to allocate arrays' )
          ENDIF
       ENDIF
@@ -111 +109 @@
       !
       IF( .NOT.l_offline .AND. iom_use("mldr10_1") ) THEN
-         IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldr10_1", hmlp - risfdep)   ! mixed layer thickness
-         ELSE                  ;  CALL iom_put( "mldr10_1", hmlp )            ! mixed layer depth
-         END IF
+         IF( .NOT. l_istiled .OR. ntile == nijtile ) THEN         ! Do only on the last tile
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldr10_1", hmlp - risfdep)   ! mixed layer thickness
+            ELSE                  ;  CALL iom_put( "mldr10_1", hmlp )            ! mixed layer depth
+            END IF
+         ENDIF
       ENDIF
       !
@@ -154 +154 @@
       !
       IF( .NOT.l_offline .AND. iom_use("mldkz5") ) THEN
-         IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldkz5"  , hmld - risfdep )   ! turbocline thickness
-         ELSE                  ;  CALL iom_put( "mldkz5"  , hmld )             ! turbocline depth
-         END IF
+         IF( .NOT. l_istiled .OR. ntile == nijtile ) THEN         ! Do only on the last tile
+            IF( ln_isfcav ) THEN  ;  CALL iom_put( "mldkz5"  , hmld - risfdep )   ! turbocline thickness
+            ELSE                  ;  CALL iom_put( "mldkz5"  , hmld )             ! turbocline depth
+            END IF
+         ENDIF
       ENDIF
       !

NEMO/trunk/src/OCE/ZDF/zdfphy.F90

@@ -146 +146 @@
          wi    (:,:,:) = 0._wp
       ENDIF
+      !                                  ! Initialise zdf_mxl arrays (only hmld as not set everywhere when nn_hls > 1)
+      IF( zdf_mxl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'zdf_mxl : unable to allocate arrays' )
+      hmld(:,:) = 0._wp
       !                          !==  Background eddy viscosity and diffusivity  ==!
       IF( nn_avb == 0 ) THEN             ! Define avmb, avtb from namelist parameter