Changeset 14072 for NEMO/trunk/src/OCE/IOM/restart.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/IOM/restart.F90 (modified) (13 diffs)

NEMO/trunk/src/OCE/IOM/restart.F90

@@ -19 +19 @@
    !!   rst_read   : read the ocean restart file
    !!----------------------------------------------------------------------
-   USE oce             ! ocean dynamics and tracers 
+   USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE sbc_ice         ! only lk_si3 
+   USE sbc_ice         ! only lk_si3
    USE phycst          ! physical constants
    USE eosbn2          ! equation of state            (eos bn2 routine)
@@ -49 +49 @@
       !!---------------------------------------------------------------------
       !!                   ***  ROUTINE rst_opn  ***
-      !!                     
-      !! ** Purpose : + initialization (should be read in the namelist) of nitrst 
+      !!
+      !! ** Purpose : + initialization (should be read in the namelist) of nitrst
       !!              + open the restart when we are one time step before nitrst
       !!                   - restart header is defined when kt = nitrst-1
@@ -66 +66 @@
       !
       IF( kt == nit000 ) THEN   ! default definitions
-         lrst_oce = .FALSE.   
+         lrst_oce = .FALSE.
          IF( ln_rst_list ) THEN
             nrst_lst = 1
@@ -74 +74 @@
          ENDIF
       ENDIF
-      
+
       IF( .NOT. ln_rst_list .AND. nn_stock == -1 )   RETURN   ! we will never do any restart
 
       ! frequency-based restart dumping (nn_stock)
-      IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nn_stock ) == 0 ) THEN   
+      IF( .NOT. ln_rst_list .AND. MOD( kt - 1, nn_stock ) == 0 ) THEN
          ! we use kt - 1 and not kt - nit000 to keep the same periodicity from the beginning of the experiment
          nitrst = kt + nn_stock - 1                  ! define the next value of nitrst for restart writing
@@ -87 +87 @@
       ! except if we write ocean restart files every time step or if an ocean restart file was writen at nitend - 1
       IF( kt == nitrst - 1 .OR. nn_stock == 1 .OR. ( kt == nitend .AND. .NOT. lrst_oce ) ) THEN
-         IF( nitrst <= nitend .AND. nitrst > 0 ) THEN 
+         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( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst
@@ -115 +115 @@
                   clpname = clname
                ELSE
-                  clpname = TRIM(Agrif_CFixed())//"_"//clname   
+                  clpname = TRIM(Agrif_CFixed())//"_"//clname
                ENDIF
                numrow = iom_xios_setid(TRIM(clpath)//TRIM(clpname))
@@ -135 +135 @@
       !!---------------------------------------------------------------------
       !!                   ***  ROUTINE rstwrite  ***
-      !!                     
+      !!
       !! ** Purpose :   Write restart fields in NetCDF format
       !!
@@ -164 +164 @@
                      CALL iom_rstput( kt, nitrst, numrow, 'rhop'   , rhop      )
       ENDIF
-      
-      IF (ln_diurnal) CALL iom_rstput( kt, nitrst, numrow, 'Dsst', x_dsst )  
+
+      IF (ln_diurnal) CALL iom_rstput( kt, nitrst, numrow, 'Dsst', x_dsst )
       IF( kt == nitrst ) THEN
          IF(.NOT.lwxios) THEN
@@ -187 +187 @@
 
    SUBROUTINE rst_read_open
-      !!---------------------------------------------------------------------- 
+      !!----------------------------------------------------------------------
       !!                   ***  ROUTINE rst_read_open  ***
-      !! 
+      !!
       !! ** Purpose :   Open read files for NetCDF restart
-      !! 
+      !!
       !! ** Method  :   Use a non-zero, positive value of numror to assess whether or not
       !!                the file has already been opened
@@ -222 +222 @@
 !               clpname = cn_ocerst_in
 !            ELSE
-!               clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in   
+!               clpname = TRIM(Agrif_CFixed())//"_"//cn_ocerst_in
 !            ENDIF
              CALL iom_init( cr_ocerst_cxt, kdid = numror, ld_closedef = .TRUE. )
@@ -234 +234 @@
 
    SUBROUTINE rst_read( Kbb, Kmm )
-      !!---------------------------------------------------------------------- 
+      !!----------------------------------------------------------------------
       !!                   ***  ROUTINE rst_read  ***
-      !! 
+      !!
       !! ** Purpose :   Read velocity and T-S fields in the restart file
-      !! 
+      !!
       !! ** Method  :   Read in restart.nc fields which are necessary for restart
       !!
@@ -255 +255 @@
       IF(.NOT.lrxios ) CALL iom_delay_rst( 'READ', 'OCE', numror )   ! read only ocean delayed global communication variables
       !
-      !                             !*  Diurnal DSST 
-      IF( ln_diurnal )   CALL iom_get( numror, jpdom_auto, 'Dsst' , x_dsst ) 
-      IF ( ln_diurnal_only ) THEN 
+      !                             !*  Diurnal DSST
+      IF( ln_diurnal )   CALL iom_get( numror, jpdom_auto, 'Dsst' , x_dsst )
+      IF ( ln_diurnal_only ) THEN
          IF(lwp) WRITE( numout, * ) &
-         &   "rst_read:- ln_diurnal_only set, setting rhop=rho0" 
+         &   "rst_read:- ln_diurnal_only set, setting rhop=rho0"
          rhop = rho0
-         CALL iom_get( numror, jpdom_auto, 'tn'     , w3d ) 
+         CALL iom_get( numror, jpdom_auto, 'tn'     , w3d )
          ts(:,:,1,jp_tem,Kmm) = w3d(:,:,1)
-         RETURN 
-      ENDIF  
+         RETURN
+      ENDIF
       !
       !                             !*  Read Kmm fields
@@ -289 +289 @@
          CALL iom_get( numror, jpdom_auto, 'rhop'   , rhop )   ! now    potential density
       ELSE
-         CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, gdept(:,:,:,Kmm) )   
+         CALL eos( ts(:,:,:,:,Kmm), rhd, rhop, gdept(:,:,:,Kmm) )
       ENDIF
       !