Changeset 3452

Timestamp:

Oct 30, 2018 1:13:34 PM (6 years ago)

Author:

schwenkel

Message:

Bugfix for profiles output

Location:

palm/trunk/SOURCE

Files:

• bulk_cloud_model_mod.f90 (modified) (6 diffs)
• check_parameters.f90 (modified) (3 diffs)
• flow_statistics.f90 (modified) (2 diffs)

palm/trunk/SOURCE/bulk_cloud_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for profiles output
+! 
+! 3445 2018-10-29 12:23:02Z schwenkel
 ! Minor bugfix and use of subroutine for supersaturation calculation in case
 ! of cache version
@@ -736 +739 @@
                 CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 )
              ENDIF
-             pr_index = 89
+             pr_index = 123
              dopr_index(var_count) = pr_index
              dopr_unit     = '1/m3'
@@ -763 +766 @@
                                  ' cloud_scheme = saturation_adjust'
                 CALL message( 'check_parameters', 'PA0422', 1, 2, 0, 6, 0 )
-             ENDIF
+             ENDIF 
              pr_index = 76
              dopr_index(var_count) = pr_index
@@ -769 +772 @@
              unit = dopr_unit
              hom(:,2,pr_index,:)  = SPREAD( zu, 2, statistic_regions+1 )
-
           CASE ( 'qc' )
              pr_index = 75
@@ -785 +787 @@
                 CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 )
              ENDIF
-             pr_index = 744
+             pr_index = 74
              dopr_index(var_count) = pr_index
              dopr_unit     = 'kg/kg'
@@ -795 +797 @@
 
        END SELECT
-
 
     END SUBROUTINE bcm_check_data_output_pr

palm/trunk/SOURCE/check_parameters.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for profiles output
+! 
+! 3448 2018-10-29 18:14:31Z kanani
 ! Add biometeorology
 ! 
@@ -2914 +2917 @@
 
           CASE DEFAULT
-
+             unit = 'illegal'
 !
 !--          Check for other modules
-             IF ( unit == 'illegal'  .AND.  bulk_cloud_model  )  THEN
+             IF ( unit == 'illegal' .AND.  bulk_cloud_model )  THEN
                 CALL bcm_check_data_output_pr( data_output_pr(i), i, unit,     &
                                                dopr_unit(i) )
@@ -2937 +2940 @@
              ENDIF
 
-             CALL lsm_check_data_output_pr( data_output_pr(i), i, unit,        &
+             IF ( unit == 'illegal' )  THEN
+                CALL lsm_check_data_output_pr( data_output_pr(i), i, unit,        &
                                             dopr_unit(i) )
-
+             ENDIF
              IF ( unit == 'illegal' )  THEN
                 CALL ocean_check_data_output_pr( data_output_pr(i), i, unit,   &

palm/trunk/SOURCE/flow_statistics.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix for profiles output
+! 
+! 3298 2018-10-02 12:21:11Z kanani
 ! - Minor formatting (kanani)
 ! - Added  .AND. max_pr_cs > 0 before MPI_ALLREDUCE call (forkel)
@@ -1881 +1884 @@
              sums(k,116)           = sums(k,116)           / ngp_2dh_s_inner(k,sr)
              sums(k,118:pr_palm-2) = sums(k,118:pr_palm-2) / ngp_2dh_s_inner(k,sr)
+             sums(k,123)           = sums(k,123) * ngp_2dh_s_inner(k,sr)  / ngp_2dh(sr)
           ENDIF
        ENDDO