- Timestamp:
- Mar 22, 2018 3:05:23 PM (7 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/Makefile
r2918 r2921 25 25 # ----------------- 26 26 # $Id$ 27 # date_and_time_mod dependency has been added to read/write_restart_data_mod 28 # 29 # 2918 2018-03-21 15:52:14Z gronemeier 27 30 # read/write_3d_binary and read/write_var_list has been removed, 28 31 # read/write_restart_data_mod, wrd_write_string and … … 1344 1347 read_restart_data_mod.o: \ 1345 1348 chemistry_model_mod.o \ 1346 cpulog_mod.o\ 1349 cpulog_mod.o \ 1350 date_and_time_mod.o \ 1347 1351 gust_mod.o \ 1348 1352 land_surface_model_mod.o \ … … 1674 1678 write_restart_data_mod.o: \ 1675 1679 chemistry_model_mod.o \ 1680 date_and_time_mod.o \ 1676 1681 gust_mod.o \ 1677 1682 land_surface_model_mod.o \ -
palm/trunk/SOURCE/land_surface_model_mod.f90
r2894 r2921 25 25 ! ----------------- 26 26 ! $Id$ 27 ! The activation of spinup has been moved to parin 28 ! 29 ! 2894 2018-03-15 09:17:58Z Giersch 27 30 ! Calculations of the index range of the subdomain on file which overlaps with 28 31 ! the current subdomain are already done in read_restart_data_mod, … … 4586 4589 land_surface = .TRUE. 4587 4590 4588 !4589 !-- Activate spinup4590 IF ( spinup_time > 0.0_wp ) THEN4591 coupling_start_time = spinup_time4592 IF ( spinup_pt_mean == 9999999.9_wp ) THEN4593 spinup_pt_mean = pt_surface4594 ENDIF4595 IF ( .NOT. spinup ) THEN4596 end_time = end_time + spinup_time4597 spinup = .TRUE.4598 ENDIF4599 ENDIF4600 4601 4591 4602 4592 10 CONTINUE -
palm/trunk/SOURCE/parin.f90
r2906 r2921 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Activation of spinup has been moved from lsm/usm_parin to parin itself 28 ! 29 ! 2906 2018-03-19 08:56:40Z Giersch 27 30 ! ENVIRONMENT variables read/write_svf has been added 28 31 ! … … 707 710 708 711 ! 712 !-- Activate spinup 713 IF ( land_surface .OR. urban_surface ) THEN 714 IF ( spinup_time > 0.0_wp ) THEN 715 coupling_start_time = spinup_time 716 IF ( spinup_pt_mean == 9999999.9_wp ) THEN 717 spinup_pt_mean = pt_surface 718 ENDIF 719 end_time = end_time + spinup_time 720 spinup = .TRUE. 721 ENDIF 722 ENDIF 723 724 ! 709 725 !-- In case of nested runs, explicitly set nesting boundary conditions. 710 726 !-- This will overwrite the user settings and basic defaults. -
palm/trunk/SOURCE/read_restart_data_mod.f90
r2912 r2921 25 25 ! ----------------- 26 26 ! $Id$ 27 ! spinup_time, day_of_year_init and time_utc_init are also read now 28 ! 29 ! 2912 2018-03-20 13:00:05Z knoop 27 30 ! Added gust module interface calls 28 31 ! … … 78 81 ONLY: inflow_damping_factor, mean_inflow_profiles, pt_init, & 79 82 q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg 83 84 USE date_and_time_mod, & 85 ONLY: day_of_year_init, time_utc_init 80 86 81 87 USE flight_mod, & … … 343 349 CASE ( 'damp_level_1d' ) 344 350 READ ( 13 ) damp_level_1d 351 CASE ( 'day_of_year_init' ) 352 READ ( 13 ) day_of_year_init 345 353 CASE ( 'dissipation_1d' ) 346 354 READ ( 13 ) dissipation_1d … … 561 569 CASE ( 'simulated_time' ) 562 570 READ ( 13 ) simulated_time 571 CASE ( 'spinup_time' ) 572 READ ( 13 ) spinup_time 563 573 CASE ( 'surface_heatflux' ) 564 574 READ ( 13 ) surface_heatflux … … 609 619 CASE ( 'time_since_reference_point' ) 610 620 READ ( 13 ) time_since_reference_point 621 CASE ( 'time_utc_init' ) 622 READ ( 13 ) time_utc_init 611 623 CASE ( 'timestep_scheme' ) 612 624 READ ( 13 ) timestep_scheme -
palm/trunk/SOURCE/urban_surface_mod.f90
r2920 r2921 28 28 ! ----------------- 29 29 ! $Id$ 30 ! The activation of spinup has been moved to parin 31 ! 32 ! 2920 2018-03-22 11:22:01Z kanani 30 33 ! Remove unused pcbl, npcbl from ONLY list 31 34 ! moh.hefny: … … 5177 5180 urban_surface = .TRUE. 5178 5181 5179 !5180 !-- Activate spinup5181 IF ( spinup_time > 0.0_wp ) THEN5182 coupling_start_time = spinup_time5183 IF ( spinup_pt_mean == 9999999.9_wp ) THEN5184 spinup_pt_mean = pt_surface5185 ENDIF5186 IF ( .NOT. spinup ) THEN5187 end_time = end_time + spinup_time5188 spinup = .TRUE.5189 ENDIF5190 ENDIF5191 5182 5192 5183 10 CONTINUE 5184 5193 5185 5194 5186 END SUBROUTINE usm_parin -
palm/trunk/SOURCE/write_restart_data_mod.f90
r2912 r2921 25 25 ! ----------------- 26 26 ! $Id$ 27 ! spinup_time, day_of_year_init and time_utc_init are also written out now 28 ! 29 ! 2912 2018-03-20 13:00:05Z knoop 27 30 ! Added gust module interface calls 28 31 ! … … 77 80 q_init, ref_state, s_init, sa_init, u_init, ug, v_init, vg 78 81 82 USE date_and_time_mod, & 83 ONLY: day_of_year_init, time_utc_init 84 79 85 USE flight_mod, & 80 86 ONLY: flight_wrd_global … … 313 319 WRITE ( 14 ) damp_level_1d 314 320 321 CALL wrd_write_string( 'day_of_year_init' ) 322 WRITE ( 14 ) day_of_year_init 323 315 324 CALL wrd_write_string( 'dissipation_1d' ) 316 325 WRITE ( 14 ) dissipation_1d … … 632 641 WRITE ( 14 ) simulated_time 633 642 643 CALL wrd_write_string( 'spinup_time ' ) 644 WRITE ( 14 ) spinup_time 645 634 646 CALL wrd_write_string( 'surface_heatflux' ) 635 647 WRITE ( 14 ) surface_heatflux … … 703 715 CALL wrd_write_string( 'time_since_reference_point' ) 704 716 WRITE ( 14 ) time_since_reference_point 717 718 CALL wrd_write_string( 'time_utc_init' ) 719 WRITE ( 14 ) time_utc_init 705 720 706 721 CALL wrd_write_string( 'timestep_scheme' )
Note: See TracChangeset
for help on using the changeset viewer.