Changeset 8916
- Timestamp:
- 2017-12-06T13:24:18+01:00 (6 years ago)
- Location:
- branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO/LIM_SRC_3/icerst.F90
r8781 r8916 18 18 USE ice ! sea-ice variables 19 19 USE dom_oce ! ocean domain 20 USE sbc_oce , ONLY : nn_fsbc 20 USE sbc_oce , ONLY : nn_fsbc, ln_meto_cpl 21 21 USE icectl 22 22 ! … … 145 145 z2d(:,:) = t_su(:,:,jl) 146 146 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t_su 147 znam = 'cnd_ice'//'_htc'//zchar 148 z2d(:,:) = cnd_ice(:,:,jl) 149 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! cnd_ice 150 znam = 't1_ice'//'_htc'//zchar 151 z2d(:,:) = t1_ice(:,:,jl) 152 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t1_ice 147 148 IF (ln_meto_cpl) THEN 149 znam = 'cnd_ice'//'_htc'//zchar 150 z2d(:,:) = cnd_ice(:,:,jl) 151 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! cnd_ice 152 znam = 't1_ice'//'_htc'//zchar 153 z2d(:,:) = t1_ice(:,:,jl) 154 CALL iom_rstput( iter, nitrst, numriw, znam , z2d ) ! t1_ice 155 ENDIF 156 153 157 END DO 154 158 … … 249 253 CALL iom_get( numrir, jpdom_autoglo, znam , z2d ) 250 254 t_su(:,:,jl) = z2d(:,:) 251 znam = 'cnd_ice'//'_htc'//zchar 252 CALL iom_get( numrir, jpdom_autoglo, znam , z2d ) 253 cnd_ice(:,:,jl) = z2d(:,:) 254 znam = 't1_ice'//'_htc'//zchar 255 CALL iom_get( numrir, jpdom_autoglo, znam , z2d ) 256 t1_ice(:,:,jl) = z2d(:,:) 255 256 IF (ln_meto_cpl) THEN 257 znam = 'cnd_ice'//'_htc'//zchar 258 CALL iom_get( numrir, jpdom_autoglo, znam , z2d ) 259 cnd_ice(:,:,jl) = z2d(:,:) 260 znam = 't1_ice'//'_htc'//zchar 261 CALL iom_get( numrir, jpdom_autoglo, znam , z2d ) 262 t1_ice(:,:,jl) = z2d(:,:) 263 ENDIF 264 257 265 END DO 258 266 -
branches/UKMO/dev_r8183_ICEMODEL_svn_removed/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
r8905 r8916 2405 2405 IF( ssnd(jps_a_p)%laction .OR. ssnd(jps_ht_p)%laction ) THEN 2406 2406 SELECT CASE( sn_snd_mpnd%cldes) 2407 CASE( ' weighted ice' )2407 CASE( 'ice only' ) 2408 2408 SELECT CASE( sn_snd_mpnd%clcat ) 2409 2409 CASE( 'yes' ) … … 2768 2768 2769 2769 CALL eos_fzp(tsn(:,:,1,jp_sal), sstfrz) 2770 ztmp1(:,:) = sstfrz(:,:) 2770 ztmp1(:,:) = sstfrz(:,:) + rt0 2771 2771 IF( ssnd(jps_sstfrz)%laction ) CALL cpl_snd( jps_sstfrz, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info) 2772 2772
Note: See TracChangeset
for help on using the changeset viewer.