Changeset 1652

Timestamp:

Sep 17, 2015 8:12:24 AM (9 years ago)

Author:

raasch

Message:

bugfix in calculation of vertical profile of energy production by turbulent transport of TKE
bugfix for output of configuration settings (mbuild)
output of login init command (mbuild)

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (3 diffs)
• SOURCE/flow_statistics.f90 (modified) (3 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# bug in terminal output of configuration settings removed,
+# output of login init commands
 # 
 # Former revisions:
@@ -995 +996 @@
     then
        column2=$(echo "$remote_ud" | cut -c1-50 )
-       printf "| $column1$column2 | \n"
        printf "| %-20s%-50s | \n" "utility directory:" "$column2"
        line=$(echo "$remote_ud" | cut -c51-)
@@ -1047 +1047 @@
        line=$(echo "$line" | cut -c51-)
     done
+    if [[ $init_cmds != "" ]]
+    then
+       column2=$(echo $init_cmds | cut -c1-50 )
+       printf "| %-20s%-50s | \n" "login init command:" "$column2"
+       line=$(echo "$init_cmds" | cut -c51-)
+       while [[ "$line" != "" ]]
+       do
+          column1=""
+          column2=$(echo $line | cut -c1-50 )
+          printf "| %-20s%-50s | \n" "$column1" "$column2"
+          line=$(echo "$line" | cut -c51-)
+       done
+    fi
     if [[ $modules != "" ]]
     then

palm/trunk/SOURCE/flow_statistics.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! bugfix in calculation of energy production by turbulent transport of TKE
 ! 
 ! Former revisions:
@@ -993 +993 @@
 
                    sums_ll(k,1) = sums_ll(k,1) + 0.5_wp * w(k,j,i) * (         &
-                  ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1)    &
-                            - 0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) )     &
-                              ) )**2                                           &
-                + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i)    &
-                            - 0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) )     &
-                              ) )**2                                           &
+                  ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) )  &
+                            - 0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) )**2&
+                + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) )  &
+                            - 0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) )**2&                                           &
                 + w(k,j,i)**2                                        )
 
@@ -2867 +2865 @@
 
                    sums_ll(k,1) = sums_ll(k,1) + 0.5_wp * w(k,j,i) * (         &
-                  ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1)    &
-                              - 0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) )   &
-                              ) )**2                                           &
-                + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i)    &
-                              - 0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) )   &
-                              ) )**2                                           &
+                  ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) )  &
+                            - 0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) )**2&                                           &
+                + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) )  &
+                            - 0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) )**2&                                          &
                 + w(k,j,i)**2                                        )