Changeset 5260 for branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
- Timestamp:
- 2015-05-12T12:37:15+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
r4205 r5260 18 18 USE ice ! sea-ice variables 19 19 USE oce , ONLY : snwice_mass, snwice_mass_b 20 USE par_ice ! sea-ice parameters21 20 USE dom_oce ! ocean domain 22 21 USE sbc_oce ! Surface boundary condition: ocean fields … … 27 26 USE wrk_nemo ! work arrays 28 27 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 28 USE limctl 29 29 30 30 IMPLICIT NONE … … 33 33 PUBLIC lim_rst_opn ! routine called by icestep.F90 34 34 PUBLIC lim_rst_write ! routine called by icestep.F90 35 PUBLIC lim_rst_read ! routine called by iceini.F9035 PUBLIC lim_rst_read ! routine called by sbc_lim_init 36 36 37 37 LOGICAL, PUBLIC :: lrst_ice !: logical to control the ice restart write … … 86 86 ENDIF 87 87 ! 88 IF( ln_icectl ) CALL lim_prt( kt, iiceprt, jiceprt, 1, ' - Beginning the time step - ' ) ! control print 88 89 END SUBROUTINE lim_rst_opn 89 90 … … 142 143 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) 143 144 END DO 144 145 145 146 DO jl = 1, jpl 146 147 WRITE(zchar,'(I1)') jl … … 162 163 CALL iom_rstput( iter, nitrst, numriw, 'u_ice' , u_ice ) 163 164 CALL iom_rstput( iter, nitrst, numriw, 'v_ice' , v_ice ) 164 CALL iom_rstput( iter, nitrst, numriw, 'fsbbq' , fsbbq )165 165 CALL iom_rstput( iter, nitrst, numriw, 'stress1_i' , stress1_i ) 166 166 CALL iom_rstput( iter, nitrst, numriw, 'stress2_i' , stress2_i ) 167 167 CALL iom_rstput( iter, nitrst, numriw, 'stress12_i' , stress12_i ) 168 CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass' , snwice_mass ) !clem modif169 CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass_b', snwice_mass_b ) !clem modif168 CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass' , snwice_mass ) 169 CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass_b', snwice_mass_b ) 170 170 171 171 DO jl = 1, jpl … … 307 307 !! ** purpose : read of sea-ice variable restart in a netcdf file 308 308 !!---------------------------------------------------------------------- 309 INTEGER :: ji, jj, jk, jl , indx309 INTEGER :: ji, jj, jk, jl 310 310 REAL(wp) :: zfice, ziter 311 REAL(wp) :: zs_inf, z_slope_s, zsmax, zsmin, zalpha, zindb ! local scalars used for the salinity profile312 REAL(wp), POINTER, DIMENSION(:) :: zs_zero313 311 REAL(wp), POINTER, DIMENSION(:,:) :: z2d 314 312 CHARACTER(len=15) :: znam … … 318 316 !!---------------------------------------------------------------------- 319 317 320 CALL wrk_alloc( nlay_i, zs_zero )321 318 CALL wrk_alloc( jpi, jpj, z2d ) 322 319 … … 393 390 CALL iom_get( numrir, jpdom_autoglo, 'u_ice' , u_ice ) 394 391 CALL iom_get( numrir, jpdom_autoglo, 'v_ice' , v_ice ) 395 CALL iom_get( numrir, jpdom_autoglo, 'fsbbq' , fsbbq )396 392 CALL iom_get( numrir, jpdom_autoglo, 'stress1_i' , stress1_i ) 397 393 CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i ) 398 394 CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i ) 399 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass ) !clem modif400 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b ) !clem modif395 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass ) 396 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b ) 401 397 402 398 DO jl = 1, jpl … … 522 518 END DO 523 519 ! 520 ! clem: I do not understand why the following IF is needed 521 ! I suspect something inconsistent in the main code with option nn_icesal=1 522 IF( nn_icesal == 1 ) THEN 523 DO jl = 1, jpl 524 sm_i(:,:,jl) = rn_icesal 525 DO jk = 1, nlay_i 526 s_i(:,:,jk,jl) = rn_icesal 527 END DO 528 END DO 529 ENDIF 530 ! 524 531 !CALL iom_close( numrir ) !clem: closed in sbcice_lim.F90 525 532 ! 526 CALL wrk_dealloc( nlay_i, zs_zero )527 533 CALL wrk_dealloc( jpi, jpj, z2d ) 528 534 !
Note: See TracChangeset
for help on using the changeset viewer.