Changeset 5630 for branches/UKMO/dev_r5107_restart_func_and_date/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

Timestamp:

2015-07-23T18:05:51+02:00 (9 years ago)

Author:

dancopsey

Message:

Merged in revision 5518 of the trunk.

File:

• branches/UKMO/dev_r5107_restart_func_and_date/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90 (modified) (6 diffs)

branches/UKMO/dev_r5107_restart_func_and_date/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -25 +25 @@
    USE trdmxl_oce      ! ocean active mixed layer tracers trends variables
    USE divcur          ! hor. divergence and curl      (div & cur routines)
-   USE sbc_ice, ONLY : lk_lim3
 
    IMPLICIT NONE
@@ -86 +85 @@
          IF( nitrst <= nitend .AND. nitrst > 0 ) THEN 
             ! beware of the format used to write kt (default is i8.8, that should be large enough...)
-            IF ( ln_rstdate ) THEN 
-               CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )            
-               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday 
-            ELSE 
-               IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 
-               ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst 
-               ENDIF
+            IF ( ln_rstdate ) THEN  
+               CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )             
+               WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday  
+            ELSE  
+               IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst  
+               ELSE                            ;   WRITE(clkt, '(i8.8)') nitrst  
             ENDIF
             ! create the file
@@ -143 +141 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'sshb'   , sshb      )
                      !
-      IF( lk_lim3 )  CALL iom_rstput( kt, nitrst, numrow, 'fse3t_b', fse3t_b(:,:,:) )
-                     !
                      CALL iom_rstput( kt, nitrst, numrow, 'un'     , un        )     ! now fields
                      CALL iom_rstput( kt, nitrst, numrow, 'vn'     , vn        )
@@ -156 +152 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'rhd'    , rhd       )
 #endif
-                  IF( lk_lim3 ) THEN
-                     CALL iom_rstput( kt, nitrst, numrow, 'fraqsr_1lev'  , fraqsr_1lev     ) !clem modif
-                  ENDIF
       IF( kt == nitrst ) THEN
          CALL iom_close( numrow )     ! close the restart file (only at last time step)
@@ -244 +237 @@
          CALL iom_get( numror, jpdom_autoglo, 'hdivb'  , hdivb   )
          CALL iom_get( numror, jpdom_autoglo, 'sshb'   , sshb    )
-         IF( lk_lim3 )   CALL iom_get( numror, jpdom_autoglo, 'fse3t_b', fse3t_b(:,:,:) )
       ELSE
          neuler = 0
@@ -287 +279 @@
          ENDIF
 
-         IF( lk_lim3 .AND. .NOT. lk_vvl ) THEN
-            DO jk = 1, jpk
-               fse3t_b(:,:,jk) = fse3t_n(:,:,jk)
-            END DO
-         ENDIF
-
-      ENDIF
-      !
-      IF( lk_lim3 ) THEN
-         CALL iom_get( numror, jpdom_autoglo, 'fraqsr_1lev' , fraqsr_1lev )
       ENDIF
       !