Changeset 826
- Timestamp:
- 2008-03-06T13:05:46+01:00 (16 years ago)
- Location:
- branches/dev_002_LIM/NEMO
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_002_LIM/NEMO/C1D_SRC/diawri1d.F90
r719 r826 194 194 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 195 195 196 #if ! defined key_dynspg_rl && defined key_ ice_lim196 #if ! defined key_dynspg_rl && defined key_lim3 197 197 ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 198 198 ! internal damping to Levitus that can be diagnosed from others … … 238 238 #endif 239 239 240 #if ( defined key_coupled && ! defined key_ ice_lim)240 #if ( defined key_coupled && ! defined key_lim3 ) 241 241 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 242 242 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 260 260 #endif 261 261 262 #if defined key_ ice_lim&& defined key_coupled262 #if defined key_lim3 && defined key_coupled 263 263 CALL histdef( nid_T,"soicetem" , "Ice Surface Temperature" , "K" , & ! tn_ice 264 264 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 365 365 CALL histwrite( nid_T, "sosstsst", it, tn(:,:,1) , ndim_hT, ndex_hT ) ! sea surface temperature 366 366 CALL histwrite( nid_T, "sosaline", it, sn(:,:,1) , ndim_hT, ndex_hT ) ! sea surface salinity 367 #if ! defined key_dynspg_rl && defined key_ ice_lim367 #if ! defined key_dynspg_rl && defined key_lim3 368 368 CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:) , ndim_hT, ndex_hT ) ! ice=>ocean water flux 369 369 CALL histwrite( nid_T, "sowaflep", it, fmass(:,:) , ndim_hT, ndex_hT ) ! atmos=>ocean water flux … … 397 397 CALL histwrite( nid_T, "sosafldp", it, zw2d , ndim_hT, ndex_hT ) ! salt flux damping 398 398 #endif 399 #if ( defined key_coupled && ! defined key_ ice_lim)399 #if ( defined key_coupled && ! defined key_lim3 ) 400 400 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 401 401 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping … … 412 412 CALL histwrite( nid_T, "sohtc300", it, htc3 , ndim_hT, ndex_hT ) ! first 300m heaat content 413 413 #endif 414 #if defined key_ ice_lim&& defined key_coupled414 #if defined key_lim3 && defined key_coupled 415 415 CALL histwrite( nid_T, "soicetem", it, tn_ice , ndim_hT, ndex_hT ) ! surf. ice temperature 416 416 CALL histwrite( nid_T, "soicealb", it, alb_ice , ndim_hT, ndex_hT ) ! ice albedo -
branches/dev_002_LIM/NEMO/C1D_SRC/icestp1d.F90
r719 r826 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_lim3 9 9 !!---------------------------------------------------------------------- 10 10 !! 'key_cfg_1d' .AND. 1D Configuration 11 !! 'key_ ice_lim' Lim sea-ice model11 !! 'key_lim3' Lim sea-ice model 12 12 !!---------------------------------------------------------------------- 13 13 !!---------------------------------------------------------------------- -
branches/dev_002_LIM/NEMO/NST_SRC/agrif_user.F90
r824 r826 62 62 USE sol_oce 63 63 USE in_out_manager 64 #if defined key_ ice_lim || defined key_ice_lim_old64 #if defined key_lim3 || defined key_lim3_old 65 65 USE ice_oce 66 66 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/DIA/diawri.F90
r824 r826 245 245 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) 246 246 #endif 247 #if ! defined key_dynspg_rl && ( defined key_ ice_lim|| defined key_lim2 )247 #if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 248 248 ! sowaflup = sowaflep + sorunoff + sowafldp + a term associated to 249 249 ! internal damping to Levitus that can be diagnosed from others … … 291 291 292 292 293 #if defined key_coupled && ! defined key_ ice_lim&& ! defined key_lim2293 #if defined key_coupled && ! defined key_lim3 && ! defined key_lim2 294 294 CALL histdef( nid_T, "sohefldp", "Surface Heat Flux: Damping" , "W/m2" , & ! qrp 295 295 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 317 317 #endif 318 318 319 #if ( defined key_ ice_lim|| defined key_lim2 ) && defined key_coupled319 #if ( defined key_lim3 || defined key_lim2 ) && defined key_coupled 320 320 CALL histdef( nid_T,"soicetem" , "Ice Surface Temperature" , "K" , & ! tn_ice 321 321 & jpi, jpj, nh_T, 1 , 1, 1 , -99 , 32, clop, zsto, zout ) … … 423 423 CALL histwrite( nid_T, "sossheig", it, sshn , ndim_hT, ndex_hT ) ! sea surface height 424 424 #endif 425 #if ! defined key_dynspg_rl && ( defined key_ ice_lim|| defined key_lim2 )425 #if ! defined key_dynspg_rl && ( defined key_lim3 || defined key_lim2 ) 426 426 CALL histwrite( nid_T, "iowaflup", it, fsalt(:,:) , ndim_hT, ndex_hT ) ! ice=>ocean water flux 427 427 CALL histwrite( nid_T, "sowaflep", it, fmass(:,:) , ndim_hT, ndex_hT ) ! atmos=>ocean water flux … … 448 448 CALL histwrite( nid_T, "sosbhfup", it, qsb , ndim_hT, ndex_hT ) ! sensible heat flux 449 449 #endif 450 #if defined key_coupled && ! defined key_ ice_lim&& ! defined key_lim2450 #if defined key_coupled && ! defined key_lim3 && ! defined key_lim2 451 451 CALL histwrite( nid_T, "sohefldp", it, qrp , ndim_hT, ndex_hT ) ! heat flux damping 452 452 CALL histwrite( nid_T, "sowafldp", it, erp , ndim_hT, ndex_hT ) ! freshwater flux damping … … 466 466 CALL histwrite( nid_T, "sohtc300", it, htc3 , ndim_hT, ndex_hT ) ! first 300m heaat content 467 467 #endif 468 #if ( defined key_ ice_lim|| defined key_lim2 ) && defined key_coupled468 #if ( defined key_lim3 || defined key_lim2 ) && defined key_coupled 469 469 CALL histwrite( nid_T, "soicetem", it, tn_ice , ndim_hT, ndex_hT ) ! surf. ice temperature 470 470 CALL histwrite( nid_T, "soicealb", it, alb_ice , ndim_hT, ndex_hT ) ! ice albedo -
branches/dev_002_LIM/NEMO/OPA_SRC/DIA/diawri_dimg.h90
r824 r826 187 187 ! fsel(:,:,15) = fsel(:,:,15) + fbt(:,:) 188 188 fsel(:,:,16) = fsel(:,:,16) + emps(:,:) 189 #if defined key_ ice_lim || defined key_ice_lim_old189 #if defined key_lim3 || defined key_lim3_old 190 190 fsel(:,:,17) = fsel(:,:,17) + fsalt(:,:) 191 191 #endif … … 277 277 ! fsel(:,:,15) = fbt(:,:) 278 278 fsel(:,:,16) = emps(:,:) * tmask(:,:,1) 279 #if defined key_ ice_lim || defined key_ice_lim_old279 #if defined key_lim3 || defined key_lim3_old 280 280 fsel(:,:,17) = fsalt(:,:) * tmask(:,:,1) 281 281 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/albedo.F90
r719 r826 53 53 CONTAINS 54 54 55 #if defined key_ ice_lim56 !!---------------------------------------------------------------------- 57 !! 'key_ ice_lim' LIM ice model55 #if defined key_lim3 56 !!---------------------------------------------------------------------- 57 !! 'key_lim3' LIM ice model 58 58 !!---------------------------------------------------------------------- 59 59 -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/bulk.F90
r824 r826 51 51 !! * Local declarations 52 52 REAL(wp), DIMENSION(jpi,jpj) :: zsst 53 # if ( ! defined key_ ice_lim&& !defined key_lim2 )53 # if ( ! defined key_lim3 && !defined key_lim2 ) 54 54 INTEGER :: ji, jj ! dummy loop indices 55 55 REAL(wp) :: ztgel, zicopa … … 70 70 ENDIF 71 71 72 # if ( ! defined key_ ice_lim&& ! defined key_lim2 )72 # if ( ! defined key_lim3 && ! defined key_lim2 ) 73 73 ! opa model ice freeze() 74 74 DO jj = 1, jpj … … 96 96 gsst(:,:) = 0. 97 97 98 # if ( ! defined key_ ice_lim&& ! defined key_lim2 )98 # if ( ! defined key_lim3 && ! defined key_lim2 ) 99 99 IF(ln_ctl) THEN ! print mean trends (used for debugging) 100 100 CALL prt_ctl_info(' Forcings ') -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flx_oce.F90
r824 r826 30 30 p_emp !: evaporation minus precipitation 31 31 32 #elif defined key_ ice_lim|| defined key_lim2 || defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core32 #elif defined key_lim3 || defined key_lim2 || defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core 33 33 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: & !: 34 34 qsr_ice , & !: solar flux over ice -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flxblk.F90
r824 r826 215 215 ! Initilization ! 216 216 !--------------------- 217 #if ! defined key_ ice_lim217 #if ! defined key_lim3 218 218 tn_ice(:,:) = psst(:,:) 219 219 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flxmod.F90
r719 r826 108 108 !!---------------------------------------------------------------------- 109 109 !! 'key_oasis3' or 'key_oasis4' and Coupled Ocan/Atmosphere 110 !! 'key_ ice_lim' with LIM sea-ice model110 !! 'key_lim3' with LIM sea-ice model 111 111 !!---------------------------------------------------------------------- 112 112 # include "flx_oasis_ice.h90" -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/ocesbc.F90
r824 r826 64 64 CONTAINS 65 65 66 #if defined key_ ice_lim|| defined key_lim267 !!---------------------------------------------------------------------- 68 !! 'key_ ice_lim' : LIM2 sea-ice model66 #if defined key_lim3 || defined key_lim2 67 !!---------------------------------------------------------------------- 68 !! 'key_lim3' : LIM2 sea-ice model 69 69 !! 'key_lim2' : LIM3 sea-ice model 70 70 !!---------------------------------------------------------------------- … … 180 180 # elif defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core 181 181 !!---------------------------------------------------------------------- 182 !! 'key_ ice_lim' with LIM sea-ice model182 !! 'key_lim3' with LIM sea-ice model 183 183 !!---------------------------------------------------------------------- 184 184 … … 817 817 !!---------------------------------------------------------------------- 818 818 819 #if defined key_ ice_lim|| defined key_lim2819 #if defined key_lim3 || defined key_lim2 820 820 ! sea ice indicator (1 or 0) 821 821 DO jj = 1, jpj -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/taumod.F90
r824 r826 59 59 !!---------------------------------------------------------------------- 60 60 !! 'key_oasis3' or 'key_oasis4' and Coupled Ocean/Atmosphere 61 !! 'key_ ice_lim'or 'key_lim2' LIM sea-ice61 !! 'key_lim3'or 'key_lim2' LIM sea-ice 62 62 !!---------------------------------------------------------------------- 63 63 ! New way: 3D referential link to the earth (avoid north pole pb) -
branches/dev_002_LIM/NEMO/OPA_SRC/TRA/traadv_cen2.F90
r824 r826 147 147 zind(ji,jj,jk) = MAX ( upsrnfh(ji,jj) * upsrnfz(jk), & ! changing advection scheme near runoff 148 148 & upsadv(ji,jj) & ! in the vicinity of some straits 149 #if defined key_ ice_lim|| defined key_lim2149 #if defined key_lim3 || defined key_lim2 150 150 & , tmask(ji,jj,jk) & ! half upstream tracer fluxes 151 151 & * MAX( 0., SIGN( 1., fzptn(ji,jj) & ! if tn < ("freezing"+0.1 ) -
branches/dev_002_LIM/NEMO/OPA_SRC/cpl.F90
r824 r826 569 569 sieoc(:,:) = sieoc(:,:) + freeze(:,:) 570 570 571 #if defined key_ ice_lim|| defined key_lim2571 #if defined key_lim3 || defined key_lim2 572 572 alboc(:,:) = alboc(:,:) + freeze(:,:) * alb_ice(:,:) 573 573 ticoc(:,:) = ticoc(:,:) + freeze(:,:) * tn_ice(:,:) -
branches/dev_002_LIM/NEMO/OPA_SRC/cpl_oce.F90
r824 r826 218 218 qsrc !: solar radiation (w m-2) 219 219 220 # if defined key_ ice_lim|| defined key_lim3220 # if defined key_lim3 || defined key_lim3 221 221 REAL(wp), DIMENSION(jpi,jpj) :: & !: 222 222 watm , & !: -
branches/dev_002_LIM/NEMO/OPA_SRC/ice_oce.F90
r824 r826 11 11 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 12 12 !!---------------------------------------------------------------------- 13 #if defined key_lim2 || defined key_ ice_lim13 #if defined key_lim2 || defined key_lim3 14 14 !!---------------------------------------------------------------------- 15 !! 'key_lim2 or key_ ice_lim' : LIM 2.0 or 3.0 ice model15 !! 'key_lim2 or key_lim3 ' : LIM 2.0 or 3.0 ice model 16 16 !!---------------------------------------------------------------------- 17 17 !! * Modules used -
branches/dev_002_LIM/NEMO/OPA_SRC/opa.F90
r824 r826 59 59 60 60 USE phycst ! physical constant (par_cst routine) 61 #if defined key_ ice_lim61 #if defined key_lim3 62 62 USE iceini ! initialization of sea-ice (ice_init routine) 63 63 #endif … … 287 287 CALL oc_fz_pt ! Surface freezing point 288 288 289 #if defined key_ ice_lim289 #if defined key_lim3 290 290 CALL ice_init ! Sea ice model LIM3 291 291 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/restart.F90
r824 r826 144 144 CALL iom_rstput( kt, nitrst, numrow, 'hdivn' , hdivn ) 145 145 146 #if defined key_ ice_lim|| defined key_lim2146 #if defined key_lim3 || defined key_lim2 147 147 CALL iom_rstput( kt, nitrst, numrow, 'nfice' , REAL( nfice, wp) ) ! ice computation frequency 148 148 CALL iom_rstput( kt, nitrst, numrow, 'sst_io' , sst_io ) … … 210 210 !!---------------------------------------------------------------------- 211 211 REAL(wp) :: zcoef, zkt, zrdt, zrdttra1, zndastp, znfice, znfbulk 212 #if defined key_ ice_lim|| defined key_lim2212 #if defined key_lim3 || defined key_lim2 213 213 INTEGER :: ji, jj 214 214 #endif … … 306 306 !!sm: TO BE MOVED IN NEW SURFACE MODULE... 307 307 308 #if defined key_ ice_lim|| defined key_lim2308 #if defined key_lim3 || defined key_lim2 309 309 ! Louvain La Neuve Sea Ice Model 310 310 IF( iom_varid( numror, 'nfice', ldstop = .FALSE. ) > 0 ) then -
branches/dev_002_LIM/NEMO/OPA_SRC/step.F90
r824 r826 96 96 USE zpshde ! partial step: hor. derivative (zps_hde routine) 97 97 USE ice_oce ! sea-ice variable 98 #if defined key_ ice_lim98 #if defined key_lim3 99 99 USE icestp ! sea-ice time-stepping (ice_stp routine) 100 100 #endif … … 210 210 CALL flx( kstp ) ! heat and freshwater fluxes 211 211 212 #if defined key_ ice_lim212 #if defined key_lim3 213 213 CALL ice_stp( kstp ) ! sea-ice model (Update stress & fluxes) 214 214 #endif -
branches/dev_002_LIM/NEMO/TOP_SRC/TRP/trcadv_cen2.F90
r719 r826 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_ ice_lim166 #if defined key_lim3 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.