Changeset 3625 for branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OFF_SRC
- Timestamp:
- 2012-11-21T14:19:18+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_NOC_2012_rev3555/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r3294 r3625 52 52 LOGICAL :: ln_degrad = .false. !: degradation option enabled or not 53 53 54 INTEGER , PARAMETER :: jpfld = 19 ! maximum number of files to read54 INTEGER , PARAMETER :: jpfld = 20 ! maximum number of fields to read 55 55 INTEGER , SAVE :: jf_tem ! index of temperature 56 56 INTEGER , SAVE :: jf_sal ! index of salinity … … 72 72 INTEGER , SAVE :: jf_eiv ! index of v-eiv 73 73 INTEGER , SAVE :: jf_eiw ! index of w-eiv 74 INTEGER , SAVE :: jf_sfx ! index of downward salt flux 74 75 75 76 TYPE(FLD), ALLOCATABLE, DIMENSION(:) :: sf_dyn ! structure of input fields (file informations, fields read) … … 250 251 un (:,:,:) = sf_dyn(jf_uwd)%fnow(:,:,:) * umask(:,:,:) ! u-velocity 251 252 vn (:,:,:) = sf_dyn(jf_vwd)%fnow(:,:,:) * vmask(:,:,:) ! v-velocity 252 IF( .NOT.ln_dynwzv ) & 253 IF( .NOT.ln_dynwzv ) & ! w-velocity read in file 253 254 wn (:,:,:) = sf_dyn(jf_wwd)%fnow(:,:,:) * tmask(:,:,:) 254 255 hmld(:,:) = sf_dyn(jf_mld)%fnow(:,:,1) * tmask(:,:,1) ! mixed layer depht 255 256 wndm(:,:) = sf_dyn(jf_wnd)%fnow(:,:,1) * tmask(:,:,1) ! wind speed - needed for gas exchange 256 257 emp (:,:) = sf_dyn(jf_emp)%fnow(:,:,1) * tmask(:,:,1) ! E-P 257 emps(:,:) = emp(:,:) 258 fr_i(:,:) = sf_dyn(jf_ice)%fnow(:,:,1) * tmask(:,:,1) ! Sea-ice fraction 258 sfx (:,:) = 0.0_wp ! enable testing with old inputs ! downward salt flux 259 ! sfx (:,:) = sf_dyn(jf_sfx)%fnow(:,:,1) * tmask(:,:,1) ! downward salt flux (v3.5+) 260 fr_i(:,:) = sf_dyn(jf_ice)%fnow(:,:,1) * tmask(:,:,1) ! Sea-ice fraction 259 261 qsr (:,:) = sf_dyn(jf_qsr)%fnow(:,:,1) * tmask(:,:,1) ! solar radiation 260 262 … … 302 304 CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ', mask1=tmask, ovlap=1 ) 303 305 CALL prt_ctl(tab2d_1=hmld , clinfo1=' hmld - : ', mask1=tmask, ovlap=1 ) 304 CALL prt_ctl(tab2d_1= emps , clinfo1=' emps- : ', mask1=tmask, ovlap=1 )306 CALL prt_ctl(tab2d_1=sfx , clinfo1=' sfx - : ', mask1=tmask, ovlap=1 ) 305 307 CALL prt_ctl(tab2d_1=wndm , clinfo1=' wspd - : ', mask1=tmask, ovlap=1 ) 306 308 CALL prt_ctl(tab2d_1=qsr , clinfo1=' qsr - : ', mask1=tmask, ovlap=1 ) … … 330 332 TYPE(FLD_N) :: sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_wnd ! informations about the fields to be read 331 333 TYPE(FLD_N) :: sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl ! " " 332 TYPE(FLD_N) :: sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw 334 TYPE(FLD_N) :: sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_sfx ! " " 333 335 ! 334 336 NAMELIST/namdta_dyn/cn_dir, ln_dynwzv, ln_dynbbl, ln_degrad, & 335 337 & sn_tem, sn_sal, sn_mld, sn_emp, sn_ice, sn_qsr, sn_wnd, & 336 338 & sn_uwd, sn_vwd, sn_wwd, sn_avt, sn_ubl, sn_vbl, & 337 & sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw 339 & sn_ahu, sn_ahv, sn_ahw, sn_eiu, sn_eiv, sn_eiw, sn_sfx 338 340 339 341 !!---------------------------------------------------------------------- … … 348 350 sn_mld = FLD_N( 'dyna_grid_T' , 120 , 'somixght' , .true. , .true. , 'yearly' , '' , '' ) 349 351 sn_emp = FLD_N( 'dyna_grid_T' , 120 , 'sowaflcd' , .true. , .true. , 'yearly' , '' , '' ) 352 !! sn_emp = FLD_N( 'dyna_grid_T' , 120 , 'sowaflup' , .true. , .true. , 'yearly' , '' , '' ) ! v3.5+ 353 sn_sfx = FLD_N( 'dyna_grid_T' , 120 , 'sosfldow' , .true. , .true. , 'yearly' , '' , '' ) ! v3.5+ 350 354 sn_ice = FLD_N( 'dyna_grid_T' , 120 , 'soicecov' , .true. , .true. , 'yearly' , '' , '' ) 351 355 sn_qsr = FLD_N( 'dyna_grid_T' , 120 , 'soshfldo' , .true. , .true. , 'yearly' , '' , '' ) … … 426 430 ENDIF 427 431 ENDIF 432 ! Salt flux and concntration/dilution terms (new from v3.5) !! disabled to allow testing with old input files 433 !! jf_sfx = jfld + 1 ; jfld = jfld + 1 434 !! slf_d(jf_sfx) = sn_sfx 428 435 429 436 ALLOCATE( sf_dyn(jfld), STAT=ierr ) ! set sf structure
Note: See TracChangeset
for help on using the changeset viewer.