Changeset 1502 for palm/trunk
- Timestamp:
- Dec 3, 2014 6:22:31 PM (9 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
-
read_var_list.f90 (modified) (11 diffs)
-
write_var_list.f90 (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/read_var_list.f90
r1497 r1502 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! Canopy module and parameters removed (parameters are always read from 23 ! canopy_par NAMELIST for initial and restart runs) 23 24 ! 24 25 ! Former revisions: … … 151 152 152 153 USE pegrid 153 154 USE plant_canopy_model_mod, &155 ONLY: alpha_lad, beta_lad, canopy_drag_coeff, canopy_mode, cthf, lad, &156 lad_surface, lad_vertical_gradient, lad_vertical_gradient_level,&157 lad_vertical_gradient_level_ind, &158 lai_beta, leaf_scalar_exch_coeff, leaf_surface_conc, pch_index, &159 plant_canopy160 154 161 155 USE statistics, & … … 238 232 READ ( 13 ) statistic_regions 239 233 IF ( .NOT. ALLOCATED( ug ) ) THEN 240 ALLOCATE( lad(0:nz+1), ug(0:nz+1), u_init(0:nz+1), vg(0:nz+1),&241 v_init(0:nz+1), pt_init(0:nz+1), q_init(0:nz+1), &242 ref_state(0:nz+1), sa_init(0:nz+1), &243 hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions), &234 ALLOCATE( ug(0:nz+1), u_init(0:nz+1), vg(0:nz+1), & 235 v_init(0:nz+1), pt_init(0:nz+1), q_init(0:nz+1), & 236 ref_state(0:nz+1), sa_init(0:nz+1), & 237 hom(0:nz+1,2,pr_palm+max_pr_user,0:statistic_regions), & 244 238 hom_sum(0:nz+1,pr_palm+max_pr_user,0:statistic_regions) ) 245 239 ENDIF … … 259 253 CASE ( 'advected_distance_y' ) 260 254 READ ( 13 ) advected_distance_y 261 CASE ( 'alpha_lad' )262 READ ( 13 ) alpha_lad263 255 CASE ( 'alpha_surface' ) 264 256 READ ( 13 ) alpha_surface … … 301 293 CASE ( 'bc_uv_t' ) 302 294 READ ( 13 ) bc_uv_t 303 CASE ( 'beta_lad' )304 READ ( 13 ) beta_lad305 295 CASE ( 'bottom_salinityflux' ) 306 296 READ ( 13 ) bottom_salinityflux … … 317 307 CASE ( 'call_psolver_at_all_substeps' ) 318 308 READ ( 13 ) call_psolver_at_all_substeps 319 CASE ( 'canopy_drag_coeff' )320 READ ( 13 ) canopy_drag_coeff321 CASE ( 'canopy_mode' )322 READ ( 13 ) canopy_mode323 309 CASE ( 'canyon_height' ) 324 310 READ ( 13 ) canyon_height … … 349 335 CASE ( 'coupling_start_time' ) 350 336 READ ( 13 ) coupling_start_time 351 CASE ( 'cthf' )352 READ ( 13 ) cthf353 337 CASE ( 'current_timestep_number' ) 354 338 READ ( 13 ) current_timestep_number … … 430 414 CASE ( 'km_constant' ) 431 415 READ ( 13 ) km_constant 432 CASE ( 'lad' )433 READ ( 13 ) lad434 CASE ( 'lad_surface' )435 READ ( 13 ) lad_surface436 CASE ( 'lad_vertical_gradient' )437 READ ( 13 ) lad_vertical_gradient438 CASE ( 'lad_vertical_gradient_level' )439 READ ( 13 ) lad_vertical_gradient_level440 CASE ( 'lad_vertical_gradient_level_in' )441 READ ( 13 ) lad_vertical_gradient_level_ind442 CASE ( 'lai_beta' )443 READ ( 13 ) lai_beta444 416 CASE ( 'large_scale_forcing' ) 445 417 READ ( 13 ) large_scale_forcing 446 418 CASE ( 'large_scale_subsidence' ) 447 419 READ ( 13 ) large_scale_subsidence 448 CASE ( 'leaf_scalar_exch_coeff' )449 READ ( 13 ) leaf_scalar_exch_coeff450 CASE ( 'leaf_surface_conc' )451 READ ( 13 ) leaf_surface_conc452 420 CASE ( 'limiter_sedimentation' ) 453 421 READ ( 13 ) limiter_sedimentation … … 501 469 CASE ( 'passive_scalar' ) 502 470 READ ( 13 ) passive_scalar 503 CASE ( 'pch_index' )504 READ ( 13 ) pch_index505 471 CASE ( 'phi' ) 506 472 READ ( 13 ) phi 507 CASE ( 'plant_canopy' )508 READ ( 13 ) plant_canopy509 473 CASE ( 'prandtl_layer' ) 510 474 READ ( 13 ) prandtl_layer … … 605 569 CASE ( 'time_disturb' ) 606 570 READ ( 13 ) time_disturb 607 571 CASE ( 'time_dopr' ) 608 572 READ ( 13 ) time_dopr 609 573 CASE ( 'time_domask' ) … … 734 698 ! 735 699 !-- Read next string 700 WRITE(9,*) 'var1 ', variable_chr 701 CALL local_flush(9) 736 702 READ ( 13 ) variable_chr 703 WRITE(9,*) 'var2 ', variable_chr 704 CALL local_flush(9) 737 705 738 706 ENDDO -
palm/trunk/SOURCE/write_var_list.f90
r1497 r1502 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! Canopy module and parameters removed (parameters are always read from 23 ! canopy_par NAMELIST for initial and restart runs), 24 ! Bugfix: added blanks in "cloud_top_radiation"-string to a total of 30 25 ! characters 23 26 ! 24 27 ! Former revisions: … … 139 142 USE pegrid 140 143 141 USE plant_canopy_model_mod, &142 ONLY: alpha_lad, beta_lad, canopy_drag_coeff, canopy_mode, cthf, lad, &143 lad_surface, lad_vertical_gradient, lad_vertical_gradient_level,&144 lad_vertical_gradient_level_ind, &145 lai_beta, leaf_scalar_exch_coeff, leaf_surface_conc, pch_index, &146 plant_canopy147 148 144 USE statistics, & 149 145 ONLY: statistic_regions, hom, hom_sum, u_max, u_max_ijk, v_max, & … … 180 176 WRITE ( 14 ) 'advected_distance_y ' 181 177 WRITE ( 14 ) advected_distance_y 182 WRITE ( 14 ) 'alpha_lad '183 WRITE ( 14 ) alpha_lad184 178 WRITE ( 14 ) 'alpha_surface ' 185 179 WRITE ( 14 ) alpha_surface … … 222 216 WRITE ( 14 ) 'bc_uv_t ' 223 217 WRITE ( 14 ) bc_uv_t 224 WRITE ( 14 ) 'beta_lad '225 WRITE ( 14 ) beta_lad226 218 WRITE ( 14 ) 'bottom_salinityflux ' 227 219 WRITE ( 14 ) bottom_salinityflux … … 238 230 WRITE ( 14 ) 'call_psolver_at_all_substeps ' 239 231 WRITE ( 14 ) call_psolver_at_all_substeps 240 WRITE ( 14 ) 'canopy_drag_coeff '241 WRITE ( 14 ) canopy_drag_coeff242 WRITE ( 14 ) 'canopy_mode '243 WRITE ( 14 ) canopy_mode244 232 WRITE ( 14 ) 'canyon_height ' 245 233 WRITE ( 14 ) canyon_height … … 274 262 WRITE ( 14 ) 'curvature_solution_effects ' 275 263 WRITE ( 14 ) curvature_solution_effects 276 WRITE ( 14 ) 'cthf '277 WRITE ( 14 ) cthf278 264 WRITE ( 14 ) 'cycle_mg ' 279 265 WRITE ( 14 ) cycle_mg … … 350 336 WRITE ( 14 ) 'km_constant ' 351 337 WRITE ( 14 ) km_constant 352 WRITE ( 14 ) 'lad '353 WRITE ( 14 ) lad354 WRITE ( 14 ) 'lad_surface '355 WRITE ( 14 ) lad_surface356 WRITE ( 14 ) 'lad_vertical_gradient '357 WRITE ( 14 ) lad_vertical_gradient358 WRITE ( 14 ) 'lad_vertical_gradient_level '359 WRITE ( 14 ) lad_vertical_gradient_level360 WRITE ( 14 ) 'lad_vertical_gradient_level_in'361 WRITE ( 14 ) lad_vertical_gradient_level_ind362 WRITE ( 14 ) 'lai_beta '363 WRITE ( 14 ) lai_beta364 338 WRITE ( 14 ) 'large_scale_forcing ' 365 339 WRITE ( 14 ) large_scale_forcing 366 340 WRITE ( 14 ) 'large_scale_subsidence ' 367 341 WRITE ( 14 ) large_scale_subsidence 368 WRITE ( 14 ) 'leaf_scalar_exch_coeff '369 WRITE ( 14 ) leaf_scalar_exch_coeff370 WRITE ( 14 ) 'leaf_surface_conc '371 WRITE ( 14 ) leaf_surface_conc372 342 WRITE ( 14 ) 'limiter_sedimentation ' 373 343 WRITE ( 14 ) limiter_sedimentation … … 418 388 WRITE ( 14 ) 'passive_scalar ' 419 389 WRITE ( 14 ) passive_scalar 420 WRITE ( 14 ) 'pch_index '421 WRITE ( 14 ) pch_index422 390 WRITE ( 14 ) 'phi ' 423 391 WRITE ( 14 ) phi 424 WRITE ( 14 ) 'plant_canopy '425 WRITE ( 14 ) plant_canopy426 392 WRITE ( 14 ) 'prandtl_layer ' 427 393 WRITE ( 14 ) prandtl_layer … … 462 428 WRITE ( 14 ) 'q_vertical_gradient_level_ind ' 463 429 WRITE ( 14 ) q_vertical_gradient_level_ind 464 WRITE ( 14 ) 'cloud_top_radiation '430 WRITE ( 14 ) 'cloud_top_radiation ' 465 431 WRITE ( 14 ) cloud_top_radiation 466 432 WRITE ( 14 ) 'random_generator '
Note: See TracChangeset
for help on using the changeset viewer.
