Changeset 1652
 Timestamp:
 Sep 17, 2015 8:12:24 AM (9 years ago)
 Location:
 palm/trunk
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

palm/trunk/SCRIPTS/mbuild
r1649 r1652 22 22 # Current revisions: 23 23 #  24 # 24 # bug in terminal output of configuration settings removed, 25 # output of login init commands 25 26 # 26 27 # Former revisions: … … 995 996 then 996 997 column2=$(echo "$remote_ud"  cut c150 ) 997 printf " $column1$column2  \n"998 998 printf " %20s%50s  \n" "utility directory:" "$column2" 999 999 line=$(echo "$remote_ud"  cut c51) … … 1047 1047 line=$(echo "$line"  cut c51) 1048 1048 done 1049 if [[ $init_cmds != "" ]] 1050 then 1051 column2=$(echo $init_cmds  cut c150 ) 1052 printf " %20s%50s  \n" "login init command:" "$column2" 1053 line=$(echo "$init_cmds"  cut c51) 1054 while [[ "$line" != "" ]] 1055 do 1056 column1="" 1057 column2=$(echo $line  cut c150 ) 1058 printf " %20s%50s  \n" "$column1" "$column2" 1059 line=$(echo "$line"  cut c51) 1060 done 1061 fi 1049 1062 if [[ $modules != "" ]] 1050 1063 then 
palm/trunk/SOURCE/flow_statistics.f90
r1594 r1652 21 21 ! Current revisions: 22 22 !  23 ! 23 ! bugfix in calculation of energy production by turbulent transport of TKE 24 24 ! 25 25 ! Former revisions: … … 993 993 994 994 sums_ll(k,1) = sums_ll(k,1) + 0.5_wp * w(k,j,i) * ( & 995 ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) & 996  0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) & 997 ) )**2 & 998 + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) & 999  0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) & 1000 ) )**2 & 995 ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) ) & 996  0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) )**2& 997 + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) ) & 998  0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) )**2& & 1001 999 + w(k,j,i)**2 ) 1002 1000 … … 2867 2865 2868 2866 sums_ll(k,1) = sums_ll(k,1) + 0.5_wp * w(k,j,i) * ( & 2869 ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) & 2870  0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) & 2871 ) )**2 & 2872 + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) & 2873  0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) & 2874 ) )**2 & 2867 ( 0.25_wp * ( u(k,j,i)+u(k+1,j,i)+u(k,j,i+1)+u(k+1,j,i+1) ) & 2868  0.5_wp * ( hom(k,1,1,sr) + hom(k+1,1,1,sr) ) )**2& & 2869 + ( 0.25_wp * ( v(k,j,i)+v(k+1,j,i)+v(k,j+1,i)+v(k+1,j+1,i) ) & 2870  0.5_wp * ( hom(k,1,2,sr) + hom(k+1,1,2,sr) ) )**2& & 2875 2871 + w(k,j,i)**2 ) 2876 2872
Note: See TracChangeset
for help on using the changeset viewer.