Changeset 2071 for palm/trunk

Timestamp:

Nov 17, 2016 11:22:14 AM (8 years ago)

Author:

maronga

Message:

small bugfix for USM

Location:

palm/trunk/SOURCE

Files:

• ls_forcing_mod.f90 (modified) (3 diffs)
• urban_surface_mod.f90 (modified) (9 diffs)

palm/trunk/SOURCE/ls_forcing_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Small bugfix (Resler)
 ! 
 ! Former revisions:
@@ -217 +217 @@
        ENDDO
 
-       shf_surf  = shf_surf  * heatflux_input_conversion(nzb)
-       qsws_surf = qsws_surf * waterflux_input_conversion(nzb)
-
        IF ( time_surf(1) > end_time )  THEN
           WRITE ( message_string, * ) 'No time dependent surface variables in ',&
@@ -226 +223 @@
           CALL message( 'ls_forcing', 'PA0371', 0, 0, 0, 6, 0 )
           lsf_surf = .FALSE.
+       ELSE
+          shf_surf  = shf_surf  * heatflux_input_conversion(nzb)
+          qsws_surf = qsws_surf * waterflux_input_conversion(nzb)
        ENDIF
 

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! 
+! Small bugfix (Resler)
 ! 
 ! Former revisions:
@@ -422 +422 @@
     INTEGER(iwp), PARAMETER                        :: icsurf   = 5         !< Surface skin layer heat capacity (J m−2 K−1 )
     INTEGER(iwp), PARAMETER                        :: ithick   = 6         !< thickness of the surface (wall, roof, land)  ( m )
-    INTEGER(iwp), PARAMETER                        :: irhoC    = 7         !< volumetric heat capacity rho_ocean*C of the material ( J m−3 K−1 )
+    INTEGER(iwp), PARAMETER                        :: irhoC    = 7         !< volumetric heat capacity rho*C of the material ( J m−3 K−1 )
     INTEGER(iwp), PARAMETER                        :: ilambdah = 8         !< thermal conductivity λH of the wall (W m−1 K−1 )
     CHARACTER(12), DIMENSION(:), ALLOCATABLE       :: surface_type_names   !< names of wall types (used only for reports)
@@ -2889 +2889 @@
         IF ( plant_canopy )  THEN
             pchf_prep(:) = r_d * (hyp(nzub:nzut) / 100000.0_wp)**0.286_wp &
-                        / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho_ocean * c_p * Vbox * T)
+                        / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho * c_p * Vbox * T)
         ENDIF
 
@@ -3035 +3035 @@
                 IF ( surf(id, isurfsrc) >= isky )  THEN
 !--                 Diffuse rad from boundary surfaces. See comments for svf above.
-                    pcbinsw(ipcgb) = pcbinsw(ipcgb) + svf(1,isvf) * svf(2,isvf) * rad_sw_in_diff(j,i)
+                    pcbinsw(ipcgb) = pcbinsw(ipcgb) + csf(1,icsf) * csf(2,icsf) * rad_sw_in_diff(j,i)
 !--                 canopy shading is applied only to shortwave, therefore no absorbtion for lw
 !--                 pcbinlw(ipcgb) = pcbinlw(ipcgb) + svf(1,isvf) * rad_lw_in_diff(j,i)
@@ -3047 +3047 @@
                     pc_abs_frac = 1._wp - exp(pc_abs_eff * lad_s(k,j,i))
                     pcbinsw(ipcgb) = pcbinsw(ipcgb) &
-                        + rad_sw_in_dir(j, i) * pc_box_area * svf(2,isvf) * pc_abs_frac
+                        + rad_sw_in_dir(j, i) * pc_box_area * csf(2,icsf) * pc_abs_frac
                 ENDIF
             ENDDO
@@ -3496 +3496 @@
           ENDIF
 #if defined( __parallel )
-          CALL MPI_BARRIER( comm2d, ierr )
+          CALL MPI_Barrier( comm2d, ierr )
 #endif
        ENDDO
@@ -3866 +3866 @@
             ENDIF
             
-!--         volumetric heat capacity rho_ocean*C of the wall ( J m−3 K−1 )
+!--         volumetric heat capacity rho*C of the wall ( J m−3 K−1 )
             rho_c_wall(:,l) = surface_params(irhoC, ip)
             
@@ -3933 +3933 @@
             pt1  = pt(k,j,i)
 
-!--         calculate rho_ocean * cp coefficient at surface layer
+!--         calculate rho * cp coefficient at surface layer
             rho_cp  = cp * hyp(k) / ( r_d * pt1 * exn(k) )
 
@@ -4246 +4246 @@
           ENDIF
 #if defined( __parallel )
-          CALL MPI_BARRIER( comm2d, ierr )
+          CALL MPI_Barrier( comm2d, ierr )
 #endif
        ENDDO