Changeset 8518 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90

Timestamp:

2017-09-13T18:46:56+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part6 - commits of the day

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icedia.F90

@@ -45 +45 @@
    !!----------------------------------------------------------------------
 CONTAINS
+
+   INTEGER FUNCTION ice_dia_alloc()
+      !!---------------------------------------------------------------------!
+      !!                ***  ROUTINE ice_rdgrft_alloc ***
+      !!---------------------------------------------------------------------!
+      ALLOCATE( vol_loc_ini(jpi,jpj), sal_loc_ini(jpi,jpj), tem_loc_ini(jpi,jpj), STAT=ice_dia_alloc )
+
+      IF( lk_mpp             )   CALL mpp_sum ( ice_dia_alloc )
+      IF( ice_dia_alloc /= 0 )   CALL ctl_warn( 'ice_dia_alloc: failed to allocate arrays' )
+      !
+   END FUNCTION ice_dia_alloc
 
    SUBROUTINE ice_dia( kt )
@@ -188 +199 @@
       !      
       IF( ln_icediahsb ) THEN
-         ALLOCATE( vol_loc_ini(jpi,jpj), sal_loc_ini(jpi,jpj), tem_loc_ini(jpi,jpj), STAT=ierror )
-         IF( ierror > 0 )  THEN
-            CALL ctl_stop( 'ice_dia: unable to allocate vol_loc_ini' )
-            RETURN
-         ENDIF
-         !
-         CALL ice_dia_rst( 'READ' )  !* read or initialize all required files
+         IF( ice_dia_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'ice_dia_init : unable to allocate arrays' )   ! allocate tke arrays
+         CALL ice_dia_rst( 'READ' )   ! read or initialize all required files
       ENDIF
       !
@@ -220 +226 @@
             CALL iom_get( numrir, 'kt_ice' , ziter )
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) ' ice_dia_rst read at time step = ', ziter
-            IF(lwp) WRITE(numout,*) '~~~~~~~'
+            IF(lwp) WRITE(numout,*) 'ice_dia_rst read at time step = ', ziter
+            IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
             CALL iom_get( numrir, 'frc_voltop' , frc_voltop  )
             CALL iom_get( numrir, 'frc_volbot' , frc_volbot  )
@@ -252 +258 @@
          IF( iter == nitrst ) THEN
             IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) ' ice_dia_rst write at time step = ', kt
-            IF(lwp) WRITE(numout,*) '~~~~~~~'
+            IF(lwp) WRITE(numout,*) 'ice_dia_rst write at time step = ', kt
+            IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
          ENDIF
          !