Changeset 5123 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
- Timestamp:
- 2015-03-04T17:06:03+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/LIM_SRC_3/limrst.F90
r4990 r5123 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_nicep ) CALL lim_prt( kt, jiindx, jjindx, 1, ' - Beginning the time step - ' ) ! control print 88 89 END SUBROUTINE lim_rst_opn 89 90 … … 165 166 CALL iom_rstput( iter, nitrst, numriw, 'stress2_i' , stress2_i ) 166 167 CALL iom_rstput( iter, nitrst, numriw, 'stress12_i' , stress12_i ) 167 CALL iom_rstput( iter, nitrst, numriw, 'snwice_mass' , snwice_mass ) !clem modif168 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 ) 169 170 170 171 DO jl = 1, jpl … … 395 396 CALL iom_get( numrir, jpdom_autoglo, 'stress2_i' , stress2_i ) 396 397 CALL iom_get( numrir, jpdom_autoglo, 'stress12_i', stress12_i ) 397 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass ) !clem modif398 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b ) !clem modif398 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass' , snwice_mass ) 399 CALL iom_get( numrir, jpdom_autoglo, 'snwice_mass_b', snwice_mass_b ) 399 400 400 401 DO jl = 1, jpl … … 521 522 ! 522 523 ! clem: I do not understand why the following IF is needed 523 ! I suspect something inconsistent in the main code with option n um_sal=1524 IF( n um_sal == 1 ) THEN524 ! I suspect something inconsistent in the main code with option nn_icesal=1 525 IF( nn_icesal == 1 ) THEN 525 526 DO jl = 1, jpl 526 sm_i(:,:,jl) = bulk_sal527 sm_i(:,:,jl) = rn_icesal 527 528 DO jk = 1, nlay_i 528 s_i(:,:,jk,jl) = bulk_sal529 s_i(:,:,jk,jl) = rn_icesal 529 530 END DO 530 531 END DO
Note: See TracChangeset
for help on using the changeset viewer.