Changeset 2715 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

Timestamp:

2011-03-30T17:58:35+02:00 (13 years ago)

Author:

rblod

Message:

First attempt to put dynamic allocation on the trunk

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90

@@ -6 +6 @@
    !! History:   -   ! 2005-04 (M. Vancoppenolle) Original code
    !!           3.0  ! 2008-03 (C. Ethe) restart files in using IOM interface
+   !!           4.0  ! 2011-02 (G. Madec) dynamical allocation
    !!----------------------------------------------------------------------
 #if defined key_lim3
@@ -22 +23 @@
    USE in_out_manager   ! I/O manager
    USE iom              ! I/O library
+   USE lib_mpp          ! MPP library
 
    IMPLICIT NONE
@@ -34 +36 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/LIM3 3.3 , UCL - NEMO Consortium (2010)
+   !! NEMO/LIM3 4.0 , UCL - NEMO Consortium (2011)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -90 +92 @@
       !! ** purpose  :   output of sea-ice variable in a netcdf file
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   z2d  => wrk_2d_1   ! 2D workspace
+      !
       INTEGER, INTENT(in) ::   kt     ! number of iteration
       !!
@@ -96 +101 @@
       CHARACTER(len=15) ::   znam
       CHARACTER(len=1)  ::   zchar, zchar1
-      REAL(wp), DIMENSION(jpi,jpj) :: z2d
-      !!----------------------------------------------------------------------
+      !!----------------------------------------------------------------------
+
+      IF( wrk_in_use(2, 1) ) THEN
+         CALL ctl_stop( 'lim_rst_write : requested workspace arrays unavailable' )   ;   RETURN
+      END IF
 
       iter = kt + nn_fsbc - 1   ! ice restarts are written at kt == nitrst - nn_fsbc + 1
@@ -287 +295 @@
       ENDIF
       !
+      IF( wrk_not_released(2, 1) )   CALL ctl_stop( 'lim_rst_write : failed to release workspace arrays' )
+      !
    END SUBROUTINE lim_rst_write
 
@@ -296 +306 @@
       !! ** purpose  :   read of sea-ice variable restart in a netcdf file
       !!----------------------------------------------------------------------
+      USE wrk_nemo, ONLY:   wrk_in_use, wrk_not_released
+      USE wrk_nemo, ONLY:   z2d  => wrk_2d_1   ! 2D workspace
+      !
       INTEGER :: ji, jj, jk, jl, indx
       REAL(wp) ::   zfice, ziter
       REAL(wp) ::   zs_inf, z_slope_s, zsmax, zsmin, zalpha, zindb   ! local scalars used for the salinity profile
       REAL(wp), DIMENSION(nlay_i)  ::   zs_zero 
-      REAL(wp), DIMENSION(jpi,jpj) ::   z2d
       CHARACTER(len=15) ::   znam
       CHARACTER(len=1)  ::   zchar, zchar1
@@ -307 +319 @@
       !!----------------------------------------------------------------------
 
+      IF( wrk_in_use(2, 1) ) THEN
+         CALL ctl_stop( 'lim_rst_read : requested workspace arrays unavailable.' )   ;   RETURN
+      ENDIF
+
       IF(lwp) THEN
          WRITE(numout,*)
          WRITE(numout,*) 'lim_rst_read : read ice NetCDF restart file'
-         WRITE(numout,*) '~~~~~~~~~~~~~~'
+         WRITE(numout,*) '~~~~~~~~~~~~~'
       ENDIF
 
@@ -554 +570 @@
       CALL iom_close( numrir )
       !
+      IF( wrk_not_released(2, 1) ) THEN
+         CALL ctl_stop( 'lim_rst_read : failed to release workspace arrays.' )
+      END IF
+      !
    END SUBROUTINE lim_rst_read