Changeset 2071


Ignore:
Timestamp:
Nov 17, 2016 11:22:14 AM (8 years ago)
Author:
maronga
Message:

small bugfix for USM

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/ls_forcing_mod.f90

    r2038 r2071  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! Small bugfix (Resler)
    2323!
    2424! Former revisions:
     
    217217       ENDDO
    218218
    219        shf_surf  = shf_surf  * heatflux_input_conversion(nzb)
    220        qsws_surf = qsws_surf * waterflux_input_conversion(nzb)
    221 
    222219       IF ( time_surf(1) > end_time )  THEN
    223220          WRITE ( message_string, * ) 'No time dependent surface variables in ',&
     
    226223          CALL message( 'ls_forcing', 'PA0371', 0, 0, 0, 6, 0 )
    227224          lsf_surf = .FALSE.
     225       ELSE
     226          shf_surf  = shf_surf  * heatflux_input_conversion(nzb)
     227          qsws_surf = qsws_surf * waterflux_input_conversion(nzb)
    228228       ENDIF
    229229
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r2032 r2071  
    2121! Current revisions:
    2222! ------------------
    23 !
     23! Small bugfix (Resler)
    2424!
    2525! Former revisions:
     
    422422    INTEGER(iwp), PARAMETER                        :: icsurf   = 5         !< Surface skin layer heat capacity (J m−2 K−1 )
    423423    INTEGER(iwp), PARAMETER                        :: ithick   = 6         !< thickness of the surface (wall, roof, land)  ( m )
    424     INTEGER(iwp), PARAMETER                        :: irhoC    = 7         !< volumetric heat capacity rho_ocean*C of the material ( J m−3 K−1 )
     424    INTEGER(iwp), PARAMETER                        :: irhoC    = 7         !< volumetric heat capacity rho*C of the material ( J m−3 K−1 )
    425425    INTEGER(iwp), PARAMETER                        :: ilambdah = 8         !< thermal conductivity λH of the wall (W m−1 K−1 )
    426426    CHARACTER(12), DIMENSION(:), ALLOCATABLE       :: surface_type_names   !< names of wall types (used only for reports)
     
    28892889        IF ( plant_canopy )  THEN
    28902890            pchf_prep(:) = r_d * (hyp(nzub:nzut) / 100000.0_wp)**0.286_wp &
    2891                         / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho_ocean * c_p * Vbox * T)
     2891                        / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho * c_p * Vbox * T)
    28922892        ENDIF
    28932893
     
    30353035                IF ( surf(id, isurfsrc) >= isky )  THEN
    30363036!--                 Diffuse rad from boundary surfaces. See comments for svf above.
    3037                     pcbinsw(ipcgb) = pcbinsw(ipcgb) + svf(1,isvf) * svf(2,isvf) * rad_sw_in_diff(j,i)
     3037                    pcbinsw(ipcgb) = pcbinsw(ipcgb) + csf(1,icsf) * csf(2,icsf) * rad_sw_in_diff(j,i)
    30383038!--                 canopy shading is applied only to shortwave, therefore no absorbtion for lw
    30393039!--                 pcbinlw(ipcgb) = pcbinlw(ipcgb) + svf(1,isvf) * rad_lw_in_diff(j,i)
     
    30473047                    pc_abs_frac = 1._wp - exp(pc_abs_eff * lad_s(k,j,i))
    30483048                    pcbinsw(ipcgb) = pcbinsw(ipcgb) &
    3049                         + rad_sw_in_dir(j, i) * pc_box_area * svf(2,isvf) * pc_abs_frac
     3049                        + rad_sw_in_dir(j, i) * pc_box_area * csf(2,icsf) * pc_abs_frac
    30503050                ENDIF
    30513051            ENDDO
     
    34963496          ENDIF
    34973497#if defined( __parallel )
    3498           CALL MPI_BARRIER( comm2d, ierr )
     3498          CALL MPI_Barrier( comm2d, ierr )
    34993499#endif
    35003500       ENDDO
     
    38663866            ENDIF
    38673867           
    3868 !--         volumetric heat capacity rho_ocean*C of the wall ( J m−3 K−1 )
     3868!--         volumetric heat capacity rho*C of the wall ( J m−3 K−1 )
    38693869            rho_c_wall(:,l) = surface_params(irhoC, ip)
    38703870           
     
    39333933            pt1  = pt(k,j,i)
    39343934
    3935 !--         calculate rho_ocean * cp coefficient at surface layer
     3935!--         calculate rho * cp coefficient at surface layer
    39363936            rho_cp  = cp * hyp(k) / ( r_d * pt1 * exn(k) )
    39373937
     
    42464246          ENDIF
    42474247#if defined( __parallel )
    4248           CALL MPI_BARRIER( comm2d, ierr )
     4248          CALL MPI_Barrier( comm2d, ierr )
    42494249#endif
    42504250       ENDDO
Note: See TracChangeset for help on using the changeset viewer.