Changeset 46 for palm/trunk
- Timestamp:
- Mar 5, 2007 6:00:47 AM (17 years ago)
- Location:
- palm/trunk
- Files:
-
- 15 edited
-
DOC/app/chapter_3.5.1.html (modified) (2 diffs)
-
DOC/app/chapter_4.1.html (modified) (2 diffs)
-
DOC/app/chapter_4.2.html (modified) (1 diff)
-
DOC/app/chapter_4.6.html (modified) (2 diffs)
-
DOC/app/index.html (modified) (1 diff)
-
SOURCE/CURRENT_MODIFICATIONS (modified) (3 diffs)
-
SOURCE/check_open.f90 (modified) (2 diffs)
-
SOURCE/check_parameters.f90 (modified) (3 diffs)
-
SOURCE/header.f90 (modified) (2 diffs)
-
SOURCE/init_1d_model.f90 (modified) (2 diffs)
-
SOURCE/init_3d_model.f90 (modified) (2 diffs)
-
SOURCE/modules.f90 (modified) (2 diffs)
-
SOURCE/parin.f90 (modified) (2 diffs)
-
SOURCE/time_integration.f90 (modified) (3 diffs)
-
SOURCE/user_interface.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/DOC/app/chapter_3.5.1.html
r5 r46 159 159 CPU time for <tt><font style="font-size: 10pt;" size="2">user_init</font></tt> 160 160 is considered in the local file <a href="chapter_3.4.html#CPU_MEASURES">CPU_MEASURES</a> 161 within the category “initialisation”.</p> 161 within the category “initialisation”.</p><p>See also <tt><font style="font-size: 10pt;" size="2"><font face="Cumberland, monospace"><a href="#user_init_3d_model">user_init_3d_model</a>.</font></font></tt></p> 162 162 163 163 </td> … … 197 197 </tr> 198 198 199 <tr valign="top"> 199 <tr><td style="vertical-align: top;">In the middle of <tt><font style="font-size: 10pt;" size="2">init_3d_model.f90</font></tt></td><td style="vertical-align: top;"><span style="font-family: monospace;"></span><tt><font style="font-size: 10pt;" size="2"><font face="Cumberland, monospace"><a name="user_init_3d_model"></a>user_init_3d_<br>model</font></font></tt></td><td style="vertical-align: top;">Initialization of the 3d-model.<br><br>Allows 200 the complete initialization of the 3d model. The user is responsible to 201 set at least all those quantities which are normally set within <tt><font style="font-size: 10pt;" size="2">init_3d_model</font></tt>.</td></tr><tr valign="top"> 200 202 201 203 <td width="211"> -
palm/trunk/DOC/app/chapter_4.1.html
r40 r46 7386 7386 7387 7387 7388 <p><span style="font-style: italic;">' initialize_vortex'</span> </p>7388 <p><span style="font-style: italic;">'by_user'</span></p><p style="margin-left: 40px;">The initialization of the arrays of the 3d-model is under complete control of the user and has to be done in routine <a href="chapter_3.5.1.html#user_init_3d_model">user_init_3d_model</a> of the user-interface.<span style="font-style: italic;"></span></p><p><span style="font-style: italic;">'initialize_vortex'</span> </p> 7389 7389 7390 7390 … … 7538 7538 <p style="font-style: normal;">Values may be 7539 7539 combined, e.g. <b>initializing_actions</b> = <span style="font-style: italic;">'set_constant_profiles 7540 initialize_vortex'</span>, but the values of <span style="font-style: italic;">'set_constant_profiles'</span> 7541 and <span style="font-style: italic;">'set_1d-model_profiles'</span> 7542 must not be given at the same time.</p> 7540 initialize_vortex'</span>, but the values of <span style="font-style: italic;">'set_constant_profiles'</span>, <span style="font-style: italic;">'set_1d-model_profiles'</span> 7541 , and <span style="font-style: italic;">'by_user'</span> must not be given at the same time.</p> 7543 7542 7544 7543 -
palm/trunk/DOC/app/chapter_4.2.html
r5 r46 1829 1829 default, the maximum file size of the NetCDF files opened by PALM is 2 1830 1830 GByte. Using netcdf_64bit = .TRUE. allows file sizes larger than 2 1831 GByte.<br><br> <span style="font-weight: bold;">Warning:</span><br>Some (PD or commercial) software may not support the 64 bit offset format.<br>1832 </td> 1833 </tr> 1834 <tr> 1831 GByte.<br><br>The 64 bit offset format can be separately switched off for those NetCDF files containing 3d volume date (<span style="font-family: Courier New,Courier,monospace;">DATA_3D_NETCDF</span>, <span style="font-family: Courier New,Courier,monospace;">DATA_3D_AV_NETCDF</span>) using <a href="#netcdf_64bit_3d">netcdf_64bit_3d</a>.<br><br><span style="font-weight: bold;">Warning:</span><br>Some (PD or commercial) software may not support the 64 bit offset format.<br> 1832 </td> 1833 </tr> 1834 <tr><td style="vertical-align: top;"><a name="netcdf_64bit_3d"></a><span style="font-weight: bold;">netcdf_64bit_3d</span></td><td style="vertical-align: top;">L</td><td style="vertical-align: top;">.T.</td><td style="vertical-align: top;">NetCDF files containing 3d volume data will have 64 bit offset format.<br><br>This switch only comes into effect if <a href="#netcdf_64bit">netcdf_64bit</a> = .TRUE.. It allows to switch off separately the 64 bit offset format for those NetCDF files containing 3d volume data (<span style="font-family: Courier New,Courier,monospace;">DATA_3D_NETCDF</span>, <span style="font-family: Courier New,Courier,monospace;">DATA_3D_AV_NETCDF</span>).</td></tr><tr> 1835 1835 <td style="vertical-align: top;"> 1836 1836 <p><a name="ngsrb"></a><b>ngsrb</b></p> -
palm/trunk/DOC/app/chapter_4.6.html
r40 r46 111 111 --> 112 112 </style></head> 113 114 113 <body style="direction: ltr;" lang="en-US"> 115 114 … … 11889 11888 <td>NetCDF files will have 64 bit offset format.</td> 11890 11889 </tr> 11891 <tr valign="top">11890 <tr><td><a style="font-weight: bold;" href="chapter_4.2.html#netcdf_64bit_3d">netcdf_64bit_3d</a></td><td>R</td><td>L</td><td><span style="font-style: italic;">.T.</span></td><td>NetCDF files containing 3d volume data will have 64 bit offset format.</td></tr><tr valign="top"> 11892 11891 11893 11892 -
palm/trunk/DOC/app/index.html
r5 r46 148 148 <p><span style="font-family: Thorndale;" lang="EN-GB">Current 149 149 model 150 version: 3.1 a<br>150 version: 3.1c<br> 151 151 <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/Aenderungen.html"><span class="GramE">Last</span></a></span><span style="font-family: Thorndale;"><a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/Aenderungen.html"><span style="" lang="EN-GB"> change of</span></a></span><span style="font-family: Thorndale;" lang="EN-GB"> this 152 documentation: 15/03/06<o:p></o:p></span></p>152 documentation: 05/03/07 <o:p></o:p></span></p> 153 153 <div style="text-align: center;" class="MsoNormal" align="center"><span style="font-family: Thorndale;"> 154 154 <hr align="center" size="2" width="100%"></span></div> -
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r39 r46 2 2 --- 3 3 4 A heatflux can be prescribed at the top with new inipar parameters 5 top_heatflux and use_top_fluxes. New 2d-arrays qswst, qswst_m, tswst and 6 tswst_m are used to store this flux. Use of fluxes are controlled with new 7 index variable nzt_diff. A Neumann boundary condition for 8 temperature can be applied under these conditions. Additionally, a Dirichlet 9 condition for temperature can be used at the top. 4 new d3par-parameter netcdf_64bit_3d to switch on 64bit offset only for 3D files 10 5 11 check_parameters, diffusion_s, flow_statistics, header, init_grid, 12 init _3d_model, modules, parin,13 production_e, prognostic_equations, read_var_list, read_3d_binary, 14 swap_timelevel, write_var_list, write_3d_binary 6 new initializing action "by_user" calls user_init_3d_model and allows the 7 initial setting of all 3d arrays 8 9 check_open, check_parameters, header, init_3d_model, modules, parin, user_interface 15 10 16 11 … … 18 13 ------- 19 14 20 Prognostic equations for all scalars are now solved up to gridpoint nzt 21 (formerly nzt-1). Boundary conditions for scalars at top adjusted respectively 22 (now applied only at nzt+1). 15 Move call of user_actions( 'after_integration' ) below increment of times 16 and counters 23 17 24 The default top boundary condition for temperature has been renamed to 25 "initial gradient". 26 27 dvrp_output_local, which was commented out for a long time, is now activated 28 for all streams. 29 30 advec_s_pw, boundary_conds, calc_precipitation, check_parameters, diffusion_e, 31 diffusion_s, impact_of_latent_heat, init_dvrp, 32 init_pt_anomaly, modules, production_e, prognostic_equations, spline_z 18 time_integration 33 19 34 20 … … 36 22 ------ 37 23 38 Bugfix: 3d-array p is not a pointer any more.24 Bugfix: preset of tendencies te_em, te_um, te_vm in init_1d_model 39 25 40 Bugfix in init_particles: MPI_REAL in MPI_ALLREDUCE replaced by 41 MPI_INTEGER (caused error on NEC only) 42 43 Bugfix: ddzw dimensioned 1:nzt"+1" 44 45 diffusion_e, diffusion_s, diffusion_u, diffusion_v, diffusion_w, 46 init_particles, modules 26 init_1d_model -
palm/trunk/SOURCE/check_open.f90
r4 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! +netcdf_64bit_3d to switch on 64bit offset only for 3D files 7 7 ! 8 8 ! Former revisions: … … 989 989 ! 990 990 !-- Create a new NetCDF output file 991 IF ( netcdf_64bit ) THEN991 IF ( netcdf_64bit .AND. netcdf_64bit_3d ) THEN 992 992 #if defined( __netcdf_64bit ) 993 993 nc_stat = NF90_CREATE( filename, & -
palm/trunk/SOURCE/check_parameters.f90
r39 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! "by_user" allowed as initializing action 7 7 ! 8 8 ! Former revisions: … … 292 292 293 293 CASE ( 'set_constant_profiles', 'set_1d-model_profiles', & 294 ' initialize_vortex', 'initialize_ptanom' )294 'by_user', 'initialize_vortex', 'initialize_ptanom' ) 295 295 action = action(position+1:) 296 296 … … 308 308 IF ( myid == 0 ) PRINT*, '+++ check_parameters: initializing_actions', & 309 309 '"set_constant_profiles" and "set_1d-model_profiles" are not', & 310 ' allowed simultaneously' 311 CALL local_stop 312 ENDIF 313 IF ( INDEX( initializing_actions, 'set_constant_profiles' ) /= 0 .AND. & 314 INDEX( initializing_actions, 'by_user' ) /= 0 ) THEN 315 IF ( myid == 0 ) PRINT*, '+++ check_parameters: initializing_actions', & 316 '"set_constant_profiles" and "by_user" are not', & 317 ' allowed simultaneously' 318 CALL local_stop 319 ENDIF 320 IF ( INDEX( initializing_actions, 'by_user' ) /= 0 .AND. & 321 INDEX( initializing_actions, 'set_1d-model_profiles' ) /= 0 ) THEN 322 IF ( myid == 0 ) PRINT*, '+++ check_parameters: initializing_actions', & 323 '"by_user" and "set_1d-model_profiles" are not', & 310 324 ' allowed simultaneously' 311 325 CALL local_stop -
palm/trunk/SOURCE/header.f90
r39 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Output of netcdf_64bit_3d 7 7 ! 8 8 ! Former revisions: … … 696 696 output_format = '' 697 697 IF ( netcdf_output ) THEN 698 IF ( netcdf_64bit ) THEN698 IF ( netcdf_64bit .AND. netcdf_64bit_3d ) THEN 699 699 output_format = 'netcdf (64 bit offset)' 700 700 ELSE -
palm/trunk/SOURCE/init_1d_model.f90
r4 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: preset of tendencies te_em, te_um, te_vm 7 7 ! 8 8 ! Former revisions: … … 128 128 129 129 ! 130 !-- Tendencies must be preset in order to avoid runtime errors within the 131 !-- first Runge-Kutta step 132 te_em = 0.0 133 te_um = 0.0 134 te_vm = 0.0 135 136 ! 130 137 !-- Set start time in hh:mm:ss - format 131 138 simulated_time_chr = time_to_string( simulated_time_1d ) -
palm/trunk/SOURCE/init_3d_model.f90
r40 r46 7 7 ! Actual revisions: 8 8 ! ----------------- 9 ! 9 ! New initializing action "by_user" calls user_init_3d_model 10 10 ! 11 11 ! Former revisions: … … 422 422 IF ( sloping_surface ) CALL init_slope 423 423 424 ELSEIF ( INDEX(initializing_actions, 'by_user') /= 0 ) & 425 THEN 426 ! 427 !-- Initialization will completely be done by the user 428 CALL user_init_3d_model 429 424 430 ENDIF 425 431 -
palm/trunk/SOURCE/modules.f90
r37 r46 5 5 ! Actual revisions: 6 6 ! ----------------- 7 ! +netcdf_64bit_3d 8 ! 9 ! Former revisions: 10 ! ----------------- 11 ! $Id$ 12 ! 13 ! 37 2007-03-01 08:33:54Z raasch 7 14 ! +constant_top_heatflux, top_heatflux, use_top_fluxes, +arrays for top fluxes, 8 15 ! +nzt_diff, default of bc_pt_t renamed "initial_gradient" 9 16 ! Bugfix: p is not a pointer 10 17 ! 11 ! Former revisions:12 ! -----------------13 ! $Id$14 18 ! RCS Log replace by Id keyword, revision history cleaned up 15 19 ! … … 279 283 mg_switch_to_pe0 = .FALSE., moisture = .FALSE., & 280 284 netcdf_output = .FALSE., netcdf_64bit = .FALSE., & 285 netcdf_64bit_3d = .TRUE., & 281 286 outflow_l = .FALSE., outflow_n = .FALSE., outflow_r = .FALSE., & 282 287 outflow_s = .FALSE., passive_scalar = .FALSE., & -
palm/trunk/SOURCE/parin.f90
r39 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! +netcdf_64bit_3d in d3par 7 7 ! 8 8 ! Former revisions: … … 100 100 dt_do2d_yz, dt_do3d, dt_restart, dt_run_control, & 101 101 end_time, force_print_header, mg_cycles, & 102 mg_switch_to_pe0_level, netcdf_64bit, &102 mg_switch_to_pe0_level, netcdf_64bit, netcdf_64bit_3d, & 103 103 ngsrb, normalizing_region, nsor, nz_do3d, omega_sor, & 104 104 prandtl_number, profile_columns, profile_rows, psolver, & -
palm/trunk/SOURCE/time_integration.f90
r4 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Move call of user_actions( 'after_integration' ) below increment of times 7 ! and counters 7 8 ! 8 9 ! Former revisions: … … 243 244 244 245 ! 245 !-- Execute user-defined actions246 CALL user_actions( 'after_integration' )247 248 !249 246 !-- Increase simulation time and output times 250 247 current_timestep_number = current_timestep_number + 1 … … 279 276 time_dopr_listing = time_dopr_listing + dt_3d 280 277 time_run_control = time_run_control + dt_3d 278 279 ! 280 !-- Execute user-defined actions 281 CALL user_actions( 'after_integration' ) 281 282 282 283 ! -
palm/trunk/SOURCE/user_interface.f90
r4 r46 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! New routine user_init_3d_model which allows the initial setting of all 3d 7 ! arrays under control of the user 7 8 ! 8 9 ! Former revisions: … … 228 229 229 230 END SUBROUTINE user_init_grid 231 232 233 234 SUBROUTINE user_init_3d_model 235 236 !------------------------------------------------------------------------------! 237 ! 238 ! Description: 239 ! ------------ 240 ! Allows the complete initialization of the 3d model. 241 ! 242 ! CAUTION: The user is responsible to set at least all those quantities which 243 ! ------ are normally set within init_3d_model! 244 !------------------------------------------------------------------------------! 245 246 USE arrays_3d 247 USE control_parameters 248 USE indices 249 USE user 250 251 IMPLICIT NONE 252 253 254 END SUBROUTINE user_init_3d_model 230 255 231 256
Note: See TracChangeset
for help on using the changeset viewer.
