Changeset 544 for trunk/NEMO/LIM_SRC/limrst.F90

Timestamp:

2006-10-20T16:23:21+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_078:RB: finalization of IOM

File:

• trunk/NEMO/LIM_SRC/limrst.F90 (modified) (6 diffs)

trunk/NEMO/LIM_SRC/limrst.F90

@@ -32 +32 @@
    PUBLIC   lim_rst_read    ! routine called by ??? module
 
-   LOGICAL, PUBLIC ::   lrst_ice         !: logical to control the oce restart write 
+   LOGICAL, PUBLIC ::   lrst_ice         !: logical to control the ice restart write 
    INTEGER, PUBLIC ::   numrir, numriw   !: logical unit for ice restart (read and write)
 
@@ -43 +43 @@
 CONTAINS
 
-# if ( defined key_mpp_mpi || defined key_mpp_shmem ) && defined key_dimgout
-   !!----------------------------------------------------------------------
-   !!   'key_mpp_mpi'     OR     'key_mpp_shmem'              MPP computing
-   !!   'key_dimgout' :                    Direct access file (DIMG format)
-   !!----------------------------------------------------------------------
-#  include "limrst_dimg.h90"
-
-# else
-   !!----------------------------------------------------------------------
-   !!   Default option                                          NetCDF file
-   !!----------------------------------------------------------------------
-
    SUBROUTINE lim_rst_opn( kt )
       !!----------------------------------------------------------------------
@@ -69 +57 @@
       IF( kt == nit000 )   lrst_ice = .FALSE.
       
-      IF    ( kt == nitrst - 2*nfice + 1 .AND. lrst_ice ) THEN
-         CALL ctl_stop( 'lim_rst_opn: ice restart frequency must be larger than nfice' )
-         numriw = 0
-      ELSEIF( kt == nitrst - 2*nfice + 1 .OR.  nitend - nit000 +1 < 2*nfice ) THEN
-         ! beware if model runs less than 2*nfice time step
+      IF( kt == nitrst - 2*nfice + 1 .OR.  nitend - nit000 + 1 <= nfice ) THEN
+         ! beware if model runs less than nfice + 1 time step
          ! beware of the format used to write kt (default is i8.8, that should be large enough)
          IF( nitrst > 1.0e9 ) THEN   
@@ -84 +69 @@
          clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_restart_ice"
          IF(lwp) WRITE(numout,*) '             open ice restart.output NetCDF file: '//clname
-         CALL iom_open( clname, numriw, ldwrt = .TRUE. )
+         CALL iom_open( clname, numriw, ldwrt = .TRUE., kiolib = jprstdimg )
          lrst_ice = .TRUE.
       ENDIF
@@ -191 +176 @@
       ENDIF
 
-      CALL iom_open ( 'restart_ice_in', numrir )
+      CALL iom_open ( 'restart_ice_in', numrir, kiolib = jprstdimg )
 
       CALL iom_get( numrir, 'nfice' , zfice )
@@ -265 +250 @@
    END SUBROUTINE lim_rst_read
 
-# endif
-
 #else
    !!----------------------------------------------------------------------