Changeset 2758 for trunk/NEMOGCM/NEMO

Timestamp:

2011-05-02T16:04:25+02:00 (13 years ago)

Author:

cetlod

Message:

Minor modifications on zdfmxl.F90 in order to be used when running in OFFLINE mode, see ticket #820

Location:

trunk/NEMOGCM/NEMO

Files:

• OFF_SRC/nemogcm.F90 (modified) (2 diffs)
• OFF_SRC/zdfmxl.F90 (deleted)
• OPA_SRC/ZDF/zdfmxl.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -357 +357 @@
       USE dom_oce,      ONLY: dom_oce_alloc
       USE zdf_oce,      ONLY: zdf_oce_alloc
-      USE zdfmxl,       ONLY: zdf_mxl_alloc
       USE ldftra_oce,   ONLY: ldftra_oce_alloc
       USE trc_oce,      ONLY: trc_oce_alloc
@@ -370 +369 @@
       ierr = ierr + ldftra_oce_alloc()          ! ocean lateral  physics : tracers
       ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics
-      ierr = ierr + zdf_mxl_alloc   ()          ! ocean vertical physics
       !
       ierr = ierr + lib_mpp_alloc   (numout)    ! mpp exchanges

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -16 +16 @@
    USE iom             ! I/O library
    USE lib_mpp         ! MPP library
+   USE trc_oce, ONLY : lk_offline ! offline flag
 
    IMPLICIT NONE
@@ -40 +41 @@
       !!               ***  FUNCTION zdf_mxl_alloc  ***
       !!----------------------------------------------------------------------
-      ALLOCATE( nmln(jpi,jpj), hmld(jpi,jpj), hmlp(jpi,jpj), hmlpt(jpi,jpj), STAT= zdf_mxl_alloc )
-      !
-      IF( lk_mpp             )   CALL mpp_sum ( zdf_mxl_alloc )
-      IF( zdf_mxl_alloc /= 0 )   CALL ctl_warn('zdf_mxl_alloc: failed to allocate arrays.')
+      IF( .NOT. ALLOCATED( nmln ) ) THEN
+         ALLOCATE( nmln(jpi,jpj), hmld(jpi,jpj), hmlp(jpi,jpj), hmlpt(jpi,jpj), STAT= zdf_mxl_alloc )
+         !
+         IF( lk_mpp             )   CALL mpp_sum ( zdf_mxl_alloc )
+         IF( zdf_mxl_alloc /= 0 )   CALL ctl_warn('zdf_mxl_alloc: failed to allocate arrays.')
+         !
+      ENDIF
    END FUNCTION zdf_mxl_alloc
 
@@ -108 +112 @@
          END DO
       END DO
-      CALL iom_put( "mldr10_1", hmlp )   ! mixed layer depth
-      CALL iom_put( "mldkz5"  , hmld )   ! turbocline depth
+      IF( .NOT.lk_offline ) THEN            ! no need to output in offline mode
+         CALL iom_put( "mldr10_1", hmlp )   ! mixed layer depth
+         CALL iom_put( "mldkz5"  , hmld )   ! turbocline depth
+      ENDIF
       
       IF(ln_ctl)   CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ', ovlap=1 )