Changeset 2766 for palm/trunk
- Timestamp:
- Jan 22, 2018 5:17:47 PM (7 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 21 edited
-
average_3d_data.f90 (modified) (3 diffs)
-
boundary_conds.f90 (modified) (4 diffs)
-
check_parameters.f90 (modified) (9 diffs)
-
chem_gasphase_mod.f90 (modified) (3 diffs)
-
chem_modules.f90 (modified) (3 diffs)
-
chem_photolysis_mod.f90 (modified) (3 diffs)
-
chemistry_model_mod.f90 (modified) (3 diffs)
-
data_output_3d.f90 (modified) (4 diffs)
-
init_3d_model.f90 (modified) (3 diffs)
-
netcdf_interface_mod.f90 (modified) (11 diffs)
-
palm.f90 (modified) (5 diffs)
-
parin.f90 (modified) (3 diffs)
-
plant_canopy_model_mod.f90 (modified) (2 diffs)
-
prognostic_equations.f90 (modified) (7 diffs)
-
read_3d_binary.f90 (modified) (4 diffs)
-
sum_up_3d_data.f90 (modified) (3 diffs)
-
surface_layer_fluxes_mod.f90 (modified) (6 diffs)
-
surface_mod.f90 (modified) (44 diffs)
-
swap_timelevel.f90 (modified) (4 diffs)
-
time_integration.f90 (modified) (6 diffs)
-
urban_surface_mod.f90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/average_3d_data.f90
r2742 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2742 2018-01-12 14:59:47Z suehring 27 30 ! Enable output of surface temperature 28 31 ! … … 126 129 USE averaging 127 130 128 #if defined( __chem )129 131 USE chemistry_model_mod, & 130 132 ONLY: chem_3d_data_averaging 131 #endif132 133 133 134 USE control_parameters, & … … 514 515 ! 515 516 !-- Chemistry quantity 516 #if defined( __chem )517 517 IF ( air_chemistry ) THEN 518 518 CALL chem_3d_data_averaging( 'average', doav(ii) ) 519 519 ENDIF 520 #endif521 520 ! 522 521 !-- User-defined quantity -
palm/trunk/SOURCE/boundary_conds.f90
r2718 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 179 182 w, w_p, w_m_l, w_m_n, w_m_r, w_m_s, pt_init 180 183 181 #if defined( __chem )182 184 USE chemistry_model_mod, & 183 185 ONLY: chem_boundary_conds 184 #endif185 186 186 187 USE control_parameters, & … … 525 526 ! 526 527 !-- Top/bottom boundary conditions for chemical species 527 #if defined( __chem )528 528 IF ( air_chemistry ) CALL chem_boundary_conds( 'set_bc_bottomtop' ) 529 #endif530 529 ! 531 530 !-- In case of inflow or nest boundary at the south boundary the boundary for v … … 630 629 ! 631 630 !-- Lateral boundary conditions for chemical species 632 #if defined( __chem )633 631 IF ( air_chemistry ) CALL chem_boundary_conds( 'set_bc_lateral' ) 634 #endif635 636 632 637 633 ! -
palm/trunk/SOURCE/check_parameters.f90
r2765 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2765 2018-01-22 11:34:58Z maronga 27 30 ! Renamed simulation_time_since_reference to 28 31 ! time_to_be_simulated_from_reference_point … … 578 581 579 582 USE arrays_3d 580 #if defined( __chem )581 583 USE chemistry_model_mod, & 582 584 ONLY: chem_boundary_conds, chem_check_data_output, & 583 585 chem_check_data_output_pr, chem_species 584 586 USE chem_modules 585 #endif586 587 USE cloud_parameters 587 588 USE constants … … 1401 1402 IF ( ocean ) sa_init = sa_surface 1402 1403 IF ( passive_scalar ) s_init = s_surface 1403 #if defined(__chem )1404 1404 IF ( air_chemistry ) THEN 1405 1405 DO lsp = 1, nvar … … 1407 1407 ENDDO 1408 1408 ENDIF 1409 #endif1410 1409 ! 1411 1410 !-- … … 1619 1618 ! 1620 1619 !-- Compute initial chemistry profile using the given chemical species gradients 1621 #if defined( __chem )1622 1620 IF ( air_chemistry ) THEN 1623 1621 DO lsp = 1, nvar … … 1629 1627 ENDDO 1630 1628 ENDIF 1631 #endif1632 1629 ! 1633 1630 ! … … 2113 2110 ! 2114 2111 !-- Boundary conditions for chemical species 2115 #if defined( __chem )2116 2112 IF ( air_chemistry ) CALL chem_boundary_conds( 'init' ) 2117 #endif2118 2113 2119 2114 ! … … 3070 3065 ENDIF 3071 3066 3072 #if defined( __chem )3073 3067 IF ( unit == 'illegal' ) THEN 3074 3068 CALL chem_check_data_output_pr( data_output_pr(i), i, & 3075 3069 unit, dopr_unit(i) ) 3076 3070 ENDIF 3077 #endif3078 3071 3079 3072 IF ( unit == 'illegal' ) THEN … … 3386 3379 ! 3387 3380 !-- Block of chemistry model outputs 3388 #if defined( __chem )3389 3381 IF ( unit == 'illegal' .AND. air_chemistry & 3390 3382 .AND. var(1:3) == 'kc_' ) THEN 3391 3383 CALL chem_check_data_output( var, unit, i, ilen, k ) 3392 3384 ENDIF 3393 #endif3394 3385 3395 3386 ! -
palm/trunk/SOURCE/chem_gasphase_mod.f90
r2718 r2766 1 1 MODULE chem_gasphase_mod 2 #if defined( __chem )3 2 !------------------------------------------------------------------------------! 4 3 ! … … 32 31 ! ----------------- 33 32 ! $Id: module_header 2460 2017-09-13 14:47:48Z forkel $ 33 ! Removed preprocessor directive __chem 34 ! 35 ! 2460 2017-09-13 14:47:48Z forkel 34 36 ! 35 37 ! … … 2433 2435 2434 2436 END SUBROUTINE fill_temp 2435 #endif 2437 2436 2438 END MODULE chem_gasphase_mod 2437 2439 -
palm/trunk/SOURCE/chem_modules.f90
r2718 r2766 27 27 ! ----------------- 28 28 ! $Id$ 29 ! Removed preprocessor directive __chem 30 ! 31 ! 2718 2018-01-02 08:49:38Z maronga 29 32 ! Initial revision 30 33 ! … … 45 48 ! 46 49 MODULE chem_modules 47 #if defined( __chem ) 50 48 51 USE kinds 49 52 USE chem_gasphase_mod, & … … 128 131 129 132 SAVE 130 #endif 133 131 134 END MODULE chem_modules 132 135 -
palm/trunk/SOURCE/chem_photolysis_mod.f90
r2718 r2766 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Removed preprocessor directive __chem 29 ! 30 ! 2718 2018-01-02 08:49:38Z maronga 28 31 ! Initial revision 29 32 ! … … 43 46 !------------------------------------------------------------------------------! 44 47 MODULE chem_photolysis_mod 45 #if defined( __chem ) 48 46 49 USE arrays_3d, & 47 50 ONLY: dzw, hyp, pt, q, ql, zu, zw … … 329 332 330 333 END SUBROUTINE photolysis_simple 331 #endif 334 332 335 END MODULE chem_photolysis_mod -
palm/trunk/SOURCE/chemistry_model_mod.f90
r2756 r2766 27 27 ! ----------------- 28 28 ! $Id$ 29 ! Removed preprocessor directive __chem 30 ! 31 ! 2756 2018-01-16 18:11:14Z suehring 29 32 ! Fill values in 3D output introduced. 30 33 ! … … 74 77 75 78 MODULE chemistry_model_mod 76 #if defined( __chem ) 79 77 80 USE kinds, ONLY: wp, iwp 78 81 USE indices, ONLY: nz, nzb,nzt,nysg,nyng,nxlg,nxrg,nys,nyn … … 1808 1811 1809 1812 1810 #endif1811 1813 END MODULE chemistry_model_mod 1812 1814 -
palm/trunk/SOURCE/data_output_3d.f90
r2756 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2756 2018-01-16 18:11:14Z suehring 27 30 ! Fill values for 3D output of chemical species introduced. 28 31 ! … … 185 188 USE averaging 186 189 187 #if defined( __chem )188 190 USE chemistry_model_mod, & 189 191 ONLY: chem_data_output_3d 190 #endif191 192 192 193 USE cloud_parameters, & … … 680 681 ! 681 682 !-- Chemistry model output 682 #if defined( __chem )683 683 IF ( .NOT. found .AND. air_chemistry ) THEN 684 684 CALL chem_data_output_3d( av, do3d(av,if), found, & … … 686 686 resorted = .TRUE. 687 687 ENDIF 688 #endif689 688 690 689 ! -
palm/trunk/SOURCE/init_3d_model.f90
r2758 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2758 2018-01-17 12:55:21Z suehring 27 30 ! In case of spinup of land- and urban-surface model, do not mask wind velocity 28 31 ! at first computational grid level … … 411 414 USE arrays_3d 412 415 413 #if defined( __chem )414 416 USE chemistry_model_mod, & 415 417 ONLY: chem_emissions 416 #endif417 418 418 419 USE cloud_parameters, & … … 2302 2303 !-- If required, set chemical emissions 2303 2304 !-- (todo(FK): This should later on be CALLed time-dependently in init_3d_model) 2304 #if defined( __chem )2305 2305 IF ( air_chemistry ) THEN 2306 2306 CALL chem_emissions 2307 2307 ENDIF 2308 #endif2309 2308 2310 2309 ! -
palm/trunk/SOURCE/netcdf_interface_mod.f90
r2746 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2746 2018-01-15 12:06:04Z suehring 27 30 ! Move flag plant canopy to modules 28 31 ! … … 481 484 ONLY: zu, zw 482 485 483 #if defined( __chem )484 486 USE chemistry_model_mod, & 485 487 ONLY: chem_define_netcdf_grid 486 #endif487 488 488 489 USE constants, & … … 930 931 ! 931 932 !-- Check for chemistry quantities 932 #if defined( __chem )933 933 IF ( .NOT. found .AND. air_chemistry ) THEN 934 934 CALL chem_define_netcdf_grid( domask(mid,av,i), & … … 936 936 grid_z ) 937 937 ENDIF 938 #endif939 938 940 939 ! … … 1474 1473 ! 1475 1474 !-- Check for chemistry quantities 1476 #if defined( __chem )1477 1475 IF ( .NOT. found .AND. air_chemistry ) THEN 1478 1476 CALL chem_define_netcdf_grid( do3d(av,i), found, & 1479 1477 grid_x, grid_y, grid_z ) 1480 1478 ENDIF 1481 #endif1482 1479 1483 1480 !-- Check for user-defined quantities … … 2129 2126 ! 2130 2127 !-- Check for chemistry quantities 2131 #if defined( __chem )2132 2128 IF ( .NOT. found .AND. air_chemistry ) THEN 2133 2129 CALL chem_define_netcdf_grid( do2d(av,i), found, & … … 2135 2131 grid_z ) 2136 2132 ENDIF 2137 #endif2138 2133 2139 2134 ! … … 2849 2844 ! 2850 2845 !-- Check for chemistry quantities 2851 #if defined( __chem )2852 2846 IF ( .NOT. found .AND. air_chemistry ) THEN 2853 2847 CALL chem_define_netcdf_grid( do2d(av,i), found, & … … 2855 2849 grid_z ) 2856 2850 ENDIF 2857 #endif2858 2851 2859 2852 ! … … 3518 3511 ! 3519 3512 !-- Check for chemistry quantities 3520 #if defined( __chem )3521 3513 IF ( .NOT. found .AND. air_chemistry ) THEN 3522 3514 CALL chem_define_netcdf_grid( do2d(av,i), found, & … … 3524 3516 grid_z ) 3525 3517 ENDIF 3526 #endif3527 3518 ! 3528 3519 !-- Check for user-defined quantities -
palm/trunk/SOURCE/palm.f90
r2720 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2720 2018-01-02 16:27:15Z kanani 27 30 ! Version update to 5.0 28 31 ! … … 205 208 USE arrays_3d 206 209 207 #if defined( __chem )208 210 USE chemistry_model_mod, & 209 211 ONLY: chem_init, chem_last_actions 212 210 213 USE chem_photolysis_mod, & 211 214 ONLY: photolysis_init 212 #endif213 215 214 216 USE control_parameters, & … … 374 376 !-- Initialize chemistry (called before check_parameters due to dependencies) 375 377 !-- --> Needs to be moved!! What is the dependency about? 376 #if defined( __chem )377 378 ! IF ( TRIM( initializing_actions ) /= 'read_restart_data' ) THEN 378 379 IF ( air_chemistry ) THEN … … 381 382 ENDIF 382 383 ! END IF 383 #endif384 384 ! 385 385 !-- Check control parameters and deduce further quantities … … 518 518 CALL radiation_last_actions 519 519 ENDIF 520 #if defined( __chem )521 520 IF ( air_chemistry ) THEN 522 521 CALL chem_last_actions 523 522 ENDIF 524 #endif525 523 526 524 CALL user_last_actions -
palm/trunk/SOURCE/parin.f90
r2718 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 330 333 ug, u_init, v_init, vg 331 334 332 #if defined( __chem )333 335 USE chemistry_model_mod, & 334 336 ONLY: chem_parin 335 337 336 338 USE chem_modules 337 #endif338 339 339 340 USE control_parameters … … 743 744 ! 744 745 !-- Read chemistry variables 745 #if defined( __chem )746 746 CALL chem_parin 747 #endif748 747 ! 749 748 !-- Check if uv exposure model is used and read &uvexposure_par -
palm/trunk/SOURCE/plant_canopy_model_mod.f90
r2746 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Increased LEN of canopy mode to 30 28 ! 29 ! 2746 2018-01-15 12:06:04Z suehring 27 30 ! Move flag plant canopy to modules 28 31 ! … … 170 173 171 174 172 CHARACTER (LEN= 20) :: canopy_mode = 'block' !< canopy coverage175 CHARACTER (LEN=30) :: canopy_mode = 'block' !< canopy coverage 173 176 174 177 INTEGER(iwp) :: pch_index = 0 !< plant canopy height/top index -
palm/trunk/SOURCE/prognostic_equations.f90
r2746 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2746 2018-01-15 12:06:04Z suehring 27 30 ! Move flag plant canopy to modules 28 31 ! … … 266 269 w, w_p 267 270 268 #if defined( __chem )269 271 USE chemistry_model_mod, & 270 272 ONLY: chem_integrate, chem_species, & … … 276 278 USE chem_modules, & 277 279 ONLY: call_chem_at_all_substeps, chem_gasphase_on 278 #endif279 280 280 281 USE control_parameters, & … … 444 445 !-- since exchange of ghost points is required after this update of the 445 446 !-- concentrations of chemical species 446 #if defined( __chem )447 447 IF ( air_chemistry ) THEN 448 448 ! … … 478 478 479 479 ENDIF 480 #endif481 480 482 481 ! … … 1298 1297 ! 1299 1298 !-- If required, compute prognostic equation for chemical quantites 1300 #if defined( __chem )1301 1299 IF ( air_chemistry ) THEN 1302 1300 CALL cpu_log( log_point(83), '(chem advec+diff+prog)', 'start' ) … … 1317 1315 CALL cpu_log( log_point(83), '(chem advec+diff+prog)', 'stop' ) 1318 1316 ENDIF ! Chemicals equations 1319 #endif1320 1317 1321 1318 ENDDO -
palm/trunk/SOURCE/read_3d_binary.f90
r2718 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 155 158 USE averaging 156 159 157 #if defined( __chem )158 160 USE chemistry_model_mod, & 159 161 ONLY: chem_read_restart_data, chem_species, nspec 160 #endif161 162 162 163 USE control_parameters, & … … 1114 1115 ! 1115 1116 !-- Read chemistry restart data 1116 #if defined( __chem )1117 1117 IF ( air_chemistry ) THEN 1118 1118 CALL chem_read_restart_data( i, nxlfa, nxl_on_file, nxrfa, & … … 1122 1122 tmp_2d, tmp_3d ) 1123 1123 ENDIF 1124 #endif1125 1124 1126 1125 ! -
palm/trunk/SOURCE/sum_up_3d_data.f90
r2743 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2743 2018-01-12 16:03:39Z suehring 27 30 ! In case of natural- and urban-type surfaces output surfaces fluxes in W/m2. 28 31 ! … … 172 175 ts_av, tsurf_av, u_av, us_av, v_av, vpt_av, w_av, z0_av, z0h_av,& 173 176 z0q_av 174 #if defined( __chem )175 177 USE chemistry_model_mod, & 176 178 ONLY: chem_3d_data_averaging, chem_integrate, chem_species, nspec 177 #endif178 179 179 180 USE cloud_parameters, & … … 1023 1024 ! 1024 1025 !-- Chemical quantity 1025 #if defined( __chem )1026 1026 IF ( air_chemistry .AND. trimvar(1:3) == 'kc_') THEN 1027 1027 CALL chem_3d_data_averaging( 'sum',doav(ii) ) 1028 1028 ENDIF 1029 #endif1030 1029 1031 1030 ! -
palm/trunk/SOURCE/surface_layer_fluxes_mod.f90
r2718 r2766 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Removed preprocessor directive __chem 29 ! 30 ! 2718 2018-01-02 08:49:38Z maronga 28 31 ! Corrected "Former revisions" section 29 32 ! … … 207 210 drho_air_zw, rho_air_zw 208 211 209 #if defined( __chem )210 212 USE chem_modules, & 211 213 ONLY: constant_csflux, nvar 212 #endif213 214 214 215 USE cloud_parameters, & … … 1814 1815 ! 1815 1816 !-- If required compute cs* (chemical species) 1816 #if defined( __chem )1817 1817 IF ( air_chemistry ) THEN 1818 1818 ! … … 1842 1842 ENDIF 1843 1843 ENDIF 1844 #endif1845 1844 1846 1845 ! … … 2050 2049 ! 2051 2050 !-- Compute the vertical chemical species' flux 2052 #if defined( __chem )2053 2051 DO lsp = 1, nvar 2054 2052 IF ( .NOT. constant_csflux(lsp) .AND. air_chemistry .AND. & … … 2062 2060 ENDIF 2063 2061 ENDDO 2064 #endif2065 2062 2066 2063 ! -
palm/trunk/SOURCE/surface_mod.f90
r2759 r2766 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Removed preprocessor directive __chem 29 ! 30 ! 2759 2018-01-17 16:24:59Z suehring 28 31 ! Bugfix, consider density in vertical fluxes of passive scalar as well as 29 32 ! chemical species. … … 123 126 rho_air, rho_air_zw, zu, zw, waterflux_input_conversion 124 127 125 #if defined( __chem )126 128 USE chem_modules 127 #endif128 129 129 130 USE control_parameters … … 968 969 ! 969 970 !-- Scaling parameter (cs*) and surface flux of chemical species 970 #if defined ( __chem )971 971 IF ( air_chemistry ) THEN 972 972 ALLOCATE ( surfaces%css(1:nvar,1:surfaces%ns) ) 973 973 ALLOCATE ( surfaces%cssws(1:nvar,1:surfaces%ns) ) 974 974 ENDIF 975 #endif976 975 ! 977 976 !-- Arrays for storing potential temperature and … … 1052 1051 ! 1053 1052 !-- Chemical species flux 1054 #if defined( __chem )1055 1053 IF ( air_chemistry ) THEN 1056 1054 ALLOCATE ( surfaces%cssws(1:nvar,1:surfaces%ns) ) 1057 1055 ENDIF 1058 #endif1059 1056 ! 1060 1057 !-- … … 1167 1164 ! 1168 1165 !-- Scaling parameter (cs*) and surface flux of chemical species 1169 #if defined( __chem )1170 1166 IF ( air_chemistry ) THEN 1171 1167 ALLOCATE ( surfaces%css(1:nvar,1:surfaces%ns) ) 1172 1168 ALLOCATE ( surfaces%cssws(1:nvar,1:surfaces%ns) ) 1173 1169 ENDIF 1174 #endif1175 1170 ! 1176 1171 !-- Arrays for storing potential temperature and … … 1737 1732 IF ( passive_scalar ) surf%ss(num_h) = 0.0_wp 1738 1733 1739 #if defined( __chem )1740 1734 DO lsp = 1, nvar 1741 1735 IF ( air_chemistry ) surf%css(lsp,num_h) = 0.0_wp 1742 1736 ENDDO 1743 #endif1744 1737 ! 1745 1738 !-- Set initial value for surface temperature … … 1819 1812 ENDIF 1820 1813 1821 #if defined( __chem )1822 1814 IF ( air_chemistry ) THEN 1823 1815 lsp_pr = 1 … … 1849 1841 ENDDO 1850 1842 ENDIF 1851 #endif1852 1843 1853 1844 IF ( ocean ) THEN … … 1920 1911 ! 1921 1912 !-- Prescribe top chemical species' flux 1922 #if defined( __chem )1923 1913 DO lsp = 1, nvar 1924 1914 IF ( air_chemistry .AND. constant_top_csflux(lsp) ) THEN … … 1926 1916 ENDIF 1927 1917 ENDDO 1928 #endif1929 1918 ! 1930 1919 !-- Prescribe top salinity flux … … 2063 2052 ENDIF 2064 2053 2065 #if defined( __chem )2066 2054 IF ( air_chemistry ) THEN 2067 2055 DO lsp = 1, nvar … … 2070 2058 ENDDO 2071 2059 ENDIF 2072 #endif2073 2060 2074 2061 ! … … 2271 2258 IF ( ALLOCATED( surf_def_h(l)%ssws ) ) & 2272 2259 surf_h(l)%ssws(mm(l)) = surf_def_h(l)%ssws(m) 2273 #if defined( __chem )2274 2260 IF ( ALLOCATED( surf_def_h(l)%css ) ) THEN 2275 2261 DO lsp = 1,nvar … … 2282 2268 ENDDO 2283 2269 ENDIF 2284 #endif2285 2270 IF ( ALLOCATED( surf_def_h(l)%ncsws ) ) & 2286 2271 surf_h(l)%ncsws(mm(l)) = surf_def_h(l)%ncsws(m) … … 2328 2313 IF ( ALLOCATED( surf_lsm_h%ssws ) ) & 2329 2314 surf_h(0)%ssws(mm(0)) = surf_lsm_h%ssws(m) 2330 #if defined( __chem )2331 2315 IF ( ALLOCATED( surf_lsm_h%css ) ) THEN 2332 2316 DO lsp = 1, nvar … … 2339 2323 ENDDO 2340 2324 ENDIF 2341 #endif2342 2325 IF ( ALLOCATED( surf_lsm_h%ncsws ) ) & 2343 2326 surf_h(0)%ncsws(mm(0)) = surf_lsm_h%ncsws(m) … … 2385 2368 IF ( ALLOCATED( surf_usm_h%ssws ) ) & 2386 2369 surf_h(0)%ssws(mm(0)) = surf_usm_h%ssws(m) 2387 #if defined( __chem )2388 2370 IF ( ALLOCATED( surf_usm_h%css ) ) THEN 2389 2371 DO lsp = 1, nvar … … 2396 2378 ENDDO 2397 2379 ENDIF 2398 #endif2399 2380 IF ( ALLOCATED( surf_usm_h%ncsws ) ) & 2400 2381 surf_h(0)%ncsws(mm(0)) = surf_usm_h%ncsws(m) … … 2474 2455 IF ( ALLOCATED( surf_def_v(l)%ssws ) ) & 2475 2456 surf_v(l)%ssws(mm(l)) = surf_def_v(l)%ssws(m) 2476 #if defined( __chem )2477 2457 IF ( ALLOCATED( surf_def_v(l)%css ) ) THEN 2478 2458 DO lsp = 1, nvar … … 2485 2465 ENDDO 2486 2466 ENDIF 2487 #endif2488 2467 IF ( ALLOCATED( surf_def_v(l)%ncsws ) ) & 2489 2468 surf_v(l)%ncsws(mm(l)) = surf_def_v(l)%ncsws(m) … … 2536 2515 IF ( ALLOCATED( surf_lsm_v(l)%ssws ) ) & 2537 2516 surf_v(l)%ssws(mm(l)) = surf_lsm_v(l)%ssws(m) 2538 #if defined( __chem )2539 2517 IF ( ALLOCATED( surf_lsm_v(l)%css ) ) THEN 2540 2518 DO lsp = 1, nvar … … 2547 2525 ENDDO 2548 2526 ENDIF 2549 #endif2550 2527 IF ( ALLOCATED( surf_lsm_v(l)%ncsws ) ) & 2551 2528 surf_v(l)%ncsws(mm(l)) = surf_lsm_v(l)%ncsws(m) … … 2598 2575 IF ( ALLOCATED( surf_usm_v(l)%ssws ) ) & 2599 2576 surf_v(l)%ssws(mm(l)) = surf_usm_v(l)%ssws(m) 2600 #if defined( __chem )2601 2577 IF ( ALLOCATED( surf_usm_v(l)%css ) ) THEN 2602 2578 DO lsp = 1, nvar … … 2609 2585 ENDDO 2610 2586 ENDIF 2611 #endif2612 2587 IF ( ALLOCATED( surf_usm_v(l)%ncsws ) ) & 2613 2588 surf_v(l)%ncsws(mm(l)) = surf_usm_v(l)%ncsws(m) … … 2717 2692 WRITE ( 14 ) surf_h(l)%ssws 2718 2693 ENDIF 2719 #if defined ( __chem )2720 2694 WRITE ( 14 ) 'surf_h(' // dum // ')%css ' 2721 2695 IF ( ALLOCATED ( surf_h(l)%css ) ) THEN … … 2726 2700 WRITE ( 14 ) surf_h(l)%cssws 2727 2701 ENDIF 2728 #endif2729 2702 WRITE ( 14 ) 'surf_h(' // dum // ')%qcsws ' 2730 2703 IF ( ALLOCATED ( surf_h(l)%qcsws ) ) THEN … … 2814 2787 WRITE ( 14 ) surf_v(l)%ssws 2815 2788 ENDIF 2816 #if defined( __chem )2817 2789 WRITE ( 14 ) 'surf_v(' // dum // ')%css ' 2818 2790 IF ( ALLOCATED ( surf_v(l)%css ) ) THEN … … 2823 2795 WRITE ( 14 ) surf_v(l)%cssws 2824 2796 ENDIF 2825 #endif2826 2797 WRITE ( 14 ) 'surf_v(' // dum // ')%qcsws ' 2827 2798 IF ( ALLOCATED ( surf_v(l)%qcsws ) ) THEN … … 3059 3030 IF ( ALLOCATED( surf_h(0)%ssws ) .AND. kk == 1 ) & 3060 3031 READ ( 13 ) surf_h(0)%ssws 3061 #if defined( __chem )3062 3032 CASE ( 'surf_h(0)%css' ) 3063 3033 IF ( ALLOCATED( surf_h(0)%css ) .AND. kk == 1 ) & … … 3066 3036 IF ( ALLOCATED( surf_h(0)%cssws ) .AND. kk == 1 ) & 3067 3037 READ ( 13 ) surf_h(0)%cssws 3068 #endif3069 3038 CASE ( 'surf_h(0)%qcsws' ) 3070 3039 IF ( ALLOCATED( surf_h(0)%qcsws ) .AND. kk == 1 ) & … … 3138 3107 IF ( ALLOCATED( surf_h(1)%ssws ) .AND. kk == 1 ) & 3139 3108 READ ( 13 ) surf_h(1)%ssws 3140 #if defined( __chem )3141 3109 CASE ( 'surf_h(1)%css' ) 3142 3110 IF ( ALLOCATED( surf_h(1)%css ) .AND. kk == 1 ) & … … 3145 3113 IF ( ALLOCATED( surf_h(1)%cssws ) .AND. kk == 1 ) & 3146 3114 READ ( 13 ) surf_h(1)%cssws 3147 #endif3148 3115 CASE ( 'surf_h(1)%qcsws' ) 3149 3116 IF ( ALLOCATED( surf_h(1)%qcsws ) .AND. kk == 1 ) & … … 3214 3181 IF ( ALLOCATED( surf_h(2)%ssws ) .AND. kk == 1 ) & 3215 3182 READ ( 13 ) surf_h(2)%ssws 3216 #if defined( __chem )3217 3183 CASE ( 'surf_h(2)%css' ) 3218 3184 IF ( ALLOCATED( surf_h(2)%css ) .AND. kk == 1 ) & … … 3221 3187 IF ( ALLOCATED( surf_h(2)%cssws ) .AND. kk == 1 ) & 3222 3188 READ ( 13 ) surf_h(2)%cssws 3223 #endif3224 3189 CASE ( 'surf_h(2)%qcsws' ) 3225 3190 IF ( ALLOCATED( surf_h(2)%qcsws ) .AND. kk == 1 ) & … … 3289 3254 IF ( ALLOCATED( surf_v(0)%ssws ) .AND. kk == 1 ) & 3290 3255 READ ( 13 ) surf_v(0)%ssws 3291 #if defined( __chem )3292 3256 CASE ( 'surf_v(0)%css' ) 3293 3257 IF ( ALLOCATED( surf_v(0)%css ) .AND. kk == 1 ) & … … 3296 3260 IF ( ALLOCATED( surf_v(0)%cssws ) .AND. kk == 1 ) & 3297 3261 READ ( 13 ) surf_v(0)%cssws 3298 #endif3299 3262 CASE ( 'surf_v(0)%qcsws' ) 3300 3263 IF ( ALLOCATED( surf_v(0)%qcsws ) .AND. kk == 1 ) & … … 3371 3334 IF ( ALLOCATED( surf_v(1)%ssws ) .AND. kk == 1 ) & 3372 3335 READ ( 13 ) surf_v(1)%ssws 3373 #if defined( __chem )3374 3336 CASE ( 'surf_v(1)%css' ) 3375 3337 IF ( ALLOCATED( surf_v(1)%css ) .AND. kk == 1 ) & … … 3378 3340 IF ( ALLOCATED( surf_v(1)%cssws ) .AND. kk == 1 ) & 3379 3341 READ ( 13 ) surf_v(1)%cssws 3380 #endif3381 3342 CASE ( 'surf_v(1)%qcsws' ) 3382 3343 IF ( ALLOCATED( surf_v(1)%qcsws ) .AND. kk == 1 ) & … … 3453 3414 IF ( ALLOCATED( surf_v(2)%ssws ) .AND. kk == 1 ) & 3454 3415 READ ( 13 ) surf_v(2)%ssws 3455 #if defined( __chem )3456 3416 CASE ( 'surf_v(2)%css' ) 3457 3417 IF ( ALLOCATED( surf_v(2)%css ) .AND. kk == 1 ) & … … 3460 3420 IF ( ALLOCATED( surf_v(2)%cssws ) .AND. kk == 1 ) & 3461 3421 READ ( 13 ) surf_v(2)%cssws 3462 #endif3463 3422 CASE ( 'surf_v(2)%qcsws' ) 3464 3423 IF ( ALLOCATED( surf_v(2)%qcsws ) .AND. kk == 1 ) & … … 3535 3494 IF ( ALLOCATED( surf_v(3)%ssws ) .AND. kk == 1 ) & 3536 3495 READ ( 13 ) surf_v(3)%ssws 3537 #if defined( __chem )3538 3496 CASE ( 'surf_v(3)%css' ) 3539 3497 IF ( ALLOCATED( surf_v(3)%css ) .AND. kk == 1 ) & … … 3542 3500 IF ( ALLOCATED( surf_v(3)%cssws ) .AND. kk == 1 ) & 3543 3501 READ ( 13 ) surf_v(3)%cssws 3544 #endif3545 3502 CASE ( 'surf_v(3)%qcsws' ) 3546 3503 IF ( ALLOCATED( surf_v(3)%qcsws ) .AND. kk == 1 ) & … … 3762 3719 ENDIF 3763 3720 3764 #if defined( __chem )3765 3721 IF ( INDEX( TRIM( field_chr ), '%css' ) /= 0 ) THEN 3766 3722 IF ( ALLOCATED( surf_target%css ) .AND. & … … 3779 3735 ENDIF 3780 3736 ENDIF 3781 #endif3782 3737 3783 3738 IF ( INDEX( TRIM( field_chr ), '%qcs' ) /= 0 ) THEN -
palm/trunk/SOURCE/swap_timelevel.f90
r2718 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 130 133 #endif 131 134 132 #if defined( __chem )133 135 USE chemistry_model_mod, & 134 136 ONLY: chem_swap_timelevel 135 #endif136 137 137 138 USE land_surface_model_mod, & … … 246 247 ENDIF 247 248 248 #if defined( __chem )249 249 IF ( air_chemistry ) CALL chem_swap_timelevel(0) 250 #endif251 250 252 251 swap_level = 1 … … 278 277 ENDIF 279 278 280 #if defined( __chem )281 279 IF ( air_chemistry ) CALL chem_swap_timelevel(1) 282 #endif283 280 284 281 swap_level = 2 -
palm/trunk/SOURCE/time_integration.f90
r2718 r2766 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Removed preprocessor directive __chem 28 ! 29 ! 2718 2018-01-02 08:49:38Z maronga 27 30 ! Corrected "Former revisions" section 28 31 ! … … 314 317 ONLY: calc_mean_profile 315 318 316 #if defined( __chem )317 319 USE chemistry_model_mod, & 318 320 ONLY: chem_emissions, chem_species … … 320 322 USE chem_modules, & 321 323 ONLY: nspec 322 #endif323 324 324 325 USE control_parameters, & … … 693 694 ENDIF 694 695 IF ( passive_scalar ) CALL exchange_horiz( s_p, nbgp ) 695 #if defined( __chem )696 696 IF ( air_chemistry ) THEN 697 697 DO n = 1, nspec … … 699 699 ENDDO 700 700 ENDIF 701 #endif 701 702 702 CALL cpu_log( log_point(26), 'exchange-horiz-progn', 'stop' ) 703 703 … … 1005 1005 ENDDO ! Intermediate step loop 1006 1006 ! 1007 !-- If required, consider chemical emissions 1008 !-- (todo (FK): Implement hourly call of emissions, using time_utc from 1009 !-- data_and_time_mod.f90; 1010 !-- move the CALL to appropriate location) 1011 ! #if defined( __chem ) 1012 ! IF ( air_chemistry ) THEN 1013 ! CALL chem_emissions 1014 ! ENDIF 1015 ! #endif 1007 !-- If required, consider chemical emissions 1008 !-- (todo (FK): Implement hourly call of emissions, using time_utc from 1009 !-- data_and_time_mod.f90; 1010 !-- move the CALL to appropriate location) 1011 IF ( air_chemistry ) THEN 1012 CALL chem_emissions 1013 ENDIF 1016 1014 ! 1017 1015 !-- If required, do UV exposure calculations -
palm/trunk/SOURCE/urban_surface_mod.f90
r2765 r2766 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Removed redundant commas, added some blanks 29 ! 30 ! 2765 2018-01-22 11:34:58Z maronga 28 31 ! Major bugfix in calculation of f_shf. Adjustment of roughness lengths in 29 32 ! building_pars … … 5863 5866 start_index_on_file, & 5864 5867 end_index_on_file , & 5865 nxlc, nysc, ,&5868 nxlc, nysc, & 5866 5869 nys_on_file, nyn_on_file, & 5867 nxl_on_file, nxr_on_file )5870 nxl_on_file, nxr_on_file ) 5868 5871 #else 5869 5872 IF ( kk == 1 ) THEN … … 6022 6025 start_index_on_file, & 6023 6026 end_index_on_file , & 6024 nxlc, nysc, ,&6027 nxlc, nysc, & 6025 6028 nys_on_file, nyn_on_file, & 6026 6029 nxl_on_file,nxr_on_file ) … … 6135 6138 nxlf, nxrf, nysf, nynf, & 6136 6139 nys_on_file, nyn_on_file, & 6137 nxl_on_file, nxr_on_file )6140 nxl_on_file, nxr_on_file ) 6138 6141 #endif 6139 6142 CASE ( 't_window_v(0)' ) … … 6152 6155 nxlf, nxrf, nysf, nynf, & 6153 6156 nys_on_file, nyn_on_file, & 6154 nxl_on_file, nxr_on_file )6157 nxl_on_file, nxr_on_file ) 6155 6158 #else 6156 6159 IF ( kk == 1 ) THEN … … 6181 6184 start_index_on_file, & 6182 6185 end_index_on_file , & 6183 nxlc, nysc, ,&6186 nxlc, nysc, & 6184 6187 nys_on_file, nyn_on_file, & 6185 nxl_on_file, nxr_on_file )6188 nxl_on_file, nxr_on_file ) 6186 6189 #else 6187 6190 IF ( kk == 1 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.
