Changeset 2513 for palm/trunk

Timestamp:

Oct 4, 2017 9:24:39 AM (7 years ago)

Author:

kanani

Message:

Bugfixes related to profile output of passive scalar

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (7 diffs)
• init_3d_model.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for some dopr(_initial)_index values and units connected to 
+! passive-scalar output
+! 
+! 2508 2017-10-02 08:57:09Z suehring
 ! Bugfix, change default value of vertical_gradient level in order to consider 
 ! also ocean runs 
@@ -2462 +2466 @@
                 CALL message( 'check_parameters', 'PA0093', 1, 2, 0, 6, 0 )
              ELSE
-                dopr_index(i) = 117
+                dopr_index(i) = 115
                 dopr_unit(i)  = 'kg/m3'
-                hom(:,2,117,:) = SPREAD( zu, 2, statistic_regions+1 )
+                hom(:,2,115,:) = SPREAD( zu, 2, statistic_regions+1 )
                 IF ( data_output_pr(i)(1:1) == '#' )  THEN
-                   dopr_initial_index(i) = 117
-                   hom(:,2,117,:)        = SPREAD( zu, 2, statistic_regions+1 )
-                   hom(nzb,2,117,:)      = 0.0_wp    ! because zu(nzb) is negative
+                   dopr_initial_index(i) = 121
+                   hom(:,2,121,:)        = SPREAD( zu, 2, statistic_regions+1 )
+                   hom(nzb,2,121,:)      = 0.0_wp    ! because zu(nzb) is negative
                    data_output_pr(i)     = data_output_pr(i)(2:)
                 ENDIF
@@ -2583 +2587 @@
                 CALL message( 'check_parameters', 'PA0093', 1, 2, 0, 6, 0 )
              ELSE
-                dopr_index(i) = 119
+                dopr_index(i) = 117
                 dopr_unit(i)  = 'kg/m3 m/s'
-                hom(:,2,119,:) = SPREAD( zw, 2, statistic_regions+1 )
+                hom(:,2,117,:) = SPREAD( zw, 2, statistic_regions+1 )
              ENDIF
 
@@ -2595 +2599 @@
                 CALL message( 'check_parameters', 'PA0093', 1, 2, 0, 6, 0 )
              ELSE
-                dopr_index(i) = 116
+                dopr_index(i) = 114
                 dopr_unit(i)  = 'kg/m3 m/s'
-                hom(:,2,116,:) = SPREAD( zw, 2, statistic_regions+1 )
+                hom(:,2,114,:) = SPREAD( zw, 2, statistic_regions+1 )
              ENDIF
 
@@ -2607 +2611 @@
                 CALL message( 'check_parameters', 'PA0093', 1, 2, 0, 6, 0 )
              ELSE
-                dopr_index(i) = 120
+                dopr_index(i) = 118
                 dopr_unit(i)  = 'kg/m3 m/s'
-                hom(:,2,120,:) = SPREAD( zw, 2, statistic_regions+1 )
+                hom(:,2,118,:) = SPREAD( zw, 2, statistic_regions+1 )
              ENDIF
 
@@ -2935 +2939 @@
                 CALL message( 'check_parameters', 'PA0185', 1, 2, 0, 6, 0 )
              ELSE
-                dopr_index(i) = 118
-                dopr_unit(i)  = 'kg2/kg2'
-                hom(:,2,118,:) = SPREAD( zu, 2, statistic_regions+1 )
+                dopr_index(i) = 116
+                dopr_unit(i)  = 'kg2/m6'
+                hom(:,2,116,:) = SPREAD( zu, 2, statistic_regions+1 )
              ENDIF
 
@@ -3162 +3166 @@
                 CALL message( 'check_parameters', 'PA0110', 1, 2, 0, 6, 0 )
              ENDIF
-             unit = 'conc'
+             unit = 'kg/m3'
 
           CASE ( 'sa' )

palm/trunk/SOURCE/init_3d_model.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in storing initial scalar profile (wrong index)
+! 
+! 2350 2017-08-15 11:48:26Z kanani
 ! Bugfix in nopointer version
 ! 
@@ -1301 +1304 @@
 !
 !--       Store initial scalar profile
-          hom(:,1,115,:) = SPREAD(  s(:,nys,nxl), 2, statistic_regions+1 )
+          hom(:,1,121,:) = SPREAD(  s(:,nys,nxl), 2, statistic_regions+1 )
        ENDIF