Index: palm/trunk/DOC/app/chapter_4.1.html
===================================================================
--- palm/trunk/DOC/app/chapter_4.1.html	(revision 240)
+++ palm/trunk/DOC/app/chapter_4.1.html	(revision 241)
@@ -3256,7 +3256,6 @@
  <span style="font-weight: bold;">conserve_volume_flow</span>
 = <span style="font-style: italic;">.T.</span>
-guarantees that the volume flow through the xz- or yz-cross-section of
-the total model domain remains constant (equal to the initial value at
-t=0) throughout the run.<br><br>Note that&nbsp;<span style="font-weight: bold;">conserve_volume_flow</span>
+guarantees that the volume flow through the xz- and yz-cross-sections of
+the total model domain remains constant throughout the run depending on the chosen <a href="#conserve_volume_flow_mode">conserve_volume_flow_mode</a>.<br><br>Note that&nbsp;<span style="font-weight: bold;">conserve_volume_flow</span>
 = <span style="font-style: italic;">.T.</span> requires <a href="#dp_external">dp_external</a> = <span style="font-style: italic;">.F.</span> .<br>
 
@@ -3281,5 +3280,120 @@
 
 
- <tr>
+ <tr><td style="vertical-align: top;"><span style="font-weight: bold;"><a name="conserve_volume_flow_mode"></a>conserve_volume_flow_mode</span></td><td style="vertical-align: top;">C * 16</td><td style="vertical-align: top;"><span style="font-style: italic;">'default'</span></td><td>Modus of volume flow conservation.<br><br>The following values are allowed:<br><p style="font-style: normal;"><span style="font-style: italic;">'default'</span>
+      </p>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <ul><p>Per default, PALM uses&nbsp;<span style="font-style: italic;">'initial_profiles'</span> for cyclic lateral boundary conditions (<a href="#bc_lr">bc_lr</a> = <span style="font-style: italic;">'cyclic'</span> and <a href="#bc_ns">bc_ns</a> = <span style="font-style: italic;">'cyclic'</span>) and&nbsp;<span style="font-style: italic;">'inflow_profile'</span> for non-cyclic lateral boundary conditions (<a href="chapter_4.1.html#bc_lr">bc_lr</a> /= <span style="font-style: italic;">'cyclic'</span> or <a href="chapter_4.1.html#bc_ns">bc_ns</a> /= <span style="font-style: italic;">'cyclic'</span>).</p></ul>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <p style="font-style: italic;">'initial_profiles' </p>
+
+
+
+
+
+
+
+      
+      
+      
+      
+      
+      
+      <ul><p>The target volume flow&nbsp;is calculated at t=0 from the initial profiles of u and v.&nbsp;This setting is only allowed for&nbsp;cyclic lateral boundary conditions (<a href="chapter_4.1.html#bc_lr">bc_lr</a> = <span style="font-style: italic;">'cyclic'</span> and <a href="chapter_4.1.html#bc_ns">bc_ns</a> = <span style="font-style: italic;">'cyclic'</span>).</p></ul>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <p style="font-style: normal;"><span style="font-style: italic;">'inflow_profile'</span>
+      </p>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <ul><p>The target volume flow&nbsp;is&nbsp;calculated at every timestep from the inflow profile of&nbsp;u or v, respectively. This setting&nbsp;is only allowed for&nbsp;non-cyclic lateral boundary conditions (<a href="chapter_4.1.html#bc_lr">bc_lr</a> /= <span style="font-style: italic;">'cyclic'</span> or <a href="chapter_4.1.html#bc_ns">bc_ns</a> /= <span style="font-style: italic;">'cyclic'</span>).</p></ul>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <p style="font-style: italic;">'bulk_velocity' </p>
+
+
+
+
+
+
+
+      
+      
+      
+      
+      
+      
+      <ul><p>The target volume flow is calculated from a predefined bulk velocity (see <a href="#u_bulk">u_bulk</a> and <a href="#v_bulk">v_bulk</a>). This setting is only allowed for&nbsp;cyclic lateral boundary conditions (<a href="chapter_4.1.html#bc_lr">bc_lr</a> = <span style="font-style: italic;">'cyclic'</span> and <a href="chapter_4.1.html#bc_ns">bc_ns</a> = <span style="font-style: italic;">'cyclic'</span>).</p></ul>
+
+
+
+
+
+
+ 
+      
+      
+      
+      
+      
+      
+      <span style="font-style: italic;"></span>Note that&nbsp;<span style="font-weight: bold;">conserve_volume_flow_mode</span>
+only comes into effect if <a href="#conserve_volume_flow">conserve_volume_flow</a> = <span style="font-style: italic;">.T. .</span> </td></tr><tr>
 
       <td style="vertical-align: top;"><a name="cthf"></a><span style="font-weight: bold;">cthf</span></td>
@@ -14851,5 +14965,5 @@
 for recycling and the width of the layer within&nbsp;the magnitude of
 the turbulence signal is damped from 100% to 0% can be set with
-parameters <a href="chapter_4.1.html#inflow_damping_height">inflow_damping_height</a> and <a href="chapter_4.1.html#inflow_damping_width">inflow_damping_width</a>.<br><br>The detailed setup for a turbulent inflow is described in <a href="chapter_3.9.html">chapter 3.9</a>.</td></tr><tr>
+parameters <a href="chapter_4.1.html#inflow_damping_height">inflow_damping_height</a> and <a href="chapter_4.1.html#inflow_damping_width">inflow_damping_width</a>.<br><br>The detailed setup for a turbulent inflow is described in <a href="chapter_3.9.html">chapter 3.9</a>.</td></tr><tr><td style="vertical-align: top;"><span style="font-weight: bold;"><a name="u_bulk"></a>u_bulk</span></td><td style="vertical-align: top;">R</td><td style="vertical-align: top;"><span style="font-style: italic;">0.0</span></td><td>u-component of the predefined bulk velocity (in m/s).<br><br>This parameter comes into effect if <a href="#conserve_volume_flow">conserve_volume_flow</a> = <span style="font-style: italic;">.T.</span> and <a href="#conserve_volume_flow_mode">conserve_volume_flow_mode</a> = <span style="font-style: italic;">'bulk_velocity'</span>.</td></tr><tr>
 
 
@@ -16284,5 +16398,5 @@
 
 
-    <tr>
+    <tr><td style="vertical-align: top;"><span style="font-weight: bold;"><a name="v_bulk"></a>v_bulk</span></td><td style="vertical-align: top;">R</td><td style="vertical-align: top;"><span style="font-style: italic;">0.0</span></td><td>v-component of the predefined bulk velocity (in m/s).<br><br>This parameter comes into effect if <a href="chapter_4.1.html#conserve_volume_flow">conserve_volume_flow</a> = <span style="font-style: italic;">.T.</span> and <a href="chapter_4.1.html#conserve_volume_flow_mode">conserve_volume_flow_mode</a> = <span style="font-style: italic;">'bulk_velocity'</span>.</td></tr><tr>
 
 
Index: palm/trunk/DOC/app/chapter_4.6.html
===================================================================
--- palm/trunk/DOC/app/chapter_4.6.html	(revision 240)
+++ palm/trunk/DOC/app/chapter_4.6.html	(revision 241)
@@ -2090,5 +2090,5 @@
 
 
- <tr>
+ <tr><td><a href="chapter_4.1.html#conserve_volume_flow_mode"><span style="font-weight: bold;">conserve_volume_flow_mode</span></a></td><td>I</td><td>C * 16</td><td><span style="font-style: italic;">'default'</span></td><td>Modus of volume flow conservation.</td></tr><tr>
 
 
@@ -13907,5 +13907,5 @@
 
 
-    <tr><td align="undefined" valign="undefined"><a href="chapter_4.1.html#turbulent_inflow"><span style="font-weight: bold;">turbulent_inflow</span></a></td><td align="undefined" valign="undefined">I</td><td align="undefined" valign="undefined">L</td><td align="undefined" valign="undefined"><span style="font-style: italic;">.F.</span></td><td align="undefined" valign="undefined">Generates a turbulent inflow at side boundaries using a turbulence recycling method.</td></tr><tr>
+    <tr><td align="undefined" valign="undefined"><a href="chapter_4.1.html#turbulent_inflow"><span style="font-weight: bold;">turbulent_inflow</span></a></td><td align="undefined" valign="undefined">I</td><td align="undefined" valign="undefined">L</td><td align="undefined" valign="undefined"><span style="font-style: italic;">.F.</span></td><td align="undefined" valign="undefined">Generates a turbulent inflow at side boundaries using a turbulence recycling method.</td></tr><tr><td><a href="chapter_4.1.html#u_bulk"><span style="font-weight: bold;">u_bulk</span></a></td><td>I</td><td>R</td><td><span style="font-style: italic;">0.0</span></td><td>u-component of the predefined bulk velocity (in m/s).</td></tr><tr>
 
 
@@ -14457,5 +14457,5 @@
 
 
- <td>.F.</td>
+ <td style="font-style: italic;">.F.</td>
 
 
@@ -14846,5 +14846,5 @@
 
 
- <tr>
+ <tr><td><a href="chapter_4.1.html#v_bulk"><span style="font-weight: bold;">v_bulk</span></a></td><td>I</td><td>R</td><td><span style="font-style: italic;">0.0</span></td><td>v-component of the predefined bulk velocity (in m/s).</td></tr><tr>
 
 
Index: palm/trunk/DOC/tec/message_identifiers
===================================================================
--- palm/trunk/DOC/tec/message_identifiers	(revision 240)
+++ palm/trunk/DOC/tec/message_identifiers	(revision 241)
@@ -235,12 +235,20 @@
     PA0152           dp_external is .TRUE. but dpdxy is zero, i.e. the external 
                       pressure gradient will not be applied
-    PA0153           dpdxy is nonzero but dp_external is .FALSE., i.e. the external
-                      pressure gradient will not be applied
+    PA0153           dpdxy is nonzero but dp_external is .FALSE., i.e. the 
+                      external pressure gradient will not be applied
+    PA0154           unknown conserve_volume_flow_mode: ...
+    PA0155           noncyclic boundary conditions require
+                      conserve_volume_flow_mode = ''inflow_profile''
+    PA0156           cyclic boundary conditions require conserve_volume_flow_mode =
+                      ''initial_profiles'' or ''bulk_velocity''
+                      requires noncyclic boundary conditions
+    PA0157           nonzero bulk velocity requires conserve_volume_flow = .T. and 
+                      conserve_volume_flow_mode = ''bulk_velocity''
 
     UI0001           The value for "topography_grid_convention" is not set. 
                       Its default value is only valid for 
-                      "topography" = ''single_building'', ''single_street_canyon''or 
-                      ''read_from_file'' Choose ''cell_edge'' or 
-                      ''cell_center''.
+                      "topography" = ''single_building'', 
+                      ''single_street_canyon'' or ''read_from_file'' 
+                      Choose ''cell_edge'' or ''cell_center''.
     UI0002           The value for "topography_grid_convention" is not 
                       recognized. Choose ''cell_edge'' or ''cell_center''.
