Changeset 110 for palm


Ignore:
Timestamp:
Oct 5, 2007 5:13:14 AM (17 years ago)
Author:
raasch
Message:

New:
---
Allows runs for a coupled atmosphere-ocean LES,
coupling frequency is controlled by new d3par-parameter dt_coupling,
the coupling mode (atmosphere_to_ocean or ocean_to_atmosphere) for the
respective processes is read from environment variable coupling_mode,
which is set by the mpiexec-command,
communication between the two models is done using the intercommunicator
comm_inter,
local files opened by the ocean model get the additional suffic "_O".
Assume saturation at k=nzb_s_inner(j,i) for atmosphere coupled to ocean.

A momentum flux can be set as top boundary condition using the new
inipar parameter top_momentumflux_u|v.

Non-cyclic boundary conditions can be used along all horizontal directions.

Quantities w*p* and w"e can be output as vertical profiles.

Initial profiles are reset to constant profiles in case that initializing_actions /= 'set_constant_profiles'. (init_rankine)

Optionally calculate km and kh from initial TKE e_init.

Changed:


Remaining variables iran changed to iran_part (advec_particles, init_particles).

In case that the presure solver is not called for every Runge-Kutta substep
(call_psolver_at_all_substeps = .F.), it is called after the first substep
instead of the last. In that case, random perturbations are also added to the
velocity field after the first substep.

Initialization of km,kh = 0.00001 for ocean = .T. (for ocean = .F. it remains 0.01).

Allow data_output_pr= q, wq, w"q", w*q* for humidity = .T. (instead of cloud_physics = .T.).

Errors:


Bugs from code parts for non-cyclic boundary conditions are removed: loops for
u and v are starting from index nxlu, nysv, respectively. The radiation boundary
condition is used for every Runge-Kutta substep. Velocity phase speeds for
the radiation boundary conditions are calculated for the first Runge-Kutta
substep only and reused for the further substeps. New arrays c_u, c_v, and c_w
are defined for this purpose. Several index errors are removed from the
radiation boundary condition code parts. Upper bounds for calculating
u_0 and v_0 (in production_e) are nxr+1 and nyn+1 because otherwise these
values are not available in case of non-cyclic boundary conditions.

+dots_num_palm in module user, +module netcdf_control in user_init (both in user_interface)

Bugfix: wrong sign removed from the buoyancy production term in the case use_reference = .T. (production_e)

Bugfix: Error message concerning output of particle concentration (pc) modified (check_parameters).

Bugfix: Rayleigh damping for ocean fixed.

Location:
palm/trunk
Files:
38 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/DOC/tec/technical_documentation.html

    r98 r110  
    23142314density is calculated from the equation of state for seawater after
    23152315each timestep, using the algorithm proposed by Jackett et al. (2006, J.
    2316 Atmos. Oceanic Technol., <span style="font-weight: bold;">23</span>, 1709-1728).<br>So far, only the initial hydrostatic pressure is entered into this equation.</li><li>z=0 (sea surface) is assumed at the model top (vertical grid index <span style="font-family: Courier New,Courier,monospace;">k=nzt</span> on the w-grid), with negative values of z indicating the depth.</li><li>Initial profiles are constructed (e.g. from <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_vertical_gradient">pt_vertical_gradient</a> / <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_vertical_gradient_level">pt_vertical_gradient_level</a>) starting from the sea surface, using surface values&nbsp;given by <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_surface">pt_surface</a>, <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#sa_surface">sa_surface</a>, <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#ug_surface">ug_surface</a>, and <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#vg_surface">vg_surface</a>.</li><li>Zero salinity flux is used as default boundary condition at the bottom of the sea.</li><li>If switched on, random perturbations are by default imposed to the upper model domain from zu(nzt*2/3) to zu(nzt-3).</li></ul>Relevant new inipar-parameters to be exclusively used for steering ocean runs are <span style="font-family: Courier New,Courier,monospace;">bc_sa_t</span>, <span style="font-family: Courier New,Courier,monospace;">bottom_salinityflux</span>, <span style="font-family: Courier New,Courier,monospace;">sa_surface</span>, <span style="font-family: Courier New,Courier,monospace;">sa_vertical_gradient</span>, <span style="font-family: Courier New,Courier,monospace;">sa_vertical_gradient_level</span>, and <span style="font-family: Courier New,Courier,monospace;">top_salinityflux</span>.<br><br>Salinity (<span style="font-family: Courier New,Courier,monospace;">sa</span>) and potential density (<span style="font-family: Courier New,Courier,monospace;">rho</span>) are included as new 2d/3d output quantities. Vertical profiles of salinity (<span style="font-family: Courier New,Courier,monospace;">sa</span>), salinity fluxes (<span style="font-family: Courier New,Courier,monospace;">w"sa"</span>, <span style="font-family: Courier New,Courier,monospace;">w*sa*</span>, <span style="font-family: Courier New,Courier,monospace;">wsa</span>), and potential density (<span style="font-family: Courier New,Courier,monospace;">rho</span>) can also be output.<span style="font-family: Courier New,Courier,monospace;"></span></td><td style="vertical-align: top;">advec_s_bc, average_3d_data,<br>boundary_conds, buoyancy,<br>check_parameters,&nbsp;data_output_2d,<br>data_output_3d,&nbsp;diffusion_e,<br>diffusivities,&nbsp;flow_statistics,&nbsp;header,<br>init_grid,&nbsp;init_3d_model,&nbsp;modules,<br>netcdf,&nbsp;parin,&nbsp;production_e,<br>prognostic_equations,<br>read_3d_binary,&nbsp;&nbsp;read_var_list,<br>sum_up_3d_data,&nbsp;swap_timelevel,<br>time_integration,&nbsp;user_interface,<br>write_var_list,&nbsp;write_3d_binary<br><br><span style="font-weight: bold;">new:</span><br>eqn_state_seawater,&nbsp;init_ocean</td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">C</td><td style="vertical-align: top;">Inipar-parameter <span style="font-family: Courier New,Courier,monospace;">use_pt_reference</span> renamed <span style="font-family: Courier New,Courier,monospace;">use_reference.</span><br>Internal variable <span style="font-family: Courier New,Courier,monospace;">hydro_press</span> renamed <span style="font-family: Courier New,Courier,monospace;">hyp</span>, routine <span style="font-family: Courier New,Courier,monospace;">calc_mean_pt_profile</span> renamed <span style="font-family: Courier New,Courier,monospace;">calc_mean_profile</span>.<br><br>The format of the <span style="font-family: Courier New,Courier,monospace;">RUN_CONTROL</span> file has been adjusted for ocean runs.<br><br>Defaults of <span style="font-family: Courier New,Courier,monospace;">.._vertical_gradient_levels</span> changed from <span style="font-style: italic;">-1.0</span> to <span style="font-style: italic;">-9999999.9</span>.</td><td style="vertical-align: top;">advec_particles,&nbsp;buoyancy,&nbsp;<br>calc_liquid_water_content, <br>check_parameters,&nbsp;diffusion_e,<br>diffusivities,&nbsp;header,<br>init_cloud_physics,&nbsp;modules,<br>production_e,&nbsp;prognostic_equations,<br>run_control</td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">E</td><td style="vertical-align: top;">Bugfix: height above topography instead of height above level k=0 is used for calculating the mixing length (<span style="font-family: Courier New,Courier,monospace;">diffusion_e</span> and <span style="font-family: Courier New,Courier,monospace;">diffusivities</span>).<br><br>Bugfix: error in boundary condition for TKE removed (<span style="font-family: Courier New,Courier,monospace;">advec_s_bc</span>).</td><td style="vertical-align: top;">advec_s_bc,&nbsp;diffusion_e,&nbsp;diffusivities</td></tr>
     2316Atmos. Oceanic Technol., <span style="font-weight: bold;">23</span>, 1709-1728).<br>So far, only the initial hydrostatic pressure is entered into this equation.</li><li>z=0 (sea surface) is assumed at the model top (vertical grid index <span style="font-family: Courier New,Courier,monospace;">k=nzt</span> on the w-grid), with negative values of z indicating the depth.</li><li>Initial profiles are constructed (e.g. from <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_vertical_gradient">pt_vertical_gradient</a> / <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_vertical_gradient_level">pt_vertical_gradient_level</a>) starting from the sea surface, using surface values&nbsp;given by <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#pt_surface">pt_surface</a>, <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#sa_surface">sa_surface</a>, <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#ug_surface">ug_surface</a>, and <a href="http://www.muk.uni-hannover.de/%7Eraasch/PALM_group/doc/app/chapter_4.1.html#vg_surface">vg_surface</a>.</li><li>Zero salinity flux is used as default boundary condition at the bottom of the sea.</li><li>If switched on, random perturbations are by default imposed to the upper model domain from zu(nzt*2/3) to zu(nzt-3).</li></ul>Relevant new inipar-parameters to be exclusively used for steering ocean runs are <span style="font-family: Courier New,Courier,monospace;">bc_sa_t</span>, <span style="font-family: Courier New,Courier,monospace;">bottom_salinityflux</span>, <span style="font-family: Courier New,Courier,monospace;">sa_surface</span>, <span style="font-family: Courier New,Courier,monospace;">sa_vertical_gradient</span>, <span style="font-family: Courier New,Courier,monospace;">sa_vertical_gradient_level</span>, and <span style="font-family: Courier New,Courier,monospace;">top_salinityflux</span>.<br><br>Salinity (<span style="font-family: Courier New,Courier,monospace;">sa</span>) and potential density (<span style="font-family: Courier New,Courier,monospace;">rho</span>) are included as new 2d/3d output quantities. Vertical profiles of salinity (<span style="font-family: Courier New,Courier,monospace;">sa</span>), salinity fluxes (<span style="font-family: Courier New,Courier,monospace;">w"sa"</span>, <span style="font-family: Courier New,Courier,monospace;">w*sa*</span>, <span style="font-family: Courier New,Courier,monospace;">wsa</span>), and potential density (<span style="font-family: Courier New,Courier,monospace;">rho</span>) can also be output.<span style="font-family: Courier New,Courier,monospace;"></span></td><td style="vertical-align: top;">advec_s_bc, average_3d_data,<br>boundary_conds, buoyancy,<br>check_parameters,&nbsp;data_output_2d,<br>data_output_3d,&nbsp;diffusion_e,<br>diffusivities,&nbsp;flow_statistics,&nbsp;header,<br>init_grid,&nbsp;init_3d_model,&nbsp;modules,<br>netcdf,&nbsp;parin,&nbsp;production_e,<br>prognostic_equations,<br>read_3d_binary,&nbsp;&nbsp;read_var_list,<br>sum_up_3d_data,&nbsp;swap_timelevel,<br>time_integration,&nbsp;user_interface,<br>write_var_list,&nbsp;write_3d_binary<br><br><span style="font-weight: bold;">new:</span><br>eqn_state_seawater,&nbsp;init_ocean</td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">C</td><td style="vertical-align: top;">Inipar-parameter <span style="font-family: Courier New,Courier,monospace;">use_pt_reference</span> renamed <span style="font-family: Courier New,Courier,monospace;">use_reference.</span><br>Internal variable <span style="font-family: Courier New,Courier,monospace;">hydro_press</span> renamed <span style="font-family: Courier New,Courier,monospace;">hyp</span>, routine <span style="font-family: Courier New,Courier,monospace;">calc_mean_pt_profile</span> renamed <span style="font-family: Courier New,Courier,monospace;">calc_mean_profile</span>.<br><br>The format of the <span style="font-family: Courier New,Courier,monospace;">RUN_CONTROL</span> file has been adjusted for ocean runs.<br><br>Defaults of <span style="font-family: Courier New,Courier,monospace;">.._vertical_gradient_levels</span> changed from <span style="font-style: italic;">-1.0</span> to <span style="font-style: italic;">-9999999.9</span>.</td><td style="vertical-align: top;">advec_particles,&nbsp;buoyancy,&nbsp;<br>calc_liquid_water_content, <br>check_parameters,&nbsp;diffusion_e,<br>diffusivities,&nbsp;header,<br>init_cloud_physics,&nbsp;modules,<br>production_e,&nbsp;prognostic_equations,<br>run_control</td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">E</td><td style="vertical-align: top;">Bugfix: height above topography instead of height above level k=0 is used for calculating the mixing length (<span style="font-family: Courier New,Courier,monospace;">diffusion_e</span> and <span style="font-family: Courier New,Courier,monospace;">diffusivities</span>).<br><br>Bugfix: error in boundary condition for TKE removed (<span style="font-family: Courier New,Courier,monospace;">advec_s_bc</span>).</td><td style="vertical-align: top;">advec_s_bc,&nbsp;diffusion_e,&nbsp;diffusivities</td></tr><tr><td style="vertical-align: top;">05/10/07</td><td style="vertical-align: top;">SR</td><td style="vertical-align: top;">3.4</td><td style="vertical-align: top;">N</td><td style="vertical-align: top;">This version allows runs for a coupled atmosphere-ocean LES.<br><br>Coupling frequency is controlled by new d3par-parameter <span style="font-family: Courier New,Courier,monospace;">dt_coupling</span>, the coupling mode ('<span style="font-style: italic;">atmosphere_to_ocean</span>' or '<span style="font-style: italic;">ocean_to_atmosphere</span>') for the respective processes is read from environment variable <span style="font-family: Courier New,Courier,monospace;">coupling_mode</span>, which is set by the mpiexec-command in <span style="font-weight: bold;">mrun</span>. Communication between the two models is handled by the intercommunicator <span style="font-family: Courier New,Courier,monospace;">comm_inter</span>. Local files opened by the ocean model get the additional suffic "<span style="font-family: Courier New,Courier,monospace;">_O</span>".
     2317Saturation at k=nzb is assumed for the atmosphere coupled to ocean.
     2318Usage of the coupled model is described in the new section 3.8.<br><br>A momentum flux can be set as top boundary condition using the new inipar parameters <span style="font-family: Courier New,Courier,monospace;">top_momentumflux_u|v</span>.<br><br>Non-cyclic boundary conditions can be used along all horizontal directions.<br><br>Quantities w*p* and w"e can be output as vertical profiles.<br><br>Initial profiles are reset to constant profiles in case that <span style="font-family: Courier New,Courier,monospace;">initializing_actions</span> /= '<span style="font-style: italic;">set_constant_profiles</span>'. (init_rankine)<br><br>Optionally calculate km and kh from initial TKE e_init.<br><br><span style="font-weight: bold;">Attention:</span> <br>
     2319The format of the testresult-file (run control output) has changed
     2320due to this modification.</td><td style="vertical-align: top;">boundary_conds,
     2321check_open, check_parameters, diffusion_u, diffusion_v,
     2322flow_statistics, header, init_pegrid, init_rankine, init_3d_model,
     2323local_stop, modules, palm, parin, prandtl_fluxes, pres,
     2324prognostic_equations, read_var_list, read_3d_binary, swap_timelevel,
     2325timestep, time_integration, write_var_list, write_3d_binary<br><br><span style="font-weight: bold;">new:</span><br>surface_coupler</td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">C</td><td style="vertical-align: top;">Remaining variables <span style="font-family: Courier New,Courier,monospace;">iran</span> changed to <span style="font-family: Courier New,Courier,monospace;">iran_part</span> (advec_particles, init_particles).<br><br>In case that the presure solver is not called for every Runge-Kutta substep (<span style="font-family: Courier New,Courier,monospace;">call_psolver_at_all_substeps</span> = <span style="font-style: italic;">.F.</span>),
     2326it is called after the first substep instead of the last. In that case,
     2327random perturbations are also added to the velocity field after the
     2328first substep.<br><br>Initialization of <span style="font-family: Courier New,Courier,monospace;">km</span>, <span style="font-family: Courier New,Courier,monospace;">kh</span> = 0.00001 for <span style="font-family: Courier New,Courier,monospace;">ocean</span> = <span style="font-style: italic;">.T.</span> (for <span style="font-family: Courier New,Courier,monospace;">ocean</span> = <span style="font-style: italic;">.F.</span> it remains 0.01).<br><br>Allow <span style="font-family: Courier New,Courier,monospace;">data_output_pr</span> = '<span style="font-style: italic;">q</span>', '<span style="font-style: italic;">wq</span>', '<span style="font-style: italic;">w"q"</span>', '<span style="font-style: italic;">w*q*</span>' for <span style="font-family: Courier New,Courier,monospace;">humidity</span> = <span style="font-style: italic;">.T.</span> (instead of <span style="font-family: Courier New,Courier,monospace;">cloud_physics</span> = <span style="font-style: italic;">.T.</span>).</td><td style="vertical-align: top;">advec_particles, check_for_restart, check_parameters, init_particles, init_3d_model, time_integration<br></td></tr><tr><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">&nbsp;</td><td style="vertical-align: top;">E</td><td style="vertical-align: top;">Bugs from code parts for non-cyclic boundary conditions are removed:<br>loops for u and v are starting from index <span style="font-family: Courier New,Courier,monospace;">nxlu</span>, <span style="font-family: Courier New,Courier,monospace;">nysv</span>,
     2329respectively. The radiation boundary condition is used for every
     2330Runge-Kutta substep. Velocity phase speeds for the radiation boundary
     2331conditions are calculated for the first Runge-Kutta substep only and
     2332reused for the further substeps. New arrays <span style="font-family: Courier New,Courier,monospace;">c_u</span>, <span style="font-family: Courier New,Courier,monospace;">c_v</span>, and <span style="font-family: Courier New,Courier,monospace;">c_w</span>
     2333are defined for this purpose. Several index errors are removed from the
     2334radiation boundary condition code parts. Upper bounds for calculating <span style="font-family: Courier New,Courier,monospace;">u_0</span> and <span style="font-family: Courier New,Courier,monospace;">v_0</span> (in production_e) are <span style="font-style: italic;">nxr+1</span> and <span style="font-style: italic;">nyn+1</span> because otherwise these values are not available in case of non-cyclic boundary conditions.<br><br>+<span style="font-family: Courier New,Courier,monospace;">dots_num_palm</span> in module user, +module netcdf_control in user_init (both in user_interface)<br><br>Bugfix: wrong sign removed from the buoyancy production term in the case <span style="font-family: Courier New,Courier,monospace;">use_reference</span> = <span style="font-style: italic;">.T.</span> (production_e)<br><br>Bugfix: Error message concerning output of particle concentration (pc) modified (check_parameters).<br><br>Bugfix: Rayleigh damping for ocean fixed.</td><td style="vertical-align: top;">advec_u_pw,
     2335advec_u_up, advec_v_pw, advec_v_up, boundary_conds, buoyancy,
     2336check_parameters, coriolis, diffusion_u, diffusion_v, header,
     2337init_pegrid, init_3d_model, modules, production_e,
     2338prognostic_equations, user_interface<br></td></tr>
    23172339</tbody>
    23182340</table>&nbsp;<b><blink>Attention:</blink></b>
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r108 r110  
    11New:
    22---
    3 Allows runs for a coupled atmosphere-ocean LES,
    4 coupling frequency is controlled by new d3par-parameter dt_coupling,
    5 the coupling mode (atmosphere_to_ocean or ocean_to_atmosphere) for the
    6 respective processes is read from environment variable coupling_mode,
    7 which is set by the mpiexec-command,
    8 communication between the two models is done using the intercommunicator
    9 comm_inter,
    10 local files opened by the ocean model get the additional suffic "_O".
    11 Assume saturation at k=nzb_s_inner(j,i) for atmosphere coupled to ocean.
    12 
    13 A momentum flux can be set as top boundary condition using the new
    14 inipar parameter top_momentumflux_u|v.
    15 
    16 Non-cyclic boundary conditions can be used along all horizontal directions.
    17 
    18 Quantities w*p* and w"e can be output as vertical profiles.
    19 
    20 Initial profiles are reset to constant profiles in case that initializing_actions /= 'set_constant_profiles'. (init_rankine)
    21 
    22 Optionally calculate km and kh from initial TKE e_init.
    23 
    24 boundary_conds, check_open, check_parameters, diffusion_u, diffusion_v, flow_statistics, header, init_pegrid, init_rankine, init_3d_model, modules, palm, parin, pres, prandtl_fluxes, prognostic_equations, read_var_list, read_3d_binary, swap_timelevel, time_integration, write_var_list, write_3d_binary
    25 
    26 New:
    27 surface_coupler
    283
    294
    305Changed:
    316-------
    32 Remaining variables iran changed to iran_part (advec_particles, init_particles).
    33 
    34 In case that the presure solver is not called for every Runge-Kutta substep
    35 (call_psolver_at_all_substeps = .F.), it is called after the first substep
    36 instead of the last. In that case, random perturbations are also added to the
    37 velocity field after the first substep.
    38 
    39 Initialization of km,kh = 0.00001 for ocean = .T. (for ocean = .F. it remains 0.01).
    40 
    41 Allow data_output_pr= q, wq, w"q", w*q* for humidity = .T. (instead of cloud_physics = .T.).
    42 
    43 Modifications to terminate coupled runs.
    44 
    45 advec_particles, check_for_restart, check_parameters, init_particles, init_3d_model, local_stop, timestep, time_integration
    467
    478
    489Errors:
    4910------
    50 Bugs from code parts for non-cyclic boundary conditions are removed: loops for
    51 u and v are starting from index nxlu, nysv, respectively. The radiation boundary
    52 condition is used for every Runge-Kutta substep. Velocity phase speeds for
    53 the radiation boundary conditions are calculated for the first Runge-Kutta
    54 substep only and reused for the further substeps. New arrays c_u, c_v, and c_w
    55 are defined for this purpose. Several index errors are removed from the
    56 radiation boundary condition code parts. Upper bounds for calculating
    57 u_0 and v_0 (in production_e) are nxr+1 and nyn+1 because otherwise these
    58 values are not available in case of non-cyclic boundary conditions.
    59 
    60 +dots_num_palm in module user, +module netcdf_control in user_init (both in user_interface)
    61 
    62 Bugfix: wrong sign removed from the buoyancy production term in the case use_reference = .T. (production_e)
    63 
    64 Bugfix: Error message concerning output of particle concentration (pc) modified (check_parameters).
    65 
    66 Bugfix: Rayleigh damping for ocean fixed.
    67 
    68 advec_u_pw, advec_u_up, advec_v_pw, advec_v_up, boundary_conds, buoyancy, check_parameters, coriolis, diffusion_u, diffusion_v, header, init_pegrid, init_3d_model, modules, production_e, prognostic_equations, user_interface
  • palm/trunk/SOURCE/advec_particles.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! remaining variables iran changed to iran_part
    76! TEST: PRINT statements on unit 9 (commented out)
    87!
     
    109! -----------------
    1110! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! remaining variables iran changed to iran_part
    1214!
    1315! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/advec_u_pw.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/advec_u_up.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/advec_v_pw.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! j loop is starting from nysv (needed for non-cyclic boundary conditions)
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! j loop is starting from nysv (needed for non-cyclic boundary conditions)
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/advec_v_up.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! j loop is starting from nysv (needed for non-cyclic boundary conditions)
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! j loop is starting from nysv (needed for non-cyclic boundary conditions)
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/boundary_conds.f90

    r107 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 107 2007-08-17 13:54:45Z raasch
    613! Boundary conditions for temperature adjusted for coupled runs,
    714! bugfixes for the radiation boundary conditions at the outflow: radiation
    815! conditions are used for every substep, phase speeds are calculated for the
    916! first Runge-Kutta substep only and then reused, several index values changed
    10 !
    11 !
    12 ! Former revisions:
    13 ! -----------------
    14 ! $Id$
    1517!
    1618! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/buoyancy.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! i loop for u-component (sloping surface) is starting from nxlu (needed for
    7 ! non-cyclic boundary conditions)
     6!
    87!
    98! Former revisions:
     
    1110! $Id$
    1211!
     12! 106 2007-08-16 14:30:26Z raasch
     13! i loop for u-component (sloping surface) is starting from nxlu (needed for
     14! non-cyclic boundary conditions)
     15!
    1316! 97 2007-06-21 08:23:15Z raasch
    1417! Routine reneralized to be used with temperature AND density:
  • palm/trunk/SOURCE/check_for_restart.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! modifications to terminate coupled runs
    76!
    87!
     
    109! -----------------
    1110! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! modifications to terminate coupled runs
     14!
    1215! RCS Log replace by Id keyword, revision history cleaned up
    1316!
     
    6164!-- Output that job will be terminated
    6265    IF ( terminate_run  .AND.  myid == 0 )  THEN
    63        PRINT*, '*** WARNING: run will be terminated because it is running out of job cpu', &
    64                     'limit'
     66       PRINT*, '*** WARNING: run will be terminated because it is running out', &
     67                    ' of job cpu limit'
    6568       PRINT*, '             remaining time:         ', remaining_time, ' s'
    66        PRINT*, '             termination time needed:', termination_time_needed, ' s'
     69       PRINT*, '             termination time needed:', termination_time_needed,&
     70                    ' s'
    6771    ENDIF
    6872
     
    7276!-- informed of another termination reason (terminate_coupled > 0) before,
    7377!-- or vice versa (terminate_coupled_remote > 0).
    74     IF ( terminate_run .AND. TRIM( coupling_mode ) /= 'uncoupled'  &
    75          .AND. terminate_coupled == 0  &
    76          .AND. terminate_coupled_remote == 0 )  THEN
     78    IF ( terminate_run .AND. TRIM( coupling_mode ) /= 'uncoupled'  .AND. &
     79         terminate_coupled == 0  .AND.  terminate_coupled_remote == 0 )  THEN
     80
    7781       terminate_coupled = 3
    78        CALL MPI_SENDRECV( &
    79             terminate_coupled,        1, MPI_INTEGER, myid,  0, &
    80             terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
    81             comm_inter, status, ierr )
     82       CALL MPI_SENDRECV( terminate_coupled,        1, MPI_INTEGER, myid,  0, &
     83                          terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
     84                          comm_inter, status, ierr )
    8285    ENDIF
    8386
     
    101104
    102105          IF ( myid == 0 )  THEN
    103              PRINT*, '*** INFORMATIVE: run will be terminated due to user settings of'
     106             PRINT*, '*** INFORMATIVE: run will be terminated due to user ', &
     107                                       'settings of'
    104108             PRINT*, '                 restart_time / dt_restart'
    105109             PRINT*, '                 new restart time is: ', time_restart, ' s'
     
    110114!--       informed of another termination reason (terminate_coupled > 0) before,
    111115!--       or vice versa (terminate_coupled_remote > 0).
    112           IF ( coupling_mode /= 'uncoupled' .AND. terminate_coupled == 0  &
    113                .AND. terminate_coupled_remote == 0)  THEN
     116          IF ( coupling_mode /= 'uncoupled' .AND. terminate_coupled == 0  .AND. &
     117               terminate_coupled_remote == 0)  THEN
     118
    114119             IF ( dt_restart /= 9999999.9 )  THEN
    115120                terminate_coupled = 4
     
    117122                terminate_coupled = 5
    118123             ENDIF
    119              CALL MPI_SENDRECV( &
    120                   terminate_coupled,        1, MPI_INTEGER, myid,  0, &
    121                   terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
    122                   comm_inter, status, ierr )
     124             CALL MPI_SENDRECV(                                                 &
     125                            terminate_coupled,        1, MPI_INTEGER, myid,  0, &
     126                            terminate_coupled_remote, 1, MPI_INTEGER, myid,  0, &
     127                            comm_inter, status, ierr )
    123128          ENDIF
    124129       ELSE
  • palm/trunk/SOURCE/check_open.f90

    r105 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Different filenames are used in case of a coupled simulation,
    7 ! coupling_char added to all relevant filenames
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 105 2007-08-08 07:12:55Z raasch
     13! Different filenames are used in case of a coupled simulation,
     14! coupling_char added to all relevant filenames
    1215!
    1316! 82 2007-04-16 15:40:52Z raasch
  • palm/trunk/SOURCE/check_parameters.f90

    r109 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 109 2007-08-28 15:26:47Z letzel
    613! Check coupling_mode and set default (obligatory) values (like boundary
    714! conditions for temperature and fluxes) in case of coupled runs.
     
    1421! Rayleigh damping for ocean fixed.
    1522! Check and, if necessary, set default value for dt_coupling
    16 !
    17 ! Former revisions:
    18 ! -----------------
    19 ! $Id$
    2023!
    2124! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/coriolis.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! loops for u and v are starting from index nxlu, nysv, respectively (needed
    7 ! for non-cyclic boundary conditions)
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! loops for u and v are starting from index nxlu, nysv, respectively (needed
     14! for non-cyclic boundary conditions)
    1215!
    1316! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/diffusion_u.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Momentumflux at top (uswst) included as boundary condition,
    7 ! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! Momentumflux at top (uswst) included as boundary condition,
     14! i loop is starting from nxlu (needed for non-cyclic boundary conditions)
    1215!
    1316! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/diffusion_v.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Momentumflux at top (vswst) included as boundary condition,
    7 ! j loop is starting from nysv (needed for non-cyclic boundary conditions)
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! Momentumflux at top (vswst) included as boundary condition,
     14! j loop is starting from nysv (needed for non-cyclic boundary conditions)
    1215!
    1316! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/flow_statistics.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Prescribed momentum fluxes at the top surface are used,
    7 ! profiles for w*p* and w"e are calculated
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! Prescribed momentum fluxes at the top surface are used,
     14! profiles for w*p* and w"e are calculated
    1215!
    1316! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/header.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
    613! Output of informations for coupled model runs (boundary conditions etc.)
    714! + output of momentumfluxes at the top boundary
    815! Rayleigh damping for ocean, e_init
    9 !
    10 ! Former revisions:
    11 ! -----------------
    12 ! $Id$
    1316!
    1417! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/init_3d_model.f90

    r108 r110  
    77! Actual revisions:
    88! -----------------
     9!
     10!
     11! Former revisions:
     12! -----------------
     13! $Id$
     14!
     15! 108 2007-08-24 15:10:38Z letzel
    916! Flux initialization in case of coupled runs, +momentum fluxes at top boundary,
    1017! +arrays for phase speed c_u, c_v, c_w, indices for u|v|w_m_l|r changed
    1118! +qswst_remote in case of atmosphere model with humidity coupled to ocean
    12 ! Rayleigh damping for ocean
    13 ! optionally calculate km and kh from initial TKE e_init
    14 !
    15 ! Former revisions:
    16 ! -----------------
    17 ! $Id$
     19! Rayleigh damping for ocean, optionally calculate km and kh from initial
     20! TKE e_init
    1821!
    1922! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/init_particles.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! variable iran replaced by iran_part
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! variable iran replaced by iran_part
    1114!
    1215! 82 2007-04-16 15:40:52Z raasch
  • palm/trunk/SOURCE/init_pegrid.f90

    r108 r110  
    55! -----------------
    66! TEST OUTPUT (TO BE REMOVED) logging mpi2 ierr values
    7 ! Intercommunicator (comm_inter) and derived data type (type_xy) for
    8 ! coupled model runs created, assign coupling_mode_remote
    9 ! indices nxlu and nysv are calculated (needed for non-cyclic boundary
    10 ! conditions)
    117!
    128! Former revisions:
    139! -----------------
    1410! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! Intercommunicator (comm_inter) and derived data type (type_xy) for
     14! coupled model runs created, assign coupling_mode_remote,
     15! indices nxlu and nysv are calculated (needed for non-cyclic boundary
     16! conditions)
    1517!
    1618! 82 2007-04-16 15:40:52Z raasch
     
    894896#endif
    895897!
    896 !-- At the outflow, u or v, respectively, have to be calculated for one grid
    897 !-- point less.
     898!-- At the outflow, u or v, respectively, have to be calculated for one more
     899!-- grid point.
    898900    IF ( outflow_l )  THEN
    899901       nxlu = nxl + 1
  • palm/trunk/SOURCE/init_rankine.f90

    r107 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Initial profiles are reset to constant profiles
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 107 2007-08-17 13:54:45Z raasch
     13! Initial profiles are reset to constant profiles
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/local_stop.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! modifications to terminate coupled runs
     6!
    77!
    88!
     
    1010! -----------------
    1111! $Id$
     12!
     13! 108 2007-08-24 15:10:38Z letzel
     14! modifications to terminate coupled runs
     15!
    1216! RCS Log replace by Id keyword, revision history cleaned up
    1317!
  • palm/trunk/SOURCE/modules.f90

    r108 r110  
    55! Actual revisions:
    66! -----------------
     7!
     8!
     9! Former revisions:
     10! -----------------
     11! $Id$
     12!
     13! 108 2007-08-24 15:10:38Z letzel
    714! +comm_inter, constant_top_momentumflux, coupling_char, coupling_mode,
    815! coupling_mode_remote, c_u, c_v, c_w, dt_coupling, e_init, humidity_remote,
     
    1017! terminate_coupled_remote, time_coupling, top_momentumflux_u|v, type_xy,
    1118! uswst*, vswst*
    12 !
    13 ! Former revisions:
    14 ! -----------------
    15 ! $Id$
    1619!
    1720! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/palm.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Get coupling mode from environment variable
    7 ! Change localtion of debug output
     6!
    87!
    98! Former revisions:
    109! -----------------
    1110! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! Get coupling mode from environment variable, change location of debug output
    1214!
    1315! 75 2007-03-22 09:54:05Z raasch
     
    6466    INTEGER           ::  i, run_description_header_i(80)
    6567
    66     version = 'PALM 3.3a'
     68    version = 'PALM 3.4'
    6769
    6870#if defined( __parallel )
  • palm/trunk/SOURCE/parin.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +e_init, top_momentumflux_u|v in inipar, +dt_coupling in d3par
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! +e_init, top_momentumflux_u|v in inipar, +dt_coupling in d3par
    1114!
    1215! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/prandtl_fluxes.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! assume saturation at k=nzb_s_inner(j,i) for atmosphere coupled to ocean
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! assume saturation at k=nzb_s_inner(j,i) for atmosphere coupled to ocean
    1114!
    1215! 75 2007-03-22 09:54:05Z raasch
  • palm/trunk/SOURCE/pres.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
    6 ! Volume flow conservation added for the remaining three outflow boundaries
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
     13! Volume flow conservation added for the remaining three outflow boundaries
    1114!
    1215! 85 2007-05-11 09:35:14Z raasch
  • palm/trunk/SOURCE/production_e.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
    613! Bugfix: wrong sign removed from the buoyancy production term in the case
    714! use_reference = .T.,
     
    916! not available in case of non-cyclic boundary conditions)
    1017! Bugfix for ocean density flux at bottom
    11 !
    12 ! Former revisions:
    13 ! -----------------
    14 ! $Id$
    1518!
    1619! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/prognostic_equations.f90

    r106 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 106 2007-08-16 14:30:26Z raasch
    613! +uswst, vswst as arguments in calls of diffusion_u|v,
    714! loops for u and v are starting from index nxlu, nysv, respectively (needed
    815! for non-cyclic boundary conditions)
    9 !
    10 ! Former revisions:
    11 ! -----------------
    12 ! $Id$
    1316!
    1417! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/read_3d_binary.f90

    r102 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +uswst, uswst_m, vswst, vswst_m
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 102 2007-07-27 09:09:17Z raasch
     13! +uswst, uswst_m, vswst, vswst_m
    1114!
    1215! 96 2007-06-04 08:07:41Z raasch
  • palm/trunk/SOURCE/read_var_list.f90

    r102 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +time_coupling, top_momentumflux_u|v
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 102 2007-07-27 09:09:17Z raasch
     13! +time_coupling, top_momentumflux_u|v
    1114!
    1215! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/surface_coupler.f90

    r109 r110  
    44! Actual revisions:
    55! -----------------
    6 ! include latent heatflux and salinity flux for atmosphere runs with moisture
    7 ! modifications to terminate coupled runs
    86!
    97!
     
    1210! $Id$
    1311!
     12! 109 2007-08-28 15:26:47Z letzel
    1413! Initial revision
    1514!
  • palm/trunk/SOURCE/swap_timelevel.f90

    r102 r110  
    44! Actual revisions:
    55! -----------------
    6 ! swaping of uswst, vswst included
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 102 2007-07-27 09:09:17Z raasch
     13! swaping of uswst, vswst included
    1114!
    1215! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/time_integration.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
     6!
     7!
     8! Former revisions:
     9! -----------------
     10! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
    613! Call of new routine surface_coupler,
    714! presure solver is called after the first Runge-Kutta substep instead of the
     
    916! random perturbation has to be added to the velocity fields also after the
    1017! first substep
    11 ! modifications to terminate coupled runs
    12 !
    13 !
    14 ! Former revisions:
    15 ! -----------------
    16 ! $Id$
    1718!
    1819! 97 2007-06-21 08:23:15Z raasch
  • palm/trunk/SOURCE/timestep.f90

    r108 r110  
    44! Actual revisions:
    55! -----------------
    6 ! modifications to terminate coupled runs
    76!
    87!
     
    109! -----------------
    1110! $Id$
     11!
     12! 108 2007-08-24 15:10:38Z letzel
     13! modifications to terminate coupled runs
     14!
    1215! RCS Log replace by Id keyword, revision history cleaned up
    1316!
  • palm/trunk/SOURCE/user_interface.f90

    r105 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +dots_num_palm in module user, +module netcdf_control in user_init
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 105 2007-08-08 07:12:55Z raasch
     13! +dots_num_palm in module user, +module netcdf_control in user_init
    1114!
    1215! 95 2007-06-02 16:48:38Z raasch
  • palm/trunk/SOURCE/write_3d_binary.f90

    r102 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +uswst, uswst_m, vswst, vswst_m
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 102 2007-07-27 09:09:17Z raasch
     13! +uswst, uswst_m, vswst, vswst_m
    1114!
    1215! 96 2007-06-04 08:07:41Z raasch
  • palm/trunk/SOURCE/write_var_list.f90

    r102 r110  
    44! Actual revisions:
    55! -----------------
    6 ! +top_momentumflux_u|v, time_coupling
     6!
    77!
    88! Former revisions:
    99! -----------------
    1010! $Id$
     11!
     12! 102 2007-07-27 09:09:17Z raasch
     13! +top_momentumflux_u|v, time_coupling
    1114!
    1215! 95 2007-06-02 16:48:38Z raasch
Note: See TracChangeset for help on using the changeset viewer.