Changeset 3833 for palm/trunk/SOURCE/virtual_measurement_mod.f90

Timestamp:

Mar 28, 2019 3:04:04 PM (5 years ago)

Author:

forkel

Message:

removed USE chem_gasphase_mod from chem_modules, apply USE chem_gasphase for nvar, nspec, cs_mech and spc_names instead

File:

• palm/trunk/SOURCE/virtual_measurement_mod.f90 (modified) (13 diffs)

palm/trunk/SOURCE/virtual_measurement_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! renamed nvar to nmeas, replaced USE chem_modules by USE chem_gasphase_mod and nspec by nvar 
+! 
+! 3766 2019-02-26 16:23:41Z raasch
 ! unused variables removed
 ! 
@@ -76 +79 @@
         ONLY:  q, pt, u, v, w, zu, zw
 
-    USE chem_modules,                                                          &
-        ONLY:  nspec
+    USE chem_gasphase_mod,                                                     &
+        ONLY:  nvar
 
     USE chemistry_model_mod,                                                   &
@@ -132 +135 @@
        INTEGER(iwp) ::  ns_tot = 0      !< total number of observation coordinates, for atmospheric measurements
        INTEGER(iwp) ::  ntraj           !< number of trajectories of a measurement
-       INTEGER(iwp) ::  nvar            !< number of measured variables (atmosphere + soil)
+       INTEGER(iwp) ::  nmeas           !< number of measured variables (atmosphere + soil)
        
        INTEGER(iwp) ::  ns_soil = 0     !< number of observation coordinates on subdomain, for soil measurements
@@ -551 +554 @@
 !--    for a NULL to get the correct character length in order to compare 
 !--    them with the list of allowed variables. 
-       vmea(l)%nvar   = 0
+       vmea(l)%nmeas  = 0
        DO ll = 1, SIZE( measured_variables_file )
           IF ( measured_variables_file(ll)(1:1) /= CHAR(0)  .AND.              &
@@ -569 +572 @@
                 IF ( measured_variables_file(ll)(1:len_char) ==                &
                      TRIM( list_allowed_variables(lll) ) )  THEN
-                   vmea(l)%nvar = vmea(l)%nvar + 1
-                   measured_variables(vmea(l)%nvar) =                          &
+                   vmea(l)%nmeas = vmea(l)%nmeas + 1
+                   measured_variables(vmea(l)%nmeas) =                         &
                                        measured_variables_file(ll)(1:len_char)
                 ENDIF
@@ -578 +581 @@
 !
 !--    Allocate array for the measured variables names for the respective site.
-       ALLOCATE( vmea(l)%measured_vars_name(1:vmea(l)%nvar) )
-
-       DO  ll = 1, vmea(l)%nvar
+       ALLOCATE( vmea(l)%measured_vars_name(1:vmea(l)%nmeas) )
+
+       DO  ll = 1, vmea(l)%nmeas
           vmea(l)%measured_vars_name(ll) = TRIM( measured_variables(ll) )
        ENDDO
@@ -587 +590 @@
 !--    chemistry mechanism.
 !        IF ( air_chemistry )  THEN
-!           DO  ll = 1, vmea(l)%nvar
+!           DO  ll = 1, vmea(l)%nmeas
 !              chem_include = .FALSE.
-!              DO  n = 1, nspec
+!              DO  n = 1, nvar
 !                 IF ( TRIM( vmea(l)%measured_vars_name(ll) ) ==                 &
 !                      TRIM( chem_species(n)%name ) )  chem_include = .TRUE.
@@ -609 +612 @@
 !--    as this would exceed memory requirements, particularly for trajectory 
 !--    measurements. 
-       IF ( vmea(l)%nvar > 0 )  THEN
+       IF ( vmea(l)%nmeas > 0 )  THEN
 !
 !--       For stationary measurements UTM coordinates are just one value and 
@@ -855 +858 @@
 !
 !--       Allocate array to save the sampled values.
-          ALLOCATE( vmea(l)%measured_vars(1:vmea(l)%ns,1:vmea(l)%nvar) )
+          ALLOCATE( vmea(l)%measured_vars(1:vmea(l)%ns,1:vmea(l)%nmeas) )
           
           IF ( vmea(l)%soil_sampling )                                         &
              ALLOCATE( vmea(l)%measured_vars_soil(1:vmea(l)%ns_soil,           &
-                                                  1:vmea(l)%nvar) )
+                                                  1:vmea(l)%nmeas) )
 !
 !--       Initialize with _FillValues
-          vmea(l)%measured_vars(1:vmea(l)%ns,1:vmea(l)%nvar) = vmea(l)%fillout
+          vmea(l)%measured_vars(1:vmea(l)%ns,1:vmea(l)%nmeas) = vmea(l)%fillout
           IF ( vmea(l)%soil_sampling )                                         &
-             vmea(l)%measured_vars_soil(1:vmea(l)%ns_soil,1:vmea(l)%nvar) =    &
+             vmea(l)%measured_vars_soil(1:vmea(l)%ns_soil,1:vmea(l)%nmeas) =   &
                                                                 vmea(l)%fillout
 !
@@ -955 +958 @@
                  WRITE ( 27 )  vmea(l)%ns_tot
                  WRITE ( 27 )  'number of measured variables      '
-                 WRITE ( 27 )  vmea(l)%nvar
+                 WRITE ( 27 )  vmea(l)%nmeas
                  WRITE ( 27 )  'variables                         '
                  WRITE ( 27 )  vmea(l)%measured_vars_name(:)
@@ -1013 +1016 @@
 !--              Skip binary writing if no observation points are defined on PE
                  IF ( vmea(l)%ns < 1  .AND.  vmea(l)%ns_soil < 1)  CYCLE                 
-                 DO  n = 1, vmea(l)%nvar
+                 DO  n = 1, vmea(l)%nmeas
                     WRITE( 27 )  vmea(l)%measured_vars_name(n)
                     IF ( vmea(l)%soil_sampling  .AND.                           &
@@ -1106 +1109 @@
 !
 !--     Loop over all variables measured at this site.  
-        DO  n = 1, vmea(l)%nvar
+        DO  n = 1, vmea(l)%nmeas
         
            SELECT CASE ( TRIM( vmea(l)%measured_vars_name(n) ) )
@@ -1263 +1266 @@
 !--                 Run loop over all chemical species, if the measured 
 !--                 variable matches the interal name, sample the variable.
-                    DO  nn = 1, nspec                    
+                    DO  nn = 1, nvar                    
                        IF ( TRIM( chem_vars(1,ind_chem) ) ==                   &
                             TRIM( chem_species(nn)%name ) )  THEN