Changeset 3448 for palm/trunk/SOURCE/netcdf_interface_mod.f90
- Timestamp:
- Oct 29, 2018 6:14:31 PM (5 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/netcdf_interface_mod.f90 (modified) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/netcdf_interface_mod.f90
r3435 r3448 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Adjustment of biometeorology calls 28 ! 29 ! 3435 2018-10-26 18:25:44Z gronemeier 27 30 ! Bugfix: corrected order of calls to define_netcdf_grid for masked output 28 31 ! Add vertical dimensions to masked output in case of terrain-following output … … 312 315 313 316 USE control_parameters, & 314 ONLY: fl_max, max_masks, multi_agent_system_end, & 317 ONLY: biometeorology, fl_max, & 318 max_masks, multi_agent_system_end, & 315 319 multi_agent_system_start, var_fl_max, varnamelength 316 320 USE kinds … … 326 330 (/ 'ag_id ', 'ag_x ', 'ag_y ', & 327 331 'ag_wind ', 'ag_temp ', 'ag_group ', & 328 'PM10 ', 'PM25 ', 'ag_ therm_comf', &332 'PM10 ', 'PM25 ', 'ag_iPT ', & 329 333 'ag_uv ', 'not_used ', 'not_used ', & 330 334 'not_used ' /) … … 513 517 id_var_zu_mask, id_var_zw_mask, & 514 518 id_var_zusi_mask, id_var_zwwi_mask 515 519 516 520 INTEGER(iwp), DIMENSION(1:max_masks,0:1,0:2) :: id_var_eutm_mask, & 517 521 id_var_nutm_mask … … 576 580 USE arrays_3d, & 577 581 ONLY: zu, zw 582 583 USE biometeorology_mod, & 584 ONLY: biom_define_netcdf_grid 578 585 579 586 USE chemistry_model_mod, & … … 635 642 USE radiation_model_mod, & 636 643 ONLY: radiation, radiation_define_netcdf_grid 637 638 USE biometeorology_mod, &639 ONLY: biometeorology_define_netcdf_grid640 644 641 645 USE spectra_mod, & … … 1132 1136 ENDIF 1133 1137 ! 1134 !-- Check for biometeorology quantities1135 IF ( .NOT. found .AND. radiation ) THEN1136 CALL biometeorology_define_netcdf_grid( domask(mid,av,i),&1137 found, grid_x, grid_y,&1138 grid_z )1139 ENDIF1140 !1141 1138 !-- Now check for user-defined quantities 1142 1139 IF ( .NOT. found ) THEN … … 1872 1869 ENDIF 1873 1870 1874 !1875 !-- Check for biometeorology quantities1876 IF ( .NOT. found .AND. radiation ) THEN1877 CALL biometeorology_define_netcdf_grid( do3d(av,i), found,&1878 grid_x, grid_y, &1879 grid_z )1880 ENDIF1881 1882 1871 !-- Check for gust module quantities 1883 1872 IF ( .NOT. found .AND. gust_module_enabled ) THEN 1884 1873 CALL gust_define_netcdf_grid( do3d(av,i), found, grid_x, & 1885 1874 grid_y, grid_z ) 1875 ENDIF 1876 1877 ! 1878 !-- Check for biometeorology quantities 1879 IF ( .NOT. found .AND. biometeorology ) THEN 1880 CALL biom_define_netcdf_grid( do3d(av,i), found, & 1881 grid_x, grid_y, grid_z ) 1886 1882 ENDIF 1887 1883 … … 2469 2465 2470 2466 ENDDO 2467 ! 2468 !-- Define vars for biometeorology 2469 CALL netcdf_create_var( id_set_agt, (/ id_dim_agtnum, & 2470 id_dim_time_agt /), agt_var_names(9), & 2471 nc_precision(8), id_var_agt(9), & 2472 TRIM( agt_var_units(9) ), & 2473 TRIM( agt_var_names(9) ), 339, 340, 341 ) 2474 2471 2475 ! 2472 2476 !-- Leave netCDF define mode … … 2827 2831 2828 2832 ! 2829 !-- Check for biometeorology quantities2830 IF ( .NOT. found .AND. radiation ) THEN2831 CALL biometeorology_define_netcdf_grid( do2d(av,i),&2832 found, grid_x, grid_y,&2833 grid_z )2834 ENDIF2835 2836 !2837 2833 !-- Check for gust module quantities 2838 2834 IF ( .NOT. found .AND. gust_module_enabled ) THEN … … 2841 2837 grid_z ) 2842 2838 ENDIF 2843 2839 ! 2840 !-- Check for human thermal comfort quantities 2841 IF ( .NOT. found .AND. biometeorology ) THEN 2842 CALL biom_define_netcdf_grid( do2d( av, i), found, & 2843 grid_x, grid_y, & 2844 grid_z ) 2845 ENDIF 2844 2846 ! 2845 2847 !-- Check for chemistry quantities … … 2894 2896 ELSEIF ( grid_z == 'zs' ) THEN 2895 2897 id_z = id_dim_zs_xy(av) 2898 ELSEIF ( grid_z == 'zu1' ) THEN 2899 id_z = id_dim_zu1_xy(av) 2896 2900 ENDIF 2897 2901 … … 3188 3192 count = (/ nx+1, ny+1 /) ) 3189 3193 CALL netcdf_handle_error( 'netcdf_define_header', 556 ) 3190 3194 3191 3195 ENDDO 3192 3196 DEALLOCATE( netcdf_data_2d ) … … 3724 3728 3725 3729 ! 3726 !-- Check for biometeorology quantities3727 IF ( .NOT. found .AND. radiation ) THEN3728 CALL biometeorology_define_netcdf_grid( do2d(av,i), &3729 found, &3730 grid_x, grid_y, &3731 grid_z )3732 ENDIF3733 3734 !3735 3730 !-- Check for gust module quantities 3736 3731 IF ( .NOT. found .AND. gust_module_enabled ) THEN … … 4582 4577 4583 4578 ! 4584 !-- Check for biometeorology quantities4585 IF ( .NOT. found .AND. radiation ) THEN4586 CALL biometeorology_define_netcdf_grid( do2d(av,i), &4587 found, &4588 grid_x, grid_y, &4589 grid_z )4590 ENDIF4591 4592 !4593 4579 !-- Check for gust module quantities 4594 4580 IF ( .NOT. found .AND. gust_module_enabled ) THEN
Note: See TracChangeset
for help on using the changeset viewer.
