Changeset 881 for branches/dev_001_SBC/NEMO/C1D_SRC
- Timestamp:
- 2008-04-08T11:45:52+02:00 (16 years ago)
- Location:
- branches/dev_001_SBC/NEMO/C1D_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_001_SBC/NEMO/C1D_SRC/diawri1d.F90
r714 r881 193 193 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 194 194 195 #if ! defined key_dynspg_rl && defined key_ ice_lim195 #if ! defined key_dynspg_rl && defined key_lim2 196 196 ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 197 197 ! internal damping to Levitus that can be diagnosed from others … … 237 237 #endif 238 238 239 #if ( defined key_coupled && ! defined key_ ice_lim)239 #if ( defined key_coupled && ! defined key_lim2 ) 240 240 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 241 241 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 259 259 #endif 260 260 261 #if defined key_ ice_lim&& defined key_coupled261 #if defined key_lim2 && defined key_coupled 262 262 CALL histdef( nid_T,"soicetem" , "Ice Surface Temperature" , "K" , & ! tn_ice 263 263 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 364 364 CALL histwrite( nid_T, "sosstsst", it, tn(:,:,1) , ndim_hT, ndex_hT ) ! sea surface temperature 365 365 CALL histwrite( nid_T, "sosaline", it, sn(:,:,1) , ndim_hT, ndex_hT ) ! sea surface salinity 366 #if ! defined key_dynspg_rl && defined key_ ice_lim366 #if ! defined key_dynspg_rl && defined key_lim2 367 367 CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:) , ndim_hT, ndex_hT ) ! ice=>ocean water flux 368 368 CALL histwrite( nid_T, "sowaflep", it, fmass(:,:) , ndim_hT, ndex_hT ) ! atmos=>ocean water flux … … 396 396 CALL histwrite( nid_T, "sosafldp", it, zw2d , ndim_hT, ndex_hT ) ! salt flux damping 397 397 #endif 398 #if ( defined key_coupled && ! defined key_ ice_lim)398 #if ( defined key_coupled && ! defined key_lim2 ) 399 399 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 400 400 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping … … 411 411 CALL histwrite( nid_T, "sohtc300", it, htc3 , ndim_hT, ndex_hT ) ! first 300m heaat content 412 412 #endif 413 #if defined key_ ice_lim&& defined key_coupled413 #if defined key_lim2 && defined key_coupled 414 414 CALL histwrite( nid_T, "soicetem", it, tn_ice , ndim_hT, ndex_hT ) ! surf. ice temperature 415 415 CALL histwrite( nid_T, "soicealb", it, alb_ice , ndim_hT, ndex_hT ) ! ice albedo -
branches/dev_001_SBC/NEMO/C1D_SRC/icestp1d.F90
r714 r881 6 6 !! History : 9.0 ! 04-10 (C. Ethe) from icestp, 1D configuration 7 7 !!---------------------------------------------------------------------- 8 #if defined key_cfg_1d && defined key_ ice_lim8 #if defined key_cfg_1d && defined key_lim2 9 9 !!---------------------------------------------------------------------- 10 10 !! 'key_cfg_1d' .AND. 1D Configuration 11 !! 'key_ ice_lim'Lim sea-ice model11 !! 'key_lim2' Lim sea-ice model 12 12 !!---------------------------------------------------------------------- 13 13 !!---------------------------------------------------------------------- … … 18 18 USE in_out_manager ! I/O manager 19 19 USE ice_oce ! ice variables 20 USE dom_ice 20 USE dom_ice_2 ! LIM sea-ice domain 21 21 USE sbc_oce ! surface boundary condition: ocean 22 22 USE sbc_ice ! surface boundary condition: ice 23 23 USE daymod ! calendar 24 24 USE phycst ! Define parameters for the routines 25 USE ice 25 USE ice_2 ! ice variables 26 26 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 27 USE limthd 28 USE limwri 29 USE limrst 27 USE limthd_2 28 USE limwri_2 29 USE limrst_2 30 30 31 31 USE tradmp ! damping salinity trend
Note: See TracChangeset
for help on using the changeset viewer.