Changeset 2259 for palm/trunk/SOURCE/read_var_list.f90
- Timestamp:
- Jun 8, 2017 9:09:11 AM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/read_var_list.f90
r2233 r2259 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Implemented synthetic turbulence generator 28 ! 29 ! 2233 2017-05-30 18:08:54Z suehring 27 30 ! 28 31 ! 2232 2017-05-30 17:47:52Z suehring 29 32 ! Replace wall_qflux, wall_sflux by wall_humidityflux and wall_scalarflux; add 30 33 ! wall_salinityflux 31 ! +tunnel_height, tunnel_length, tunnel_width_x, tunnel_width_y, 34 ! +tunnel_height, tunnel_length, tunnel_width_x, tunnel_width_y, 32 35 ! tunnel_wall_depth 33 36 ! 34 37 ! 2042 2016-11-02 13:47:31Z suehring 35 38 ! Bugfix, read restart data for wall_heatflux, wall_qflux and wall_sflux 36 ! 39 ! 37 40 ! 2000 2016-08-20 18:09:15Z knoop 38 41 ! Forced header and separation lines into 80 columns 39 ! 42 ! 40 43 ! 1992 2016-08-12 15:14:59Z suehring 41 44 ! top_scalarflux added 42 ! 45 ! 43 46 ! 1960 2016-07-12 16:34:24Z suehring 44 47 ! Separate humidity and passive scalar … … 66 69 ! 1699 2015-10-29 08:02:35Z maronga 67 70 ! Bugfix: update of binary version from 3.9b to 4.0 was missing 68 ! 71 ! 69 72 ! 1691 2015-10-26 16:17:44Z maronga 70 ! Added output of most_method, constant_flux_layer, zeta_min, zeta_max. Removed 73 ! Added output of most_method, constant_flux_layer, zeta_min, zeta_max. Removed 71 74 ! output of prandtl_layer and rif_min, rif_max. 72 ! 75 ! 73 76 ! 1682 2015-10-07 23:56:08Z knoop 74 77 ! Code annotations made doxygen readable 75 ! 78 ! 76 79 ! 1615 2015-07-08 18:49:19Z suehring 77 80 ! Enable turbulent inflow for passive_scalar and humidity … … 79 82 ! 1585 2015-04-30 07:05:52Z maronga 80 83 ! Adapted for RRTMG 81 ! 84 ! 82 85 ! 1560 2015-03-06 10:48:54Z keck 83 86 ! +recycling_yshift 84 ! 87 ! 85 88 ! 1522 2015-01-14 10:53:12Z keck 86 89 ! added query for checking if the advection scheme in the restart run is the 87 90 ! same as the advection scheme in the corresponding initial run 88 ! 91 ! 89 92 ! 1502 2014-12-03 18:22:31Z kanani 90 ! Canopy module and parameters removed (parameters are always read from 93 ! Canopy module and parameters removed (parameters are always read from 91 94 ! canopy_par NAMELIST for initial and restart runs) 92 ! 95 ! 93 96 ! 1496 2014-12-02 17:25:50Z maronga 94 97 ! Renamed "radiation" -> "cloud_top_radiation" 95 ! 98 ! 96 99 ! 1484 2014-10-21 10:53:05Z kanani 97 100 ! Changes in the course of the canopy-model modularization: … … 118 121 ! 119 122 ! 1253 2013-11-07 10:48:12Z fricke 120 ! Bugfix: add ref_state to read_parts_of_var_list, otherwise ref_state 123 ! Bugfix: add ref_state to read_parts_of_var_list, otherwise ref_state 121 124 ! is zero for initializing_actions = 'cyclic_fill' 122 125 ! … … 142 145 ! 143 146 ! 1053 2012-11-13 17:11:03Z hoffmann 144 ! necessary expansions according to the two new prognostic equations (nr, qr) 147 ! necessary expansions according to the two new prognostic equations (nr, qr) 145 148 ! of the two-moment cloud physics scheme: 146 149 ! +bc_*_b, +bc_*_t, +bc_*_t_val, *_init, *_surface, *_surface_initial_change, … … 148 151 ! +surface_waterflux_* 149 152 ! 150 ! in addition, steering parameters parameters of the two-moment cloud physics 151 ! scheme: 153 ! in addition, steering parameters parameters of the two-moment cloud physics 154 ! scheme: 152 155 ! +cloud_scheme, +drizzle, +mu_constant, +mu_constant_value, +ventilation_effect 153 156 ! … … 191 194 !------------------------------------------------------------------------------! 192 195 SUBROUTINE read_var_list 193 196 194 197 195 198 USE arrays_3d, & … … 201 204 USE flight_mod, & 202 205 ONLY: flight_read_restart_data 203 206 204 207 USE grid_variables, & 205 208 ONLY: dx, dy … … 234 237 v_max, v_max_ijk, w_max, w_max_ijk 235 238 239 USE synthetic_turbulence_generator_mod, & 240 ONLY: stg_read_restart_data 236 241 237 242 IMPLICIT NONE … … 628 633 READ ( 13 ) s_vertical_gradient_level 629 634 CASE ( 's_vertical_gradient_level_ind' ) 630 READ ( 13 ) s_vertical_gradient_level_ind 635 READ ( 13 ) s_vertical_gradient_level_ind 631 636 CASE ( 'sa_init' ) 632 637 READ ( 13 ) sa_init … … 646 651 READ ( 13 ) surface_pressure 647 652 CASE ( 'surface_scalarflux' ) 648 READ ( 13 ) surface_scalarflux 653 READ ( 13 ) surface_scalarflux 649 654 CASE ( 'surface_waterflux' ) 650 READ ( 13 ) surface_waterflux 655 READ ( 13 ) surface_waterflux 651 656 CASE ( 'time_coupling' ) 652 657 READ ( 13 ) time_coupling … … 770 775 READ ( 13 ) vg_vertical_gradient_level_ind 771 776 CASE ( 'virtual_flight' ) 772 READ ( 13 ) virtual_flight 777 READ ( 13 ) virtual_flight 773 778 CASE ( 'volume_flow_area' ) 774 779 READ ( 13 ) volume_flow_area … … 805 810 WRITE( message_string, * ) 'unknown variable named "', & 806 811 TRIM( variable_chr ), '" found in', & 807 ' data from prior run on PE ', myid 812 ' data from prior run on PE ', myid 808 813 CALL message( 'read_var_list', 'PA0302', 1, 2, 0, 6, 0 ) 809 814 END SELECT … … 813 818 814 819 ENDDO 815 820 816 821 IF ( virtual_flight ) CALL flight_read_restart_data 817 822 823 IF ( synthetic_turbulence_generator ) CALL stg_read_restart_data 818 824 819 825 END SUBROUTINE read_var_list … … 828 834 !> run which used a smaller total domain or/and a different domain decomposition. 829 835 !------------------------------------------------------------------------------! 830 836 831 837 SUBROUTINE read_parts_of_var_list 832 838 … … 938 944 READ ( 13 ) statistic_regions_on_file 939 945 IF ( statistic_regions_on_file /= statistic_regions ) THEN 940 WRITE( message_string, * ) 'statistic regions on restart data file ',& 946 WRITE( message_string, * ) 'statistic regions on restart data file ',& 941 947 'differ from the current run', & 942 948 '&statistic regions on file = "', & … … 993 999 CALL message( 'read_parts_of_var_list', 'PA0100', & 994 1000 1, 2, 0, 6, 0 ) 995 END IF 996 1001 END IF 1002 997 1003 CASE ( 'nx' ) 998 1004 READ ( 13 ) nx_on_file … … 1012 1018 CALL message( 'read_parts_of_var_list', 'PA0101', & 1013 1019 1, 2, 0, 6, 0 ) 1014 END IF 1015 1020 END IF 1021 1016 1022 CASE DEFAULT 1017 1023 … … 1040 1046 !> Skipping the global control variables from restart-file (binary format) 1041 1047 !------------------------------------------------------------------------------! 1042 1048 1043 1049 SUBROUTINE skip_var_list 1044 1050 1045 1051 USE control_parameters, & 1046 1052 ONLY: virtual_flight 1047 1053 1048 1054 USE flight_mod, & 1049 1055 ONLY: flight_skip_var_list 1050 1056 1051 1057 IMPLICIT NONE 1052 1058 … … 1068 1074 ENDDO 1069 1075 ! 1070 !-- In case of virtual flights, skip also variables related to 1076 !-- In case of virtual flights, skip also variables related to 1071 1077 !-- this module. 1072 1078 IF ( virtual_flight ) CALL flight_skip_var_list 1073 1079 1074 1080 1075 1081 END SUBROUTINE skip_var_list
Note: See TracChangeset
for help on using the changeset viewer.