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

Timestamp:

Aug 24, 2016 3:47:17 PM (8 years ago)

Author:

kanani

Message:

changes in the course of urban surface model implementation

File:

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

palm/trunk/SOURCE/average_3d_data.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added support for new urban surface model (temporary modifications of 
+! SELECT CASE ( ) necessary, see variable trimvar),
+! added comments in variable declaration section
 ! 
 ! Former revisions:
@@ -107 +109 @@
         ONLY:  radiation, radiation_3d_data_averaging
 
+    USE urban_surface_mod,                                                     &
+        ONLY:  urban_surface, usm_average_3d_data
+
 
     IMPLICIT NONE
 
-    INTEGER(iwp) ::  i  !<
-    INTEGER(iwp) ::  ii !<
-    INTEGER(iwp) ::  j  !<
-    INTEGER(iwp) ::  k  !<
+    INTEGER(iwp) ::  i  !< running index
+    INTEGER(iwp) ::  ii !< running index
+    INTEGER(iwp) ::  j  !< running index
+    INTEGER(iwp) ::  k  !< running index
+
+    CHARACTER (LEN=20) ::  trimvar  !< TRIM of output-variable string
 
 
@@ -127 +134 @@
 
 !
+!--    Temporary solution to account for data output within the new urban 
+!--    surface model (urban_surface_mod.f90), see also SELECT CASE ( trimvar )
+       trimvar = TRIM( doav(ii) )
+       IF ( urban_surface  .AND.  trimvar(1:3) == 'us_' )  THEN
+          trimvar = 'usm_output'
+       ENDIF
+
+!
 !--    Store the array chosen on the temporary array.
-       SELECT CASE ( TRIM( doav(ii) ) )
+       SELECT CASE ( trimvar )
 
           CASE ( 'e' )
@@ -399 +414 @@
                 ENDDO
              ENDDO
+!             
+!--       Block of urban surface model outputs   
+          CASE ( 'usm_output' )
+             CALL usm_average_3d_data( 'average', doav(ii) )
 
           CASE DEFAULT