Changeset 3469 for palm/trunk/SOURCE
- Timestamp:
- Oct 30, 2018 8:05:07 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/Makefile
r3467 r3469 25 25 # ----------------- 26 26 # $Id$ 27 # Add indoor model (kanani, srissman, tlang), 28 # minor formatting 29 # 30 # 3467 2018-10-30 19:05:21Z suehring 27 31 # Implementation of a new aerosol module salsa. 28 32 # … … 514 518 average_3d_data.f90 \ 515 519 basic_constants_and_equations_mod.f90 \ 520 biometeorology_mod.f90 \ 521 biometeorology_ipt_mod.f90 \ 522 biometeorology_pt_mod.f90 \ 523 biometeorology_pet_mod.f90 \ 524 biometeorology_utci_mod.f90 \ 516 525 boundary_conds.f90 \ 517 526 buoyancy.f90 \ … … 553 562 gust_mod.f90 \ 554 563 header.f90 \ 555 biometeorology_mod.f90 \ 556 biometeorology_ipt_mod.f90 \ 557 biometeorology_pt_mod.f90 \ 558 biometeorology_pet_mod.f90 \ 559 biometeorology_utci_mod.f90 \ 564 indoor_model_mod.f90 \ 560 565 inflow_turbulence.f90 \ 561 566 init_3d_model.f90 \ … … 1080 1085 surface_mod.o \ 1081 1086 virtual_flight_mod.o 1087 indoor_model_mod.o: \ 1088 cpulog_mod.o \ 1089 date_and_time_mod.o \ 1090 mod_kinds.o \ 1091 modules.o \ 1092 netcdf_data_input_mod.o \ 1093 surface_mod.o \ 1094 urban_surface_mod.o 1082 1095 inflow_turbulence.o: \ 1083 1096 cpulog_mod.o \ … … 1093 1106 disturb_heatflux.o \ 1094 1107 gust_mod.o \ 1108 indoor_model_mod.o \ 1095 1109 land_surface_model_mod.o \ 1096 1110 large_scale_forcing_nudging_mod.o \ … … 1415 1429 date_and_time_mod.o \ 1416 1430 gust_mod.o \ 1431 indoor_model_mod.o \ 1417 1432 land_surface_model_mod.o \ 1418 1433 model_1d_mod.o \ … … 1708 1723 disturb_heatflux.o \ 1709 1724 gust_mod.o \ 1725 indoor_model_mod.o \ 1710 1726 interaction_droplets_ptq.o \ 1711 1727 land_surface_model_mod.o \ -
palm/trunk/SOURCE/init_3d_model.f90
r3467 r3469 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Add indoor model (kanani, srissman, tlang) 28 ! 29 ! 3467 2018-10-30 19:05:21Z suehring 27 30 ! Implementation of a new aerosol module salsa. 28 31 ! … … 567 570 568 571 USE indices 569 572 573 USE indoor_model_mod, & 574 ONLY: im_init 575 570 576 USE kinds 571 577 … … 2447 2453 2448 2454 ! 2455 !-- If required, initialize indoor model 2456 IF ( indoor_model ) THEN 2457 CALL location_message( 'initializing indoor model', .FALSE. ) 2458 CALL im_init 2459 CALL location_message( 'finished', .TRUE. ) 2460 ENDIF 2461 2462 ! 2449 2463 !-- Initialize the ws-scheme. 2450 2464 IF ( ws_scheme_sca .OR. ws_scheme_mom ) CALL ws_init -
palm/trunk/SOURCE/modules.f90
r3467 r3469 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Add indoor model (kanani, srissman, tlang) 28 ! 29 ! 3467 2018-10-30 19:05:21Z suehring 27 30 ! Add biometeorology 28 31 ! … … 1345 1348 LOGICAL :: humidity = .FALSE. !< namelist parameter 1346 1349 LOGICAL :: humidity_remote = .FALSE. !< switch for receiving near-surface humidity flux (atmosphere-ocean coupling) 1350 LOGICAL :: indoor_model = .FALSE. !< switch for indoor-climate and energy-demand model 1347 1351 LOGICAL :: large_scale_forcing = .FALSE. !< namelist parameter 1348 1352 LOGICAL :: large_scale_subsidence = .FALSE. !< namelist parameter -
palm/trunk/SOURCE/parin.f90
r3467 r3469 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Add indoor model (kanani, srissman, tlang), 28 ! minor formatting 29 ! 30 ! 3467 2018-10-30 19:05:21Z suehring 27 31 ! Implementation of a new aerosol module salsa. 28 32 ! … … 484 488 USE indices, & 485 489 ONLY: nx, ny, nz 490 491 USE indoor_model_mod, & 492 ONLY: im_parin 486 493 487 494 USE kinds … … 917 924 CALL chem_parin 918 925 CALL uvem_parin 919 ! 920 !-- Check if SALSA processes should be carried out and read &salsa_par 921 !-- if required 922 CALL salsa_parin 926 CALL im_parin 927 CALL salsa_parin 923 928 ! 924 929 !-- Read user-defined variables -
palm/trunk/SOURCE/time_integration.f90
r3467 r3469 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Add indoor model (kanani, srissman, tlang) 28 ! 29 ! 3467 2018-10-30 19:05:21Z suehring 27 30 ! Implementation of a new aerosol module salsa. 28 31 ! … … 433 436 dt_dopr_listing, dt_dots, dt_dvrp, dt_run_control, end_time, & 434 437 first_call_lpm, first_call_mas, galilei_transformation, & 435 humidity, in termediate_timestep_count,&438 humidity, indoor_model, intermediate_timestep_count, & 436 439 intermediate_timestep_count_max, & 437 440 land_surface, large_scale_forcing, & … … 471 474 USE indices, & 472 475 ONLY: nbgp, nx, nxl, nxlg, nxr, nxrg, nzb, nzt 476 477 USE indoor_model_mod, & 478 ONLY: dt_indoor, im_main_heatcool, skip_time_do_indoor, time_indoor 473 479 474 480 USE interaction_droplets_ptq_mod, & … … 1248 1254 ENDIF 1249 1255 ! 1256 !-- If required, calculate indoor temperature, waste heat, heat flux 1257 !-- through wall, etc. 1258 !-- dt_indoor steers the frequency of the indoor model calculations 1259 IF ( indoor_model & 1260 .AND. intermediate_timestep_count == intermediate_timestep_count_max & 1261 .AND. time_since_reference_point > skip_time_do_indoor ) THEN 1262 1263 time_indoor = time_indoor + dt_3d 1264 1265 IF ( time_indoor >= dt_indoor ) THEN 1266 1267 time_indoor = time_indoor - dt_indoor 1268 1269 CALL cpu_log( log_point(76), 'indoor_model', 'start' ) 1270 CALL im_main_heatcool 1271 CALL cpu_log( log_point(76), 'indoor_model', 'stop' ) 1272 1273 ENDIF 1274 ENDIF 1275 ! 1250 1276 !-- Increase simulation time and output times 1251 1277 nr_timesteps_this_run = nr_timesteps_this_run + 1 -
palm/trunk/SOURCE/urban_surface_mod.f90
r3449 r3469 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Add missing PUBLIC variables for new indoor model 31 ! 32 ! 3449 2018-10-29 19:36:56Z suehring 30 33 ! Bugfix: Fix average arrays allocations in usm_average_3d_data (J.Resler) 31 34 ! Bugfix: Fix reading wall temperatures (J.Resler) … … 1251 1254 !-- Public parameters, constants and initial values 1252 1255 PUBLIC usm_anthropogenic_heat, usm_material_model, usm_wall_mod, & 1253 usm_green_heat_model, usm_temperature_near_surface, building_pars 1256 usm_green_heat_model, usm_temperature_near_surface, building_pars, & 1257 nzt_wall, t_surf_10cm_h, t_surf_10cm_v, t_wall_h, t_wall_v, & 1258 t_window_h, t_window_v, building_type 1254 1259 1255 1260
Note: See TracChangeset
for help on using the changeset viewer.