New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 14072 for NEMO/trunk/src/ICE/icerst.F90 – NEMO

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/ICE/icerst.F90

    r14039 r14072  
    1111   !!---------------------------------------------------------------------- 
    1212   !!   ice_rst_opn   : open  restart file 
    13    !!   ice_rst_write : write restart file  
    14    !!   ice_rst_read  : read  restart file  
     13   !!   ice_rst_write : write restart file 
     14   !!   ice_rst_read  : read  restart file 
    1515   !!---------------------------------------------------------------------- 
    1616   USE ice            ! sea-ice: variables 
     
    5454      CHARACTER(len=20)   ::   clkt     ! ocean time-step define as a character 
    5555      CHARACTER(len=50)   ::   clname   ! ice output restart file name 
    56       CHARACTER(len=256)  ::   clpath   ! full path to ice output restart file  
     56      CHARACTER(len=256)  ::   clpath   ! full path to ice output restart file 
    5757      CHARACTER(LEN=52)   ::   clpname   ! ocean output restart file name including prefix for AGRIF 
    5858      !!---------------------------------------------------------------------- 
     
    6161 
    6262      IF( ln_rst_list .OR. nn_stock /= -1 ) THEN 
    63       ! in order to get better performances with NetCDF format, we open and define the ice restart file  
    64       ! one ice time step before writing the data (-> at nitrst - 2*nn_fsbc + 1), except if we write ice  
     63      ! in order to get better performances with NetCDF format, we open and define the ice restart file 
     64      ! one ice time step before writing the data (-> at nitrst - 2*nn_fsbc + 1), except if we write ice 
    6565      ! restart files every ice time step or if an ice restart file was writen at nitend - 2*nn_fsbc + 1 
    6666      IF( kt == nitrst - 2*nn_fsbc + 1 .OR. nn_stock == nn_fsbc    & 
     
    7373            ! create the file 
    7474            clname = TRIM(cexper)//"_"//TRIM(ADJUSTL(clkt))//"_"//TRIM(cn_icerst_out) 
    75             clpath = TRIM(cn_icerst_outdir)  
     75            clpath = TRIM(cn_icerst_outdir) 
    7676            IF( clpath(LEN_TRIM(clpath):) /= '/' ) clpath = TRIM(clpath)//'/' 
    7777            IF(lwp) THEN 
     
    132132         IF(lwp) WRITE(numout,*) 
    133133         IF(lwp) WRITE(numout,*) 'ice_rst_write : write ice restart file  kt =', kt 
    134          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~'          
    135       ENDIF 
    136        
     134         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~' 
     135      ENDIF 
     136 
    137137      ! Write in numriw (if iter == nitrst) 
    138       ! ------------------  
     138      ! ------------------ 
    139139      !                                                                        ! calendar control 
    140       CALL iom_rstput( iter, nitrst, numriw, 'nn_fsbc', REAL( nn_fsbc, wp ) )      ! time-step  
     140      CALL iom_rstput( iter, nitrst, numriw, 'nn_fsbc', REAL( nn_fsbc, wp ) )      ! time-step 
    141141      CALL iom_rstput( iter, nitrst, numriw, 'kt_ice' , REAL( iter   , wp ) )      ! date 
    142        
     142 
    143143      IF(.NOT.lwxios) CALL iom_delay_rst( 'WRITE', 'ICE', numriw )   ! save only ice delayed global communication variables 
    144144 
     
    156156      CALL iom_rstput( iter, nitrst, numriw, 'v_il' , v_il  ) 
    157157      ! Snow enthalpy 
    158       DO jk = 1, nlay_s  
     158      DO jk = 1, nlay_s 
    159159         WRITE(zchar1,'(I2.2)') jk 
    160160         znam = 'e_s'//'_l'//zchar1 
     
    163163      END DO 
    164164      ! Ice enthalpy 
    165       DO jk = 1, nlay_i  
     165      DO jk = 1, nlay_i 
    166166         WRITE(zchar1,'(I2.2)') jk 
    167167         znam = 'e_i'//'_l'//zchar1 
     
    224224!            clpname = cn_icerst_in 
    225225!         ELSE 
    226 !            clpname = TRIM(Agrif_CFixed())//"_"//cn_icerst_in    
     226!            clpname = TRIM(Agrif_CFixed())//"_"//cn_icerst_in 
    227227!         ENDIF 
    228228          CALL iom_init( cr_icerst_cxt, kdid = numrir, ld_closedef = .TRUE. ) 
    229229      ENDIF 
    230230 
    231       ! test if v_i exists  
     231      ! test if v_i exists 
    232232      id0 = iom_varid( numrir, 'v_i' , ldstop = .FALSE. ) 
    233233 
     
    237237         ! Time info 
    238238         CALL iom_get( numrir, 'nn_fsbc', zfice ) 
    239          CALL iom_get( numrir, 'kt_ice' , ziter )     
     239         CALL iom_get( numrir, 'kt_ice' , ziter ) 
    240240         IF(lwp) WRITE(numout,*) '   read ice restart file at time step    : ', ziter 
    241241         IF(lwp) WRITE(numout,*) '   in any case we force it to nit000 - 1 : ', nit000 - 1 
     
    251251            &                   '   control of time parameter  nrstdt' ) 
    252252 
    253          ! --- mandatory fields --- !  
     253         ! --- mandatory fields --- ! 
    254254         CALL iom_get( numrir, jpdom_auto, 'v_i'  , v_i   ) 
    255255         CALL iom_get( numrir, jpdom_auto, 'v_s'  , v_s   ) 
Note: See TracChangeset for help on using the changeset viewer.