Changeset 2011 for palm/trunk/SOURCE/average_3d_data.f90

Timestamp:

Sep 19, 2016 5:29:57 PM (8 years ago)

Author:

kanani

Message:

changes related to steering and formating of urban surface model

File:

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

palm/trunk/SOURCE/average_3d_data.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Flag urban_surface is now defined in module control_parameters,
+! changed prefix for urban surface model output to "usm_",
+! introduced control parameter varnamelength for LEN of trimvar.
 ! 
 ! Former revisions:
@@ -96 +98 @@
 
     USE control_parameters,                                                    &
-        ONLY:  average_count_3d, doav, doav_n
+        ONLY:  average_count_3d, doav, doav_n, urban_surface, varnamelength
 
     USE cpulog,                                                                &
@@ -113 +115 @@
 
     USE urban_surface_mod,                                                     &
-        ONLY:  urban_surface, usm_average_3d_data
+        ONLY:  usm_average_3d_data
 
 
@@ -123 +125 @@
     INTEGER(iwp) ::  k  !< running index
 
-    CHARACTER (LEN=20) ::  trimvar  !< TRIM of output-variable string
+    CHARACTER (LEN=varnamelength) ::  trimvar  !< TRIM of output-variable string
 
 
@@ -140 +142 @@
 !--    surface model (urban_surface_mod.f90), see also SELECT CASE ( trimvar )
        trimvar = TRIM( doav(ii) )
-       IF ( urban_surface  .AND.  trimvar(1:3) == 'us_' )  THEN
+       IF ( urban_surface  .AND.  trimvar(1:4) == 'usm_' )  THEN
           trimvar = 'usm_output'
        ENDIF