Changeset 885
- Timestamp:
- 2008-04-09T09:29:16+02:00 (16 years ago)
- Location:
- branches/dev_001_SBC/NEMO
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_001_SBC/NEMO/C1D_SRC/diawri1d.F90
r881 r885 193 193 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 194 194 195 #if ! defined key_dynspg_rl && defined key_lim2 196 ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to197 ! internal damping to Levitus that can be diagnosed from others198 ! sowaflcd = sowaflep + sorunoff + sowafldp + iowaflup199 CALL histdef( nid_T, "iowaflup", "Ice=>ocean net freshwater" , "kg/m2/s", & ! fsalt200 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout )201 CALL histdef( nid_T, "sowaflep", "atmos=>ocean net freshwater" , "kg/m2/s", & ! fmass202 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout )203 #endif195 !!$#if ! defined key_dynspg_rl && ( defined key_lim2 || defined key_lim2 ) 196 !!$ ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 197 !!$ ! internal damping to Levitus that can be diagnosed from others 198 !!$ ! sowaflcd = sowaflep + sorunoff + sowafldp + iowaflup 199 !!$ CALL histdef( nid_T, "iowaflup", "Ice=>ocean net freshwater" , "kg/m2/s", & ! fsalt 200 !!$ & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 201 !!$ CALL histdef( nid_T, "sowaflep", "atmos=>ocean net freshwater" , "kg/m2/s", & ! fmass 202 !!$ & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 203 !!$#endif 204 204 CALL histdef( nid_T, "sowaflup", "Net Upward Water Flux" , "Kg/m2/s", & ! emp 205 205 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 237 237 #endif 238 238 239 #if ( defined key_coupled && ! defined key_lim2)239 #if ( defined key_coupled && ! ( defined key_lim3 || 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_lim2&& defined key_coupled261 #if ( defined key_lim3 || 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_lim2366 #if ! defined key_dynspg_rl && ( defined key_lim3 || 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_lim2)398 #if ( defined key_coupled && ! ( defined key_lim3 || 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_lim2&& defined key_coupled413 #if ( defined key_lim3 || 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
r881 r885 6 6 !! History : 9.0 ! 04-10 (C. Ethe) from icestp, 1D configuration 7 7 !!---------------------------------------------------------------------- 8 #if defined key_cfg_1d && defined key_lim28 #if defined key_cfg_1d && ( defined key_lim3 || defined key_lim2 ) 9 9 !!---------------------------------------------------------------------- 10 10 !! 'key_cfg_1d' .AND. 1D Configuration 11 !! 'key_lim2' Limsea-ice model11 !! 'key_lim2' OR 'key_lim3' : LIM 2.0 or 3.0 sea-ice model 12 12 !!---------------------------------------------------------------------- 13 13 !!---------------------------------------------------------------------- -
branches/dev_001_SBC/NEMO/NST_SRC/agrif_user.F90
r881 r885 65 65 USE sol_oce 66 66 USE in_out_manager 67 #if defined key_lim 267 #if defined key_lim3 || defined key_lim2 68 68 USE ice_oce 69 69 #endif -
branches/dev_001_SBC/NEMO/OPA_SRC/DIA/diawri.F90
r881 r885 244 244 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 245 245 #endif 246 !!$#if ! defined key_dynspg_rl && defined key_lim2246 !!$#if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 247 247 !!$ ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 248 248 !!$ ! internal damping to Levitus that can be diagnosed from others … … 255 255 CALL histdef( nid_T, "sowaflup", "Net Upward Water Flux" , "Kg/m2/s", & ! emp 256 256 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 257 !!$CALL histdef( nid_T, "sorunoff", "Runoffs" , "Kg/m2/s", & ! runoffs258 !!$& jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout )257 CALL histdef( nid_T, "sorunoff", "Runoffs" , "Kg/m2/s", & ! runoffs 258 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 259 259 CALL histdef( nid_T, "sowaflcd", "concentration/dilution water flux" , "kg/m2/s", & ! emps 260 260 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 282 282 283 283 284 #if ( defined key_coupled && ! defined key_lim 2 )284 #if ( defined key_coupled && ! defined key_lim3 && ! defined key_lim2 ) 285 285 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 286 286 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 308 308 #endif 309 309 310 #if defined key_lim2&& defined key_coupled310 #if ( defined key_lim3 || defined key_lim2 ) && defined key_coupled 311 311 CALL histdef( nid_T,"soicetem" , "Ice Surface Temperature" , "K" , & ! tn_ice 312 312 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 414 414 CALL histwrite( nid_T, "sossheig", it, sshn , ndim_hT, ndex_hT ) ! sea surface height 415 415 #endif 416 !!$#if ! defined key_dynspg_rl && defined key_lim2416 !!$#if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 417 417 !!$ CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:) , ndim_hT, ndex_hT ) ! ice=>ocean water flux 418 418 !!$ CALL histwrite( nid_T, "sowaflep", it, fmass(:,:) , ndim_hT, ndex_hT ) ! atmos=>ocean water flux 419 419 !!$#endif 420 420 CALL histwrite( nid_T, "sowaflup", it, emp , ndim_hT, ndex_hT ) ! upward water flux 421 !!$CALL histwrite( nid_T, "sorunoff", it, runoff , ndim_hT, ndex_hT ) ! runoff421 CALL histwrite( nid_T, "sorunoff", it, runoff , ndim_hT, ndex_hT ) ! runoff 422 422 CALL histwrite( nid_T, "sowaflcd", it, emps , ndim_hT, ndex_hT ) ! c/d water flux 423 423 zw2d(:,:) = emps(:,:) * sn(:,:,1) * tmask(:,:,1) … … 434 434 CALL histwrite( nid_T, "sosafldp", it, zw2d , ndim_hT, ndex_hT ) ! salt flux damping 435 435 #endif 436 #if ( defined key_coupled && ! defined key_lim 2 )436 #if ( defined key_coupled && ! defined key_lim3 && ! defined key_lim2 ) 437 437 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 438 438 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping … … 452 452 CALL histwrite( nid_T, "sohtc300", it, htc3 , ndim_hT, ndex_hT ) ! first 300m heaat content 453 453 #endif 454 #if defined key_lim2&& defined key_coupled454 #if ( defined key_lim3 || defined key_lim2 ) && defined key_coupled 455 455 CALL histwrite( nid_T, "soicetem", it, tn_ice , ndim_hT, ndex_hT ) ! surf. ice temperature 456 456 CALL histwrite( nid_T, "soicealb", it, alb_ice , ndim_hT, ndex_hT ) ! ice albedo … … 627 627 ! Write all fields on T grid 628 628 CALL histwrite( id_i, "votemper", 1, tn , jpi*jpj*jpk, idex ) ! now temperature 629 CALL histwrite( id_i, "vosaline", 1, sn 629 CALL histwrite( id_i, "vosaline", 1, sn , jpi*jpj*jpk, idex ) ! now salinity 630 630 #if defined key_dynspg_rl 631 631 CALL histwrite( id_i, "sobarstf", 1, bsfn , jpi*jpj , idex ) ! barotropic streamfunction -
branches/dev_001_SBC/NEMO/OPA_SRC/cpl_oce.F90
r881 r885 218 218 qsrc !: solar radiation (w m-2) 219 219 220 # if defined key_lim 2220 # if defined key_lim3 || defined key_lim2 221 221 REAL(wp), DIMENSION(jpi,jpj) :: & !: 222 222 watm , & !: -
branches/dev_001_SBC/NEMO/OPA_SRC/ice_oce.F90
r881 r885 11 11 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 12 12 !!---------------------------------------------------------------------- 13 #if defined key_lim 213 #if defined key_lim3 || defined key_lim2 14 14 !!---------------------------------------------------------------------- 15 !! 'key_lim2' : LIM 2.0 ice model15 !! 'key_lim2' or 'key_lim3' : LIM 2.0 or 3.0 ice model 16 16 !!---------------------------------------------------------------------- 17 17 !! * Modules used … … 22 22 23 23 !! Shared module variables 24 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .TRUE. !: LIM ice model 24 # if defined key_lim2 25 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .TRUE. !: LIM2 ice model 26 LOGICAL, PUBLIC, PARAMETER :: lk_lim3 = .FALSE. !: LIM3 ice model 27 # else 28 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .FALSE. !: LIM2 ice model 29 LOGICAL, PUBLIC, PARAMETER :: lk_lim3 = .TRUE. !: LIM3 ice model 30 # endif 25 31 26 32 !!---------------------------------------------------------------------- … … 46 52 #else 47 53 !!---------------------------------------------------------------------- 48 !! Default option NO LIM 2.0 sea-ice model54 !! Default option NO LIM 2.0 or 3.0 sea-ice model 49 55 !!---------------------------------------------------------------------- 50 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .FALSE. !: No LIM ice model 56 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .FALSE. !: No LIM 2.0 ice model 57 LOGICAL, PUBLIC, PARAMETER :: lk_lim3 = .FALSE. !: No LIM 3.0 ice model 51 58 #endif 52 59 -
branches/dev_001_SBC/NEMO/OPA_SRC/phycst.F90
r703 r885 46 46 rtt = 273.16_wp , & !: triple point of temperature (Kelvin) 47 47 rt0 = 273.15_wp , & !: freezing point of water (Kelvin) 48 #if defined key_lim3 49 rt0_snow = 273.16_wp , & !: melting point of snow (Kelvin) 50 rt0_ice = 273.16_wp , & !: melting point of ice (Kelvin) 51 #else 48 52 rt0_snow = 273.15_wp , & !: melting point of snow (Kelvin) 49 53 rt0_ice = 273.05_wp , & !: melting point of ice (Kelvin) 54 #endif 50 55 rau0 = 1020._wp , & !: volumic mass of reference (kg/m3) 51 rauw = 1000._wp , & !: densityof pure water (kg/m3)56 rauw = 1000._wp , & !: volumic mass of pure water (kg/m3) 52 57 rcp = 4.e+3_wp, & !: ocean specific heat 53 58 ro0cpr !: = 1. / ( rau0 * rcp ) 54 59 55 60 REAL(wp), PUBLIC :: & !: 61 #if defined key_lim3 62 rcdsn = 0.31_wp , & !: thermal conductivity of snow 63 rcdic = 2.034396_wp , & !: thermal conductivity of fresh ice 64 cpic = 2067.0 , & 65 ! add the following lines 66 lsub = 2.834e+6 , & !: pure ice latent heat of sublimation (J.kg-1) 67 lfus = 0.334e+6 , & !: latent heat of fusion of fresh ice (J.kg-1) 68 rhoic = 917._wp , & !: volumic mass of sea ice (kg/m3) 69 tmut = 0.054 , & !: decrease of seawater meltpoint with salinity 70 #else 56 71 rcdsn = 0.22_wp , & !: conductivity of the snow 57 72 rcdic = 2.034396_wp , & !: conductivity of the ice … … 62 77 xsn = 2.8e+6 , & !: latent heat of sublimation of snow 63 78 rhoic = 900._wp , & !: volumic mass of sea ice (kg/m3) 79 #endif 64 80 rhosn = 330._wp , & !: volumic mass of snow (kg/m3) 65 81 emic = 0.97_wp , & !: emissivity of snow or ice … … 156 172 WRITE(numout,*) ' thermal conductivity of the snow = ', rcdsn , ' J/s/m/K' 157 173 WRITE(numout,*) ' thermal conductivity of the ice = ', rcdic , ' J/s/m/K' 174 #if defined key_lim3 175 WRITE(numout,*) ' fresh ice specific heat = ', cpic , ' J/kg/K' 176 WRITE(numout,*) ' latent heat of fusion of fresh ice / snow = ', lfus , ' J/kg' 177 WRITE(numout,*) ' latent heat of subl. of fresh ice / snow = ', lsub , ' J/kg' 178 #else 158 179 WRITE(numout,*) ' density times specific heat for snow = ', rcpsn , ' J/m^3/K' 159 180 WRITE(numout,*) ' density times specific heat for ice = ', rcpic , ' J/m^3/K' … … 161 182 WRITE(numout,*) ' volumetric latent heat fusion of snow = ', xlsn , ' J/m' 162 183 WRITE(numout,*) ' latent heat of sublimation of snow = ', xsn , ' J/kg' 184 #endif 163 185 WRITE(numout,*) ' density of sea ice = ', rhoic , ' kg/m^3' 164 186 WRITE(numout,*) ' density of snow = ', rhosn , ' kg/m^3' -
branches/dev_001_SBC/NEMO/TOP_SRC/TRP/trcadv_cen2.F90
r881 r885 164 164 zind(ji,jj,jk) = MAX ( upsrnfh(ji,jj) * upsrnfz(jk), & ! changing advection scheme near runoff 165 165 & upsadv(ji,jj) & ! in the vicinity of some straits 166 #if defined key_lim 2166 #if defined key_lim3 || defined key_lim2 167 167 & , tmask(ji,jj,jk) & ! half upstream tracer fluxes 168 168 & * MAX( 0., SIGN( 1., fzptn(ji,jj) & ! if tn < ("freezing"+0.1 )
Note: See TracChangeset
for help on using the changeset viewer.