Changeset 198 for palm/trunk/SOURCE
- Timestamp:
- Sep 17, 2008 8:55:28 AM (16 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 42 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r197 r198 1 1 New: 2 2 --- 3 The plant canopy model has been extended to the prognostic equation for4 the potential temperature and the prognostic equation for the concentration5 of a passive scalar, as proposed by Watanabe (2004) and Shaw and Schumann6 (1992). (prognostic_equations, plant_canopy_model)7 3 8 Within a job chain, the number of processors or the virtual processor grid9 is now allowed to be changed. This modifies the domain decomposition and10 requires that the PEs within a restart job have to know from which file(s) they11 have to read their restart data (up to now there is a one to one relation12 between the restart files and the PEs, i.e. processor 4 only reads data13 from file "_0004"). Informations about the subdomain index limits of all14 restart files are now written by PE0 (to file "_0000"). Also, all variables15 containing global values which do not depend on the subdomain are written16 to file "_0000" only. In a restart run, this file is opened by all PEs to17 read these global values and the informations about the subdomain index18 limits. Depending on these index limit information it is decided which19 restart file(s) has/have to be opened in order to read the complete data20 necessary for the current subdomain.21 22 The turbulence recycling method of Kataoka and Mizuno (2002) has been23 implemented. A pre-run with smaller model domain can be used to initialize24 the real run, in order to spare the CPU time needed to get the turbulence25 into a quasi-stationary state (see initializing_actions =26 'read_data_for_recycling').27 28 Particle advection adjusted for ocean runs.29 30 Multigrid levels are limited by subdomains if mg_switch_to_pe0_level = -1.31 32 User-defined spectra.33 34 Output of q*2 profile added.35 36 Argument -c introduced to most of the subjob calls, which allows the user to37 choose his own job catalog by setting job_catalog in the configuration file38 (default is ~/job_queue). Workaround for mpixec with -env option.39 Adjustments for lcxt4 (Bergen Center for Computational Science) (mrun, subjob)40 41 advec_particles, calc_spectra, check_open, check_parameters, data_output_spectra, header, init_particles, init_pegrid, init_3d_model, modules, netcdf, parin, particle_boundary_conds, plant_canopy_model, prognostic_equations, read_var_list, read_3d_binary, time_integration, user_interface, write_var_list, write_3d_binary42 43 New: inflow_turbulence44 4 45 5 46 6 Changed: 47 7 ------- 48 Allow 100 spectra levels instead of 10 for consistency with49 define_netcdf_header (calc_spectra, data_output_spectra, header, modules,50 netcdf)51 8 52 Modification of the integrated version of the profile function for momentum53 for unstable stratification; more consistent flux definitions. (wall_fluxes,54 production_e)55 56 Strict grid matching along z is not needed for mg-solver. (check_parameters)57 58 Sharp lateral edges of the plant canopy introduced. Before smaller59 values of the leaf area density than those applied in the prognostic60 equation for the vertical velocity were used in the prognostic equations61 for u and v at the boundaries of the plant_canopy. (init_3d_model)62 63 -cross_ts_* (read_var_list, write_var_list)64 -dopr_time_count, old profil parameters (cross_..., dopr_crossindex,65 profile_***) removed (read_3d_binary, write_3d_binary)66 67 hom_sum moved, volume_flow_area, volume_flow_initial moved from ..._3d_binary68 to ..._var_list, hom_sum is now allocated in parin instead of init_3d_model69 70 npex, npey moved from inipar- to d3par-namelist (parin)71 72 myid_char14 removed. This was used since on IBM machines the process rank may73 be changed when the final communicator is defined, in order to save the74 preliminary processor-id for opening the binary output file for restarts75 (unit 14), because otherwise a mismatch occured when reading this file in a76 restart job. This mechanism is not needed any more since the subdomain77 informations are now contained in file _0000. (parin, check_open)78 79 Transpositions for the 2D domain decomposition have been optimized by using80 f_inv as an automatic array instead of providing the memory by a dummy argument.81 This spares one copy loop per transposition. Order of indices in the 3D loops82 in some of the transpose routines have been rearranged for better cache utilization.83 Both have been suggested by Roland Richter (SGI) as part of the84 HLRN-II benchmark process. (transpose)85 86 Workaround for getting information about the coupling mode. (palm)87 88 Format adjustments in order to allow CPU# > 999. (cpu_statistics)89 90 Provisional solution for run_control_1d output: add 'CALL check_open( 15 )'91 (init_1d_model)92 93 Subdomain data are read into temporary arrays pf_tmp/pf3d_tmp in order to94 avoid INTEL compiler warnings about (automatic) creation of temporary arrays95 (combine_plot_fields)96 97 Time coordinate t=0 stored on netcdf-file only if an output is required for98 this time for at least one of the profiles99 100 Spline timeseries splptx etc. removed, timeseries w'u', w'v', w'q' (k=0) added101 (flow_statistics)102 103 advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, check_parameters, cpu_statistics, data_output_profiles, data_output_spectra, flow_statistics, header, init_1d_model, init_3d_model, modules, netcdf, palm, parin, poisfft, production_e, read_var_list, read_3d_binary, transpose, wall_fluxes, write_var_list, write_3d_binary104 9 105 10 106 11 Errors: 107 12 ------ 108 Bugfix: exponent = 1.0 / ( ny + 1.0 ) in calc_spectra_x (calc_spectra)109 13 110 Bugfix: change definition of us_wall from 1D to 2D. Tests showed that this decreases111 u* by some 10% and increases TKE and momentum fluxes by some 10% because friction112 was underestimated and momentum fluxes were wrongly calculated due to the bug.113 (prandtl_fluxes, wall_fluxes)114 115 Bugfix: calculation of horizontal fluxes at vertical walls (diffusion_s)116 117 Bugfix: zero assignments to tendency arrays in case of restarts (init_3d_model)118 119 Bugfix: wrong grid level used in multigrid solver, routine restrict (poismg)120 121 Bugfix: Construction of vertical profiles when 10 gradients have been122 specified in the parameter list (ug, vg, pt, q, sa, lad). (check_parameters)123 124 Bugfix: Determination of the number of vertical levels for which spectra125 shall be output - 100 replaced by 10. (netcdf)126 127 Bugfix: Lengths of those characters that are needed for the output of the128 characteristic levels of potential temperature, the geostrophic wind,129 scalar concentration, humidity and leaf area density to the header file130 has been increased. (header)131 132 Bugfix: add ')' in user_read_restart_data.133 134 The leaf area density is explicitly set to its surface value at k=0. (check_parameters)135 136 Introduce prefix_chr to ensure unique dvrp_file path.137 138 small bugfixes for user_interface sample code (comments):139 - initialize ustvst with 0.0 as it is now computed only until nxr and nyn140 - two ALLOCATE statements moved from user_read_restart_data back to user_init141 - remove 'READ (13) u2_av' statement in user_read_restart_data142 143 Bugfix: remove IF statement in plant_canopy_model_ij (plant_canopy_model)144 145 Bugfix: divide sums(k,8) (e) and sums(k,34) (e*) by ngp_2dh_s_inner(k,sr)146 (like other scalars) (flow_statistics)147 148 Bugfix: dopr_time_count was written on the binary file, which caused that149 NetCDF files newly created by restart files (no append of existing files!)150 contained uneccessary time levels. (read_3d_binary, write_3d_binary)151 152 Bugfix: extra '*' removed in user_statistics sample code (user_interface)153 154 Bugfix: a stop command was missing in some cases of the parallel branch (local_stop)155 156 Bugfix in volume flow control for non-cyclic boundary conditions (pres)157 158 Bugfix: misplaced #endif directives (combine_plot_fields)159 160 data are collected from PE0 in an ordered sequence which seems to avoid hanging of processes on SGI-ICE (cpu_statistics)161 162 calc_spectra, check_parameters, cpu_statistics, diffusion_s, flow_statistics, init_dvrp, init_3d_model, local_stop, plant_canopy_model, poismg, prandtl_fluxes, pres, read_3d_binary, user_interface, wall_fluxes, write_3d_binary163 -
palm/trunk/SOURCE/advec_particles.f90
r150 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bottom boundary condition and vertical index calculations adjusted for7 ! ocean runs.8 6 ! TEST: PRINT statements on unit 9 (commented out) 9 7 ! … … 11 9 ! ----------------- 12 10 ! $Id$ 11 ! 12 ! 150 2008-02-29 08:19:58Z raasch 13 ! Bottom boundary condition and vertical index calculations adjusted for 14 ! ocean runs. 13 15 ! 14 16 ! 119 2007-10-17 10:27:13Z raasch -
palm/trunk/SOURCE/advec_s_ups.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Arguments removed from transpose routines6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 13 ! Arguments removed from transpose routines 14 ! 15 ! February 2007 11 16 ! RCS Log replace by Id keyword, revision history cleaned up 12 17 ! -
palm/trunk/SOURCE/advec_u_ups.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Arguments removed from transpose routines6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 13 ! Arguments removed from transpose routines 14 ! 15 ! February 2007 11 16 ! RCS Log replace by Id keyword, revision history cleaned up 12 17 ! -
palm/trunk/SOURCE/advec_v_ups.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Arguments removed from transpose routines6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 13 ! Arguments removed from transpose routines 14 ! 15 ! February 2007 11 16 ! RCS Log replace by Id keyword, revision history cleaned up 12 17 ! -
palm/trunk/SOURCE/advec_w_ups.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Arguments removed from transpose routines6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 13 ! Arguments removed from transpose routines 14 ! 15 ! February 2007 11 16 ! RCS Log replace by Id keyword, revision history cleaned up 12 17 ! -
palm/trunk/SOURCE/calc_spectra.f90
r192 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 192 2008-08-27 16:51:49Z letzel 6 13 ! bugfix in calc_spectra_x: exponent = 1.0 / ( ny + 1.0 ) 7 14 ! allow 100 spectra levels instead of 10 for consistency with … … 9 16 ! user-defined spectra, arguments removed from transpose routines 10 17 ! 11 ! Former revisions: 12 ! ----------------- 13 ! $Id$ 18 ! February 2007 14 19 ! RCS Log replace by Id keyword, revision history cleaned up 15 20 ! -
palm/trunk/SOURCE/check_open.f90
r146 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 146 2008-01-17 13:08:34Z raasch 6 13 ! First opening of unit 13 openes file _0000 on all PEs (parallel version) 7 14 ! because only this file contains the global variables, 8 15 ! myid_char_14 removed 9 !10 ! Former revisions:11 ! -----------------12 ! $Id$13 16 ! 14 17 ! 120 2007-10-17 11:54:43Z raasch -
palm/trunk/SOURCE/check_parameters.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 6 13 ! Bug fix: Construction of vertical profiles when 10 gradients have been 7 14 ! specified in the parameter list (ug, vg, pt, q, sa, lad) … … 12 19 ! check of turbulent_inflow and calculation of recycling_plane. 13 20 ! q*2 profile added 14 !15 ! Former revisions:16 ! -----------------17 ! $Id$18 21 ! 19 22 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/cpu_statistics.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 6 13 ! Format adjustments in order to allow CPU# > 999, 7 14 ! data are collected from PE0 in an ordered sequence which seems to avoid 8 15 ! hanging of processes on SGI-ICE 9 !10 ! Former revisions:11 ! -----------------12 ! $Id$13 16 ! 14 17 ! 82 2007-04-16 15:40:52Z raasch -
palm/trunk/SOURCE/data_output_profiles.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Time coordinate t=0 stored on netcdf-file only if an output is required for 7 ! this time for at least one of the profiles 6 ! 8 7 ! 9 8 ! Former revisions: 10 9 ! ----------------- 11 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 13 ! Time coordinate t=0 stored on netcdf-file only if an output is required for 14 ! this time for at least one of the profiles 15 ! 16 ! February 2007 12 17 ! RCS Log replace by Id keyword, revision history cleaned up 13 18 ! -
palm/trunk/SOURCE/data_output_spectra.f90
r189 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! allow 100 spectra levels instead of 10 for consistency with 7 ! define_netcdf_header 8 ! user-defined spectra 6 ! 9 7 ! 10 8 ! Former revisions: 11 9 ! ----------------- 12 10 ! $Id$ 11 ! 12 ! 189 2008-08-13 17:09:26Z letzel 13 ! allow 100 spectra levels instead of 10 for consistency with 14 ! define_netcdf_header, +user-defined spectra 15 ! 16 ! February 2007 13 17 ! RCS Log replace by Id keyword, revision history cleaned up 14 18 ! -
palm/trunk/SOURCE/diffusion_s.f90
r183 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! bugfix: calculation of fluxes at vertical surfaces6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 183 2008-08-04 15:39:12Z letzel 13 ! bugfix: calculation of fluxes at vertical surfaces 11 14 ! 12 15 ! 129 2007-10-30 12:12:24Z letzel -
palm/trunk/SOURCE/flow_statistics.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Spline timeseries splptx etc. removed, timeseries w'u', w'v', w'q' (k=0) 7 ! added 8 ! Bugfix: divide sums(k,8) (e) and sums(k,34) (e*) by ngp_2dh_s_inner(k,sr) 9 ! (like other scalars) 6 ! 10 7 ! 11 8 ! Former revisions: 12 9 ! ----------------- 13 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 13 ! Spline timeseries splptx etc. removed, timeseries w'u', w'v', w'q' (k=0) 14 ! added, 15 ! bugfix: divide sums(k,8) (e) and sums(k,34) (e*) by ngp_2dh_s_inner(k,sr) 16 ! (like other scalars) 14 17 ! 15 18 ! 133 2007-11-20 10:10:53Z letzel -
palm/trunk/SOURCE/header.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! TEST: mg_switch_to_pe0_level = -1!!!!!!!!! 7 ! allow 100 spectra levels instead of 10 for consistency with 8 ! define_netcdf_header 9 ! Bugfix in the output of the characteristic levels of potential temperature, 10 ! geostrophic wind, scalar concentration, humidity and leaf area density 11 ! Output of turbulence recycling informations 6 ! 12 7 ! 13 8 ! Former revisions: 14 9 ! ----------------- 15 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 13 ! allow 100 spectra levels instead of 10 for consistency with 14 ! define_netcdf_header, 15 ! bugfix in the output of the characteristic levels of potential temperature, 16 ! geostrophic wind, scalar concentration, humidity and leaf area density, 17 ! output of turbulence recycling informations 16 18 ! 17 19 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/inflow_turbulence.f90
r163 r198 10 10 ! $Id$ 11 11 ! 12 ! Initial version (2008/03/07) 12 13 ! 13 14 ! Description: -
palm/trunk/SOURCE/init_1d_model.f90
r184 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! provisional solution for run_control_1d output: add 'CALL check_open( 15 )'6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 184 2008-08-04 15:53:39Z letzel 13 ! provisional solution for run_control_1d output: add 'CALL check_open( 15 )' 11 14 ! 12 15 ! 135 2007-11-22 12:24:23Z raasch -
palm/trunk/SOURCE/init_3d_model.f90
r181 r198 7 7 ! Actual revisions: 8 8 ! ----------------- 9 ! Bugfix: zero assignments to tendency arrays in case of restarts 10 ! Further amendments to and modifications in the initialisation of the plant 11 ! canopy model 12 ! Allocation of hom_sum moved to parin, initialization of spectrum_x|y directly 9 ! 10 ! 11 ! Former revisions: 12 ! ----------------- 13 ! $Id$ 14 ! 15 ! 181 2008-07-30 07:07:47Z raasch 16 ! bugfix: zero assignments to tendency arrays in case of restarts, 17 ! further extensions and modifications in the initialisation of the plant 18 ! canopy model, 19 ! allocation of hom_sum moved to parin, initialization of spectrum_x|y directly 13 20 ! after allocating theses arrays, 14 21 ! read data for recycling added as new initialization option, 15 22 ! dummy allocation for diss 16 !17 ! Former revisions:18 ! -----------------19 ! $Id$20 23 ! 21 24 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/init_dvrp.f90
r155 r198 5 5 ! ----------------- 6 6 ! 7 ! introduce prefix_chr to ensure unique dvrp_file path8 7 ! TEST: print* statements 9 8 ! ToDo: checking of mode_dvrp for legal values is not correct … … 12 11 ! ----------------- 13 12 ! $Id$ 13 ! 14 ! 155 2008-03-28 10:56:30Z letzel 15 ! introduce prefix_chr to ensure unique dvrp_file path 14 16 ! 15 17 ! 130 2007-11-13 14:08:40Z letzel -
palm/trunk/SOURCE/init_particles.f90
r150 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Set offset_ocean_* needed for calculating vertical indices within ocean runs6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 150 2008-02-29 08:19:58Z raasch 13 ! Setting offset_ocean_* needed for calculating vertical indices within ocean 14 ! runs 11 15 ! 12 16 ! 117 2007-10-11 03:27:59Z raasch -
palm/trunk/SOURCE/init_pegrid.f90
r197 r198 5 5 ! ----------------- 6 6 ! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!! 7 ! TEST OUTPUT (TO BE REMOVED) logging mpi2 ierr values 8 ! 9 ! Former revisions: 10 ! ----------------- 11 ! $Id$ 12 ! 13 ! 197 2008-09-16 15:29:03Z raasch 7 14 ! multigrid levels are limited by subdomains if mg_switch_to_pe0_level = -1, 8 15 ! nz is used instead nnz for calculating mg-levels 9 16 ! Collect on PE0 horizontal index bounds from all other PEs, 10 17 ! broadcast the id of the inflow PE (using the respective communicator) 11 ! TEST OUTPUT (TO BE REMOVED) logging mpi2 ierr values12 !13 ! Former revisions:14 ! -----------------15 ! $Id$16 18 ! 17 19 ! 114 2007-10-10 00:03:15Z raasch -
palm/trunk/SOURCE/local_stop.f90
r147 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bugfix: a stop command was missing in some cases of the parallel branch6 ! 7 7 ! 8 8 ! … … 10 10 ! ----------------- 11 11 ! $Id$ 12 ! 13 ! 147 2008-02-01 12:41:46Z raasch 14 ! Bugfix: a stop command was missing in some cases of the parallel branch 12 15 ! 13 16 ! 108 2007-08-24 15:10:38Z letzel -
palm/trunk/SOURCE/modules.f90
r197 r198 5 5 ! Actual revisions: 6 6 ! ----------------- 7 ! 8 ! 9 ! Former revisions: 10 ! ----------------- 11 ! $Id$ 12 ! 13 ! 197 2008-09-16 15:29:03Z raasch 7 14 ! allow 100 spectra levels instead of 10 for consistency with 8 ! define_netcdf_header 9 ! +canopy_heat_flux, cthf, lai, 15 ! define_netcdf_header, +canopy_heat_flux, cthf, lai, 10 16 ! +leaf_surface_concentration, scalar_exchange_coefficient, sec, sls 11 17 ! +hor_index_bounds, hor_index_bounds_previous_run, id_inflow, id_recycling, … … 13 19 ! ny_on_file, offset_ocean_*, recycling_plane, recycling_width, turbulent_inflow 14 20 ! -myid_char_14 15 !16 ! Former revisions:17 ! -----------------18 ! $Id$19 21 ! 20 22 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/netcdf.f90
r189 r198 7 7 ! Current revisions: 8 8 ! ------------------ 9 ! consistently allow 100 spectra levels instead of 10 10 ! bug fix in the determination of the number of output heights for spectra 11 ! 12 ! user-defined spectra 9 ! 13 10 ! 14 11 ! Former revisions: 15 12 ! ----------------- 16 13 ! $Id$ 14 ! 15 ! 189 2008-08-13 17:09:26Z letzel 16 ! consistently allow 100 spectra levels instead of 10 17 ! bug fix in the determination of the number of output heights for spectra, 18 ! +user-defined spectra 17 19 ! 18 20 ! 97 2007-06-21 08:23:15Z raasch -
palm/trunk/SOURCE/palm.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Workaround for getting information about the coupling mode6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 13 ! Workaround for getting information about the coupling mode 11 14 ! 12 15 ! 108 2007-08-24 15:10:38Z letzel -
palm/trunk/SOURCE/parin.f90
r197 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! +cthf 7 ! +leaf_surface_concentration, scalar_exchange_coefficient 8 ! +inflow_damping_height, inflow_damping_width, recycling_width, 9 ! turbulent_inflow in inipar 10 ! -skip_time_dosp in d3par, 11 ! Allocation of hom_sum moved from init_3d_model to here, 12 ! npex, npey moved from inipar to d3par, setting of myid_char_14 removed, 13 ! lad is allways allocated 6 ! 14 7 ! 15 8 ! Former revisions: 16 9 ! ----------------- 17 10 ! $Id$ 11 ! 12 ! 197 2008-09-16 15:29:03Z raasch 13 ! +cthf,leaf_surface_concentration, scalar_exchange_coefficient 14 ! +inflow_damping_height, inflow_damping_width, recycling_width, 15 ! turbulent_inflow in inipar, -skip_time_dosp in d3par, 16 ! allocation of hom_sum moved from init_3d_model to here, 17 ! npex, npey moved from inipar to d3par, setting of myid_char_14 removed, 18 ! lad is allways allocated 18 19 ! 19 20 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/particle_boundary_conds.f90
r150 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Vertical index calculations adjusted for ocean runs.6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 150 2008-02-29 08:19:58Z raasch 13 ! Vertical index calculations adjusted for ocean runs. 14 ! 11 15 ! Initial version (2007/03/09) 12 16 ! -
palm/trunk/SOURCE/plant_canopy_model.f90
r153 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Consideration of heat sources within the forest canopy which represent the 7 ! rate of heat input into the air from the forest leaves 8 ! 9 ! Evaluation of sinks and sources for scalar concentration due to canopy 10 ! elements 6 ! 11 7 ! 12 8 ! Bugfix: remove IF statement in plant_canopy_model_ij … … 15 11 ! ----------------- 16 12 ! $Id$ 13 ! 14 ! 153 2008-03-19 09:41:30Z steinfeld 15 ! heat sources within the forest canopy are added, which represent the 16 ! rate of heat input into the air from the forest leaves, evaluation of sinks 17 ! and sources for scalar concentration due to canopy elements 17 18 ! 18 19 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/poisfft.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Arguments removed from transpose routines6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 13 ! Arguments removed from transpose routines 11 14 ! 12 15 ! 128 2007-10-26 13:11:14Z raasch -
palm/trunk/SOURCE/poismg.f90
r181 r198 8 8 ! Actual revisions: 9 9 ! ----------------- 10 ! Bugfix: grid_level+1 has to be used in restrict for flags-array10 ! 11 11 ! 12 12 ! Former revisions: 13 13 ! ----------------- 14 14 ! $Id$ 15 ! 16 ! 181 2008-07-30 07:07:47Z raasch 17 ! Bugfix: grid_level+1 has to be used in restrict for flags-array 15 18 ! 16 19 ! 114 2007-10-10 00:03:15Z raasch -
palm/trunk/SOURCE/prandtl_fluxes.f90
r187 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bugfix: change definition of us_wall from 1D to 2D: 7 ! Modification of the evaluation of the vertical turbulent momentum 8 ! fluxes u'w' and v'w'; the first usws that is computed corresponds 9 ! to -u'w'/u* and not as priorily assumed to (-u'w')**0.5, the first 10 ! vsws that is computed corresponds to -v'w'/u* and not as priorily 11 ! assumed to (-v'w')**0.5. Therefore, the intermediate result for 12 ! usws has to be multiplied by -u* instead by itself in order to 13 ! get u'w'. Accordingly, the intermediate result for vsws has to be 14 ! multiplied by -u* instead by itself in order to get v'w'. As u* 15 ! is calculated for the position of a scalar an additional 16 ! interpolation of u* to the position of u and v, respectively, 17 ! is necessary. As u* is not determined for the ghost points on 18 ! each PE, an additional exchange of information from neighbouring 19 ! PEs is necessary.! 20 ! Change: Modification of the integrated version of the profile function for 21 ! momentum for unstable stratification 6 ! 22 7 ! 23 8 ! Former revisions: 24 9 ! ----------------- 25 10 ! $Id$ 11 ! 12 ! 187 2008-08-06 16:25:09Z letzel 13 ! Bugfix: modification of the calculation of the vertical turbulent momentum 14 ! fluxes u'w' and v'w' 15 ! Bugfix: change definition of us_wall from 1D to 2D 16 ! Change: modification of the integrated version of the profile function for 17 ! momentum for unstable stratification (does not effect results) 26 18 ! 27 19 ! 108 2007-08-24 15:10:38Z letzel -
palm/trunk/SOURCE/pres.f90
r151 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bugfix in volume flow control for non-cyclic boundary conditions6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 151 2008-03-07 13:42:18Z raasch 13 ! Bugfix in volume flow control for non-cyclic boundary conditions 11 14 ! 12 15 ! 106 2007-08-16 14:30:26Z raasch -
palm/trunk/SOURCE/production_e.f90
r187 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Change: add 'minus' sign to fluxes obtained from subroutine wall_fluxes_e for 7 ! consistency with subroutine wall_fluxes 6 ! 8 7 ! 9 8 ! Former revisions: 10 9 ! ----------------- 11 10 ! $Id$ 11 ! 12 ! 187 2008-08-06 16:25:09Z letzel 13 ! Change: add 'minus' sign to fluxes obtained from subroutine wall_fluxes_e for 14 ! consistency with subroutine wall_fluxes 12 15 ! 13 16 ! 124 2007-10-19 15:47:46Z raasch -
palm/trunk/SOURCE/prognostic_equations.f90
r153 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! add call of plant_canopy_model in the prognostic equation for 7 ! the potential temperature 8 ! add call of plant_canopy_model in the prognostic equation for 9 ! the concentration of a passive scalar 6 ! 10 7 ! 11 8 ! Former revisions: 12 9 ! ----------------- 13 10 ! $Id$ 11 ! 12 ! 153 2008-03-19 09:41:30Z steinfeld 13 ! add call of plant_canopy_model in the prognostic equation for 14 ! the potential temperature and for the passive scalar 14 15 ! 15 16 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/read_3d_binary.f90
r150 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 150 2008-02-29 08:19:58Z raasch 6 13 ! Files from which restart data are to be read are determined and subsequently 7 14 ! opened. The total domain on the restart file is allowed to be smaller than … … 12 19 ! reading of old profil parameters (cross_..., dopr_crossindex, profile_***) 13 20 ! removed, initialization of spectrum_x|y removed 14 !15 ! Former revisions:16 ! -----------------17 ! $Id$18 21 ! 19 22 ! 102 2007-07-27 09:09:17Z raasch -
palm/trunk/SOURCE/read_var_list.f90
r173 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 173 2008-05-23 20:39:38Z raasch 6 13 ! +cthf, leaf_surface_concentration, scalar_exchange_coefficient 7 14 ! +numprocs_previous_run, hor_index_bounds_previous_run, inflow_damping_factor, … … 12 19 ! read_3d_binary to here, 13 20 ! routines read_parts_of_var_list and skip_var_list added at the end 14 !15 ! Former revisions:16 ! -----------------17 ! $Id$18 21 ! 19 22 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/time_integration.f90
r151 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! inflow turbulence is imposed by calling new routine inflow_turbulence6 ! 7 7 ! 8 8 ! Former revisions: 9 9 ! ----------------- 10 10 ! $Id$ 11 ! 12 ! 151 2008-03-07 13:42:18Z raasch 13 ! inflow turbulence is imposed by calling new routine inflow_turbulence 11 14 ! 12 15 ! 108 2007-08-24 15:10:38Z letzel -
palm/trunk/SOURCE/transpose.f90
r164 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 164 2008-05-15 08:46:15Z raasch 6 13 ! f_inv changed from subroutine argument to automatic array in order to do 7 14 ! re-ordering from f_in to f_inv in one step, one array work is needed instead 8 15 ! of work1 and work2 9 16 ! 10 ! Former revisions: 11 ! ----------------- 12 ! $Id$ 17 ! February 2007 13 18 ! RCS Log replace by Id keyword, revision history cleaned up 14 19 ! -
palm/trunk/SOURCE/user_interface.f90
r159 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 159 2008-04-09 08:06:03Z raasch 6 13 ! bugfix in user_read_restart_data 7 14 ! small bugfixes for sample code (comments): … … 10 17 ! - remove 'READ (13) u2_av' statement in user_read_restart_data 11 18 ! +routines user_read_restart_data, user_spectra 12 !13 ! Former revisions:14 ! -----------------15 ! $Id$16 19 ! 17 20 ! 138 2007-11-28 10:03:58Z letzel -
palm/trunk/SOURCE/wall_fluxes.f90
r187 r198 3 3 ! Actual revisions: 4 4 ! ----------------- 5 ! Bugfix: change definition of us_wall from 1D to 2D: 6 ! Modification of the evaluation of the vertical turbulent momentum 7 ! fluxes u'w' and v'w'; the first usws that is computed corresponds 8 ! to -u'w'/u* and not as priorily assumed to (-u'w')**0.5, the first 9 ! vsws that is computed corresponds to -v'w'/u* and not as priorily 10 ! assumed to (-v'w')**0.5. Therefore, the intermediate result for 11 ! usws has to be multiplied by -u* instead by itself in order to 12 ! get u'w'. Accordingly, the intermediate result for vsws has to be 13 ! multiplied by -u* instead by itself in order to get v'w'. 14 ! This requires the calculation of us_wall (and vel_total, u_i, v_i, ws) 15 ! also in wall_fluxes_e. 16 ! Bugfix: storage of rifs to rifs_wall in wall_fluxes_e removed 17 ! Change: add 'minus' sign to fluxes produced by subroutine wall_fluxes_e for 18 ! consistency with subroutine wall_fluxes 19 ! Change: Modification of the integrated version of the profile function for 20 ! momentum for unstable stratification 5 ! 21 6 ! 22 7 ! Former revisions: 23 8 ! ----------------- 24 9 ! $Id$ 10 ! 11 ! 187 2008-08-06 16:25:09Z letzel 12 ! Bugfix: Modification of the evaluation of the vertical turbulent momentum 13 ! fluxes u'w' and v'w (see prandtl_fluxes), this requires the calculation of 14 ! us_wall (and vel_total, u_i, v_i, ws) also in wall_fluxes_e. 15 ! Bugfix: change definition of us_wall from 1D to 2D 16 ! Bugfix: storage of rifs to rifs_wall in wall_fluxes_e removed 17 ! Change: add 'minus' sign to fluxes produced by subroutine wall_fluxes_e for 18 ! consistency with subroutine wall_fluxes 19 ! Change: Modification of the integrated version of the profile function for 20 ! momentum for unstable stratification 21 ! 25 22 ! Initial version (2007/03/07) 26 23 ! -
palm/trunk/SOURCE/write_3d_binary.f90
r145 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! write_var_list is only called for pe0 7 ! -dopr_time_count, 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 145 2008-01-09 08:17:38Z raasch 13 ! write_var_list is only called for pe0, -dopr_time_count, 8 14 ! hom_sum moved, volume_flow_area, volume_flow_initial moved to write_var_list, 9 15 ! writing of old profil parameters (cross_..., dopr_crossindex, profile_***) 10 16 ! removed 11 !12 ! Former revisions:13 ! -----------------14 ! $Id$15 17 ! 16 18 ! 102 2007-07-27 09:09:17Z raasch -
palm/trunk/SOURCE/write_var_list.f90
r153 r198 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 7 ! 8 ! Former revisions: 9 ! ----------------- 10 ! $Id$ 11 ! 12 ! 153 2008-03-19 09:41:30Z steinfeld 6 13 ! +cthf, leaf_surface_concentration, scalar_exchange_coefficient 7 14 ! +numprocs, hor_index_bounds, inflow_damping_height, inflow_damping_width, … … 10 17 ! hom_sum, volume_flow_area, volume_flow_initial moved from write_3d_binary 11 18 ! to here 12 !13 ! Former revisions:14 ! -----------------15 ! $Id$16 19 ! 17 20 ! 138 2007-11-28 10:03:58Z letzel
Note: See TracChangeset
for help on using the changeset viewer.