Changeset 4601 for palm/trunk/SOURCE/chemistry_model_mod.f90

Timestamp:

Jul 14, 2020 12:06:09 PM (4 years ago)

Author:

suehring

Message:

Chemistry: Bugfix in variable name separation in profile-output initialization; Bugfix in counting the number of chemistry profiles; Surface-data output: Minor simplification in name creation for IO variables in restart files; init_grid: minor formatting adjustments

File:

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

palm/trunk/SOURCE/chemistry_model_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
-! 
+!
+!
 ! Former revisions:
 ! -----------------
 ! $Id$
+! - Bugfix in variable name separation in profile-output initialization
+! - Bugfix in counting the number of chemistry profiles
+! 
+! 4581 2020-06-29 08:49:58Z suehring
 ! Enable output of resolved-scale vertical fluxes of chemical species.
 ! 
@@ -1109 +1113 @@
                 cs_pr_count_sp                 = cs_pr_count_sp + 1
                 cs_pr_index_sp(cs_pr_count_sp) = lsp
-                dopr_index(var_count)          = pr_palm + cs_pr_count_sp + cs_pr_count_fl_sgs + cs_pr_count_fl_res
+                dopr_index(var_count)          = pr_palm + cs_pr_count_sp +                        &
+                                                 cs_pr_count_fl_sgs + cs_pr_count_fl_res
                 dopr_unit                      = 'ppm'
                 IF ( spec_name(1:2) == 'PM')  THEN
                    dopr_unit = 'kg m-3'
                 ENDIF
-                hom(:,2, dopr_index(var_count),:) = SPREAD( zu, 2, statistic_regions+1 )
+                hom(:,2,dopr_index(var_count),:) = SPREAD( zu, 2, statistic_regions+1 )
                 unit                              = dopr_unit
 
@@ -1125 +1130 @@
           IF ( TRIM( variable(1:5) ) == 'kc_w"' )  THEN
              DO  lsp = 1, nspec
-                index_start = INDEX( TRIM( variable ), TRIM( chem_species(lsp)%name ) )
                 index_end   = LEN( TRIM( variable ) ) - 1
-                IF ( index_start /= 0 )  THEN
-                   spec_name = TRIM( variable(index_start:index_end) )
-                   IF ( TRIM( spec_name ) == TRIM( chem_species(lsp)%name ) )  THEN
-                      cs_pr_count_fl_sgs                     = cs_pr_count_fl_sgs + 1
-                      cs_pr_index_fl_sgs(cs_pr_count_fl_sgs) = lsp
-                      dopr_index(var_count)                  = pr_palm + cs_pr_count_sp +          &
-                                                               cs_pr_count_fl_sgs +                &
-                                                               cs_pr_count_fl_res
-                      dopr_unit                              = 'm ppm s-1'
-                      IF ( spec_name(1:2) == 'PM')  THEN
-                         dopr_unit = 'kg m-2 s-1'
-                      ENDIF
-                      hom(:,2, dopr_index(var_count),:)    = SPREAD( zu, 2, statistic_regions+1 )
-                      unit                                 = dopr_unit
-
-                      hom_index_fl_sgs(cs_pr_count_fl_sgs) = dopr_index(var_count)
+                index_start = 6
+                spec_name = TRIM( variable(index_start:index_end) )
+                IF ( TRIM( spec_name ) == TRIM( chem_species(lsp)%name ) )  THEN
+                   cs_pr_count_fl_sgs                     = cs_pr_count_fl_sgs + 1
+                   cs_pr_index_fl_sgs(cs_pr_count_fl_sgs) = lsp
+                   dopr_index(var_count)                  = pr_palm + cs_pr_count_sp +          &
+                                                            cs_pr_count_fl_sgs +                &
+                                                            cs_pr_count_fl_res
+                   dopr_unit                              = 'm ppm s-1'
+                   IF ( spec_name(1:2) == 'PM')  THEN
+                      dopr_unit = 'kg m-2 s-1'
                    ENDIF
+                   hom(:,2,dopr_index(var_count),:)     = SPREAD( zu, 2, statistic_regions+1 )
+                   unit                                 = dopr_unit
+
+                   hom_index_fl_sgs(cs_pr_count_fl_sgs) = dopr_index(var_count)
                 ENDIF
              ENDDO
@@ -1152 +1155 @@
              spec_name = TRIM( variable(6:) )
              DO  lsp = 1, nspec
-                index_start = INDEX( TRIM( variable ), TRIM( chem_species(lsp)%name ) )
+                index_start = 6
                 index_end   = LEN( TRIM( variable ) ) - 1
-                IF ( index_start /= 0 )  THEN
-                   spec_name = TRIM( variable(index_start:index_end) )
-                   IF ( TRIM( spec_name ) == TRIM( chem_species(lsp)%name ) )  THEN
-                      cs_pr_count_fl_res                     = cs_pr_count_fl_res + 1
-                      cs_pr_index_fl_res(cs_pr_count_fl_res) = lsp
-                      dopr_index(var_count)                  = pr_palm + cs_pr_count_sp +          &
-                                                               cs_pr_count_fl_sgs +                &
-                                                               cs_pr_count_fl_res
-                      dopr_unit                              = 'm ppm s-1'
-                      IF ( spec_name(1:2) == 'PM')  THEN
-                         dopr_unit = 'kg m-2 s-1'
-                      ENDIF
-                      hom(:,2, dopr_index(var_count),:)    = SPREAD( zu, 2, statistic_regions+1 )
-                      unit                                 = dopr_unit
-
-                      hom_index_fl_res(cs_pr_count_fl_res) = dopr_index(var_count)
+                spec_name = TRIM( variable(index_start:index_end) )
+                IF ( TRIM( spec_name ) == TRIM( chem_species(lsp)%name ) )  THEN
+                   cs_pr_count_fl_res                     = cs_pr_count_fl_res + 1
+                   cs_pr_index_fl_res(cs_pr_count_fl_res) = lsp
+                   dopr_index(var_count)                  = pr_palm + cs_pr_count_sp +             &
+                                                            cs_pr_count_fl_sgs +                   &
+                                                            cs_pr_count_fl_res
+                   dopr_unit                              = 'm ppm s-1'
+                   IF ( spec_name(1:2) == 'PM')  THEN
+                      dopr_unit = 'kg m-2 s-1'
                    ENDIF
+                   hom(:,2, dopr_index(var_count),:)    = SPREAD( zu, 2, statistic_regions+1 )
+                   unit                                 = dopr_unit
+
+                   hom_index_fl_res(cs_pr_count_fl_res) = dopr_index(var_count)
                 ENDIF
              ENDDO
@@ -2710 +2711 @@
     i = 1
 
-    DO  WHILE ( data_output_pr(i)  /= ' '  .AND.  i <= 100 )
-
+    DO  WHILE ( data_output_pr(i)  /= ' '  .AND.  i <= SIZE( data_output_pr ) )
        IF ( TRIM( data_output_pr(i)(1:3) ) == 'kc_' )  THEN
           max_pr_cs_tmp = max_pr_cs_tmp+1