Changeset 3174 for palm/trunk

Timestamp:

Jul 26, 2018 1:46:50 PM (6 years ago)

Author:

Giersch

Message:

Bugfix in reading NAMELIST user_parameters, bugfix in wind turbine model related to the check of vertical stretching

Location:

palm/trunk/SOURCE

Files:

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

palm/trunk/SOURCE/user_parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! userpar in READ statement has been changed to user_parameters 
+! 
+! 3049 2018-05-29 13:52:36Z Giersch
 ! Error messages revised
 ! 
@@ -137 +140 @@
 !
 !-- Read user-defined namelist
-    READ ( 11, userpar )
+    READ ( 11, user_parameters )
 
     user_defined_namelist_found = .TRUE.

palm/trunk/SOURCE/wind_turbine_model_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! Check for vertical stretching has been revised. 
+! 
+! 3139 2018-07-17 11:30:10Z Giersch
 ! Bugfix in calculation of alpha_attack
 ! 
@@ -1016 +1019 @@
 !--    the area where the wtm is active. ABS (...) is required because the 
 !--    default value of dz_stretch_level_start is -9999999.9_wp (negative). 
-       IF ( ABS( dz_stretch_level_start(1) ) <= MAXVAL(rcz) + MAXVAL(rr) +     &
-       eps_min)  THEN
+       IF ( ABS( dz_stretch_level_start(1) ) <= MAXVAL(rcz(1:nturbines)) +     &
+                                                MAXVAL(rr(1:nturbines)) +      &
+                                                eps_min)  THEN
           WRITE( message_string, * ) 'The lowest level where vertical ',       &
                                      'stretching is applied &have to be ',     &
-                                     'greater than ', MAXVAL(rcz) +            &
-                                      MAXVAL(rr) + eps_min
+                                     'greater than ',MAXVAL(rcz(1:nturbines)) +&
+                                      MAXVAL(rr(1:nturbines)) + eps_min
           CALL message( 'wtm_init', 'PA0484', 1, 2, 0, 6, 0 )
        ENDIF