Changeset 785 for palm/trunk
- Timestamp:
- Nov 28, 2011 9:47:19 AM (12 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
-
SOURCE/init_3d_model.f90 (modified) (4 diffs)
-
SOURCE/modules.f90 (modified) (3 diffs)
-
SOURCE/parin.f90 (modified) (2 diffs)
-
SOURCE/prognostic_equations.f90 (modified) (10 diffs)
-
UTIL/interpret_config.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/init_3d_model.f90
r768 r785 7 7 ! Current revisions: 8 8 ! ------------------ 9 ! 9 ! initialization of rdf_sc 10 10 ! 11 11 ! Former revisions: … … 184 184 sums_divnew_l(0:statistic_regions), & 185 185 sums_divold_l(0:statistic_regions) ) 186 ALLOCATE( dp_smooth_factor(nzb:nzt), rdf(nzb+1:nzt) )186 ALLOCATE( dp_smooth_factor(nzb:nzt), rdf(nzb+1:nzt), rdf_sc(nzb+1:nzt) ) 187 187 ALLOCATE( ngp_2dh_outer(nzb:nzt+1,0:statistic_regions), & 188 188 ngp_2dh_outer_l(nzb:nzt+1,0:statistic_regions), & … … 1471 1471 ! 1472 1472 !-- Initialize Rayleigh damping factors 1473 rdf = 0.0 1473 rdf = 0.0 1474 rdf_sc = 0.0 1474 1475 IF ( rayleigh_damping_factor /= 0.0 ) THEN 1475 1476 IF ( .NOT. ocean ) THEN … … 1493 1494 ENDIF 1494 1495 ENDIF 1496 IF ( scalar_rayleigh_damping ) rdf_sc = rdf 1495 1497 1496 1498 ! -
palm/trunk/SOURCE/modules.f90
r779 r785 5 5 ! Current revisions: 6 6 ! ----------------- 7 ! 7 ! +scalar_rayleigh_damping, rdf_sc 8 8 ! 9 9 ! Former revisions: … … 264 264 REAL, DIMENSION(:), ALLOCATABLE :: & 265 265 ddzu, ddzu_pres, dd2zu, dzu, ddzw, dzw, hyp, inflow_damping_factor, & 266 km_damp_x, km_damp_y, lad, l_grid, pt_init, q_init, rdf, sa_init,&267 ug, u_init, u_nzb_p1_for_vfc, vg, v_init, v_nzb_p1_for_vfc, w_subs,&268 zu, zw266 km_damp_x, km_damp_y, lad, l_grid, pt_init, q_init, rdf, rdf_sc, & 267 sa_init, ug, u_init, u_nzb_p1_for_vfc, vg, v_init, v_nzb_p1_for_vfc, & 268 w_subs, zu, zw 269 269 270 270 REAL, DIMENSION(:,:), ALLOCATABLE :: & … … 538 538 outflow_l = .FALSE., outflow_n = .FALSE., outflow_r = .FALSE., & 539 539 outflow_s = .FALSE., passive_scalar = .FALSE., & 540 plant_canopy = .FALSE., &541 pr andtl_layer = .TRUE., precipitation= .FALSE., &542 profil_output = .FALSE., radiation= .FALSE., &543 r andom_heatflux = .FALSE., run_control_header = .FALSE., &544 run_coupled= .TRUE., sloping_surface = .FALSE., &540 plant_canopy = .FALSE., prandtl_layer = .TRUE., & 541 precipitation = .FALSE., profil_output = .FALSE., & 542 radiation = .FALSE., random_heatflux = .FALSE., & 543 run_control_header = .FALSE., run_coupled = .TRUE., & 544 scalar_rayleigh_damping = .TRUE., sloping_surface = .FALSE., & 545 545 stop_dt = .FALSE., synchronous_exchange = .FALSE., & 546 546 terminate_run = .FALSE., turbulent_inflow = .FALSE., & -
palm/trunk/SOURCE/parin.f90
r768 r785 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +scalar_rayleigh_damping 7 7 ! 8 8 ! Former revisions: … … 161 161 rif_max, rif_min, roughness_length, sa_surface, & 162 162 sa_vertical_gradient, sa_vertical_gradient_level, scalar_advec, & 163 scalar_exchange_coefficient, statistic_regions, & 164 subs_vertical_gradient, subs_vertical_gradient_level, & 165 surface_heatflux, surface_pressure, surface_scalarflux, & 166 surface_waterflux, s_surface, s_surface_initial_change, & 167 s_vertical_gradient, s_vertical_gradient_level, timestep_scheme, & 163 scalar_exchange_coefficient, scalar_rayleigh_damping, & 164 statistic_regions, subs_vertical_gradient, & 165 subs_vertical_gradient_level, surface_heatflux, surface_pressure, & 166 surface_scalarflux, surface_waterflux, s_surface, & 167 s_surface_initial_change, s_vertical_gradient, & 168 s_vertical_gradient_level, timestep_scheme, & 168 169 topography, topography_grid_convention, top_heatflux, & 169 170 top_momentumflux_u, top_momentumflux_v, top_salinityflux, & -
palm/trunk/SOURCE/prognostic_equations.f90
r737 r785 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! new factor rdf_sc allows separate Rayleigh damping of scalars 6 7 ! 7 8 ! Former revisions: … … 511 512 sbt * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) & 512 513 ) - & 513 tsc(5) * rdf (k) * ( pt(k,j,i) - pt_init(k) )514 tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) ) 514 515 ENDDO 515 516 … … 602 603 sbt * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) & 603 604 ) - & 604 tsc(5) * rdf (k) * ( sa(k,j,i) - sa_init(k) )605 tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) ) 605 606 IF ( sa_p(k,j,i) < 0.0 ) sa_p(k,j,i) = 0.1 * sa(k,j,i) 606 607 ENDDO … … 723 724 sbt * tend(k,j,i) + tsc(3) * tq_m(k,j,i) & 724 725 ) - & 725 tsc(5) * rdf (k) * ( q(k,j,i) - q_init(k) )726 tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) ) 726 727 IF ( q_p(k,j,i) < 0.0 ) q_p(k,j,i) = 0.1 * q(k,j,i) 727 728 ENDDO … … 1216 1217 tsc(2) * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) & 1217 1218 ) - & 1218 tsc(5) * rdf (k) * ( pt(k,j,i) - pt_init(k) )1219 tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) ) 1219 1220 ENDDO 1220 1221 … … 1266 1267 tsc(2) * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) & 1267 1268 ) - & 1268 tsc(5) * rdf (k) * ( sa(k,j,i) - sa_init(k) )1269 tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) ) 1269 1270 IF ( sa_p(k,j,i) < 0.0 ) sa_p(k,j,i) = 0.1 * sa(k,j,i) 1270 1271 ENDDO … … 1346 1347 tsc(2) * tend(k,j,i) + tsc(3) * tq_m(k,j,i) & 1347 1348 ) - & 1348 tsc(5) * rdf (k) * ( q(k,j,i) - q_init(k) )1349 tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) ) 1349 1350 IF ( q_p(k,j,i) < 0.0 ) q_p(k,j,i) = 0.1 * q(k,j,i) 1350 1351 ENDDO … … 1846 1847 sbt * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) & 1847 1848 ) - & 1848 tsc(5) * rdf (k) * ( pt(k,j,i) - pt_init(k) )1849 tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) ) 1849 1850 ENDDO 1850 1851 ENDDO … … 1940 1941 sbt * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) & 1941 1942 ) - & 1942 tsc(5) * rdf (k) * ( sa(k,j,i) - sa_init(k) )1943 tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) ) 1943 1944 IF ( sa_p(k,j,i) < 0.0 ) sa_p(k,j,i) = 0.1 * sa(k,j,i) 1944 1945 ENDDO … … 2065 2066 sbt * tend(k,j,i) + tsc(3) * tq_m(k,j,i) & 2066 2067 ) - & 2067 tsc(5) * rdf (k) * ( q(k,j,i) - q_init(k) )2068 tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) ) 2068 2069 IF ( q_p(k,j,i) < 0.0 ) q_p(k,j,i) = 0.1 * q(k,j,i) 2069 2070 ENDDO -
palm/trunk/UTIL/interpret_config.f90
r556 r785 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Character length extended to 1000 in order to account for long lines in the 7 ! configuration file 7 8 ! 8 9 ! Former revisions: … … 32 33 IMPLICIT NONE 33 34 34 CHARACTER (LEN=1) :: bs = ACHAR( 92 ) ! backslash (auf vpp sonst n.35 CHARACTER (LEN=1) :: bs = ACHAR( 92 ) ! backslash (auf vpp sonst n. 35 36 ! druckbar) 36 CHARACTER (LEN=20) :: do_remote, do_trace, host, localhost37 CHARACTER (LEN=100) :: config_file, icf38 CHARACTER (LEN= 300) :: cond1, cond2, empty = REPEAT( ' ', 240 ), &39 for_cond1, for_cond2, for_host, input_list, &40 iolist, output_list, s1, s2, s2a, s2b, s2c, s3, &41 s3cond, s4, s5, s6, value, value_mrun, var, zeile37 CHARACTER (LEN=20) :: do_remote, do_trace, host, localhost 38 CHARACTER (LEN=100) :: config_file, icf 39 CHARACTER (LEN=1000) :: cond1, cond2, empty = REPEAT( ' ', 240 ), & 40 for_cond1, for_cond2, for_host, input_list, & 41 iolist, output_list, s1, s2, s2a, s2b, s2c, s3, & 42 s3cond, s4, s5, s6, value, value_mrun, var, zeile 42 43 43 44 INTEGER :: dummy, i, icomment = 0, icond1, icond2, idatver = 0, iec = 0, &
Note: See TracChangeset
for help on using the changeset viewer.
