Changeset 824
- Timestamp:
- 2008-03-06T12:37:37+01:00 (16 years ago)
- Location:
- branches/dev_002_LIM/NEMO
- Files:
-
- 1 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_002_LIM/NEMO/NST_SRC/agrif_user.F90
r782 r824 62 62 USE sol_oce 63 63 USE in_out_manager 64 #if defined key_ice_lim 64 #if defined key_ice_lim || defined key_ice_lim_old 65 65 USE ice_oce 66 66 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/DIA/diafwb.F90
r719 r824 20 20 USE blk_oce ! ??? 21 21 USE flxblk ! atmospheric surface quantity 22 USE flxblk_2 ! atmospheric surface quantity 22 23 USE lib_mpp ! distributed memory computing library 23 24 -
branches/dev_002_LIM/NEMO/OPA_SRC/DIA/diawri.F90
r719 r824 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_lim247 #if ! defined key_dynspg_rl && ( defined key_ice_lim || 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 )293 #if defined key_coupled && ! defined key_ice_lim && ! 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_coupled319 #if ( defined key_ice_lim || 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_lim425 #if ! defined key_dynspg_rl && ( defined key_ice_lim || 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 )450 #if defined key_coupled && ! defined key_ice_lim && ! 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_coupled468 #if ( defined key_ice_lim || 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
r719 r824 187 187 ! fsel(:,:,15) = fsel(:,:,15) + fbt(:,:) 188 188 fsel(:,:,16) = fsel(:,:,16) + emps(:,:) 189 #if defined key_ice_lim 189 #if defined key_ice_lim || defined key_ice_lim_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 279 #if defined key_ice_lim || defined key_ice_lim_old 280 280 fsel(:,:,17) = fsalt(:,:) * tmask(:,:,1) 281 281 #endif -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/bulk.F90
r719 r824 16 16 USE ocfzpt ! ocean freezing point 17 17 USE flxblk ! bulk formulae 18 USE flxblk_2 ! bulk formulae 18 19 USE blk_oce ! bulk variable 19 20 USE flx_oce … … 50 51 !! * Local declarations 51 52 REAL(wp), DIMENSION(jpi,jpj) :: zsst 52 # if ! defined key_ice_lim53 # if ( ! defined key_ice_lim && !defined key_lim2 ) 53 54 INTEGER :: ji, jj ! dummy loop indices 54 55 REAL(wp) :: ztgel, zicopa … … 69 70 ENDIF 70 71 71 # if ! defined key_ice_lim72 # if ( ! defined key_ice_lim && ! defined key_lim2 ) 72 73 ! opa model ice freeze() 73 74 DO jj = 1, jpj … … 87 88 88 89 zsst(:,:) = gsst(:,:) / REAL( nfbulk ) * tmask(:,:,1) 89 CALL flx_blk( zsst ) 90 IF ( .NOT. lk_lim2 ) CALL flx_blk( zsst ) 91 92 #if defined key_lim2 93 CALL flx_blk_2( zsst ) 94 #endif 90 95 91 96 gsst(:,:) = 0. 92 97 93 # if ! defined key_ice_lim98 # if ( ! defined key_ice_lim && ! defined key_lim2 ) 94 99 IF(ln_ctl) THEN ! print mean trends (used for debugging) 95 100 CALL prt_ctl_info(' Forcings ') -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flx_oce.F90
r719 r824 30 30 p_emp !: evaporation minus precipitation 31 31 32 #elif defined key_ice_lim || defined key_ flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core32 #elif defined key_ice_lim || 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
r789 r824 4 4 !! Ocean forcing: bulk thermohaline forcing of the ocean (or ice) 5 5 !!===================================================================== 6 #if defined key_flx_bulk_monthly || defined key_flx_bulk_daily6 #if defined key_flx_bulk_monthly || defined key_flx_bulk_daily 7 7 !!---------------------------------------------------------------------- 8 8 !! 'key_flx_bulk_monthly' or MONTHLY bulk -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/flxfwb.F90
r719 r824 23 23 USE blk_oce 24 24 USE flxblk ! bulk formulea 25 USE flxblk_2 ! bulk formulea 25 26 USE daymod ! calendar 26 27 -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/ocesbc.F90
r719 r824 64 64 CONTAINS 65 65 66 #if defined key_ice_lim 67 !!---------------------------------------------------------------------- 68 !! 'key_ice_lim' : LIM sea-ice model 66 #if defined key_ice_lim || defined key_lim2 67 !!---------------------------------------------------------------------- 68 !! 'key_ice_lim' : LIM2 sea-ice model 69 !! 'key_lim2' : LIM3 sea-ice model 69 70 !!---------------------------------------------------------------------- 70 71 # if defined key_coupled … … 816 817 !!---------------------------------------------------------------------- 817 818 818 #if defined key_ice_lim 819 #if defined key_ice_lim || defined key_lim2 819 820 ! sea ice indicator (1 or 0) 820 821 DO jj = 1, jpj -
branches/dev_002_LIM/NEMO/OPA_SRC/SBC/taumod.F90
r719 r824 59 59 !!---------------------------------------------------------------------- 60 60 !! 'key_oasis3' or 'key_oasis4' and Coupled Ocean/Atmosphere 61 !! 'key_ice_lim' 61 !! 'key_ice_lim'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
r789 r824 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 149 #if defined key_ice_lim || 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
r719 r824 569 569 sieoc(:,:) = sieoc(:,:) + freeze(:,:) 570 570 571 #if defined key_ice_lim 571 #if defined key_ice_lim || 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
r719 r824 218 218 qsrc !: solar radiation (w m-2) 219 219 220 # if defined key_ice_lim 220 # if defined key_ice_lim || defined key_lim3 221 221 REAL(wp), DIMENSION(jpi,jpj) :: & !: 222 222 watm , & !: -
branches/dev_002_LIM/NEMO/OPA_SRC/ice_oce.F90
r719 r824 11 11 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 12 12 !!---------------------------------------------------------------------- 13 #if defined key_ ice_lim13 #if defined key_lim2 || defined key_ice_lim 14 14 !!---------------------------------------------------------------------- 15 !! 'key_ ice_lim' : LIMice model15 !! 'key_lim2 or key_ice_lim ' : LIM 2.0 or 3.0 ice model 16 16 !!---------------------------------------------------------------------- 17 17 !! * Modules used … … 23 23 24 24 !! Shared module variables 25 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .TRUE. !: LIM ice model 25 # if defined key_lim2 26 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .TRUE. !: LIM2 ice model 27 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .FALSE. !: LIM3 ice model 28 # else 29 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .FALSE. !: LIM2 ice model 30 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .TRUE. !: LIM3 ice model 31 # endif 26 32 27 33 !!---------------------------------------------------------------------- … … 57 63 !! Default option NO LIM sea-ice model 58 64 !!---------------------------------------------------------------------- 59 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .FALSE. !: No LIM ice model 65 LOGICAL, PUBLIC, PARAMETER :: lk_lim2 = .FALSE. !: No LIM 2.0 ice model 66 LOGICAL, PUBLIC, PARAMETER :: lk_ice_lim = .FALSE. !: No LIM 3.0 ice model 60 67 #endif 61 68 -
branches/dev_002_LIM/NEMO/OPA_SRC/opa.F90
r719 r824 59 59 60 60 USE phycst ! physical constant (par_cst routine) 61 #if defined key_ice_lim 61 62 USE iceini ! initialization of sea-ice (ice_init routine) 63 #endif 64 #if defined key_lim2 65 USE iceini_2 ! initialization of sea-ice (ice_init_2 routine) 66 #endif 62 67 USE cpl ! coupled ocean/atmos. (cpl_init routine) 63 68 USE ocfzpt ! ocean freezing point (oc_fz_pt routine) … … 283 288 284 289 #if defined key_ice_lim 285 CALL ice_init ! Sea ice model 290 CALL ice_init ! Sea ice model LIM3 291 #endif 292 293 #if defined key_lim2 294 CALL ice_init_2 ! Sea ice model LIM2 286 295 #endif 287 296 -
branches/dev_002_LIM/NEMO/OPA_SRC/restart.F90
r783 r824 144 144 CALL iom_rstput( kt, nitrst, numrow, 'hdivn' , hdivn ) 145 145 146 #if defined key_ice_lim 146 #if defined key_ice_lim || 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 212 #if defined key_ice_lim || 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 308 #if defined key_ice_lim || 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
r789 r824 96 96 USE zpshde ! partial step: hor. derivative (zps_hde routine) 97 97 USE ice_oce ! sea-ice variable 98 #if defined key_ice_lim 98 99 USE icestp ! sea-ice time-stepping (ice_stp routine) 99 100 #endif 101 #if defined key_lim2 102 USE icestp_2 ! sea-ice time-stepping (ice_stp_2 routine) 103 #endif 100 104 USE diawri ! Standard run outputs (dia_wri routine) 101 105 USE trdicp ! Ocean momentum/tracers trends (trd_wri routine) … … 206 210 CALL flx( kstp ) ! heat and freshwater fluxes 207 211 208 IF( lk_ice_lim ) CALL ice_stp( kstp ) ! sea-ice model (Update stress & fluxes) 212 #if defined key_ice_lim 213 CALL ice_stp( kstp ) ! sea-ice model (Update stress & fluxes) 214 #endif 215 #if defined key_lim2 216 CALL ice_stp_2( kstp ) ! sea-ice model (Update stress & fluxes) 217 #endif 209 218 210 219 CALL oce_sbc( kstp ) ! ocean surface boudaries
Note: See TracChangeset
for help on using the changeset viewer.