Changeset 1918 for palm/trunk/SOURCE/flow_statistics.f90

Timestamp:

May 27, 2016 2:35:57 PM (8 years ago)

Author:

raasch

Message:

bugfixes for calculating run control quantities, bugfix for calculating pressure with fft-method in case of Neumann conditions both at bottom and top, steering of pres modified, ocean mode now uses initial density profile as reference in the buoyancy term

File:

• palm/trunk/SOURCE/flow_statistics.f90 (modified) (5 diffs)

palm/trunk/SOURCE/flow_statistics.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! in case of Wicker-Skamarock scheme, calculate disturbance kinetic energy here,
+! if flow_statistics is called before the first initial time step
 ! 
 ! Former revisions:
@@ -630 +631 @@
 !--    Computation of statistics when ws-scheme is not used. Else these 
 !--    quantities are evaluated in the advection routines.
-       IF ( .NOT. ws_scheme_mom .OR. sr /= 0 )  THEN
+       IF ( .NOT. ws_scheme_mom .OR. sr /= 0 .OR. simulated_time == 0.0_wp )   &
+       THEN
           !$OMP DO
           DO  i = nxl, nxr
@@ -1623 +1625 @@
 
 !
-!-- If required, sum up horizontal averages for subsequent time averaging
-    IF ( do_sum )  THEN
+!-- If required, sum up horizontal averages for subsequent time averaging.
+!-- Do not sum, if flow statistics is called before the first initial time step.
+    IF ( do_sum  .AND.  simulated_time /= 0.0_wp )  THEN
        IF ( average_count_pr == 0 )  hom_sum = 0.0_wp
        hom_sum = hom_sum + hom(:,1,:,:)
@@ -2230 +2233 @@
 !--    Computation of statistics when ws-scheme is not used. Else these
 !--    quantities are evaluated in the advection routines.
-       IF ( .NOT. ws_scheme_mom  .OR.  sr /= 0 )  THEN
+       IF ( .NOT. ws_scheme_mom .OR. sr /= 0 .OR. simulated_time == 0.0_wp )   &
+       THEN
 
           !$OMP DO
@@ -3566 +3570 @@
 !
 !-- If required, sum up horizontal averages for subsequent time averaging
-    IF ( do_sum )  THEN
+!-- Do not sum, if flow statistics is called before the first initial time step.
+    IF ( do_sum  .AND.  simulated_time /= 0.0_wp )  THEN
        IF ( average_count_pr == 0 )  hom_sum = 0.0_wp
        hom_sum = hom_sum + hom(:,1,:,:)