Changeset 3139 for palm/trunk

Timestamp:

Jul 17, 2018 11:30:10 AM (6 years ago)

Author:

Giersch

Message:

Bugfix in calculation of alpha_attack and Bugfix for restarts in combination with grid stretching

Location:

palm/trunk/SOURCE

Files:

• init_grid.f90 (modified) (2 diffs)
• wind_turbine_model_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/init_grid.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in case of restarts and grid stretching
+! 
+! 3115 2018-07-10 12:49:26Z suehring
 ! Referencing of buildings onto top of terrain - special treatment for bridges. 
 ! 
@@ -432 +435 @@
 !-- Determine number of dz values and stretching levels specified by the
 !-- user to allow right controlling of the stretching mechanism and to
-!-- perform error checks
-    number_dz = COUNT( dz /= -1.0_wp )
+!-- perform error checks. The additional requirement that dz /= dz_max
+!-- for counting number of user-specified dz values is necessary. Otherwise 
+!-- restarts would abort if the old stretching mechanism with dz_stretch_level
+!-- is used (Attention: The user is not allowed to specify a dz value equal
+!-- to the default of dz_max = 999.0). 
+    number_dz = COUNT( dz /= -1.0_wp .AND. dz /= dz_max)
     number_stretch_level_start = COUNT( dz_stretch_level_start /=              &
                                        -9999999.9_wp )

palm/trunk/SOURCE/wind_turbine_model_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-!
+! 
 ! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Bugfix in calculation of alpha_attack
+! 
+! 3069 2018-06-15 07:56:09Z witha
 ! Initialization of some arrays added
 ! 
@@ -2067 +2070 @@
 !
 !--                Correct with collective pitch angle:
-                   alpha_attack = alpha_attack - pitch_add(inot)
+                   alpha_attack(rseg) = alpha_attack(rseg) - pitch_add(inot)
 
 !