Changeset 2042


Ignore:
Timestamp:
Nov 2, 2016 1:47:31 PM (8 years ago)
Author:
suehring
Message:

Bugfix, read and write restart data for wall fluxes; additional checks for wall fluxes

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

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

    r2041 r2042  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! Additional checks for wall_heatflux, wall_humidityflux and wall_scalarflux.
     23! Bugfix, check for constant_scalarflux.
    2324!
    2425! Former revisions:
     
    17351736    ENDIF
    17361737
     1738    IF ( ANY( wall_heatflux /= 0.0_wp )  .AND.                        &
     1739         surface_heatflux == 9999999.9_wp )  THEN
     1740       message_string = 'wall_heatflux additionally requires ' //     &
     1741                        'setting of surface_heatflux'
     1742       CALL message( 'check_parameters', 'PA0443', 1, 2, 0, 6, 0 )
     1743    ENDIF
     1744
    17371745!
    17381746!   This IF clause needs revision, got too complex!!
     
    18541862!-- Set boundary conditions for total water content
    18551863    IF ( humidity )  THEN
     1864
     1865       IF ( ANY( wall_humidityflux /= 0.0_wp )  .AND.                        &
     1866            surface_waterflux == 9999999.9_wp )  THEN
     1867          message_string = 'wall_humidityflux additionally requires ' //     &
     1868                           'setting of surface_waterflux'
     1869          CALL message( 'check_parameters', 'PA0444', 1, 2, 0, 6, 0 )
     1870       ENDIF
     1871
    18561872       CALL set_bc_scalars( 'q', bc_q_b, bc_q_t, ibc_q_b, ibc_q_t,           &
    18571873                            'PA0071', 'PA0072' )
     
    18831899   
    18841900    IF ( passive_scalar )  THEN
     1901
     1902       IF ( ANY( wall_scalarflux /= 0.0_wp )  .AND.                        &
     1903            surface_scalarflux == 9999999.9_wp )  THEN
     1904          message_string = 'wall_scalarflux additionally requires ' //     &
     1905                           'setting of surface_scalarflux'
     1906          CALL message( 'check_parameters', 'PA0445', 1, 2, 0, 6, 0 )
     1907       ENDIF
     1908
     1909       IF ( surface_scalarflux == 9999999.9_wp )  constant_scalarflux = .FALSE.
     1910
    18851911       CALL set_bc_scalars( 's', bc_s_b, bc_s_t, ibc_s_b, ibc_s_t,             &
    18861912                            'PA0071', 'PA0072' )
  • palm/trunk/SOURCE/read_var_list.f90

    r2001 r2042  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! Bugfix, read restart data for wall_heatflux, wall_qflux and wall_sflux
    2323!
    2424! Former revisions:
     
    764764          CASE ( 'subs_vertical_gradient_level_i' )
    765765             READ ( 13 )  subs_vertical_gradient_level_i
     766          CASE ( 'wall_heatflux' )
     767             READ ( 13 )  wall_heatflux
     768          CASE ( 'wall_qflux' )
     769             READ ( 13 )  wall_qflux
     770          CASE ( 'wall_sflux' )
     771             READ ( 13 )  wall_sflux
    766772          CASE ( 'w_max' )
    767773             READ ( 13 )  w_max
  • palm/trunk/SOURCE/write_var_list.f90

    r2001 r2042  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! Bugfix, write restart data for wall_heatflux, wall_qflux and wall_sflux
    2323!
    2424! Former revisions:
     
    675675    WRITE ( 14 )  'subs_vertical_gradient_level_i'
    676676    WRITE ( 14 )  subs_vertical_gradient_level_i
     677    WRITE ( 14 )  'wall_heatflux                 '
     678    WRITE ( 14 )  wall_heatflux
     679    WRITE ( 14 )  'wall_qflux                    '
     680    WRITE ( 14 )  wall_qflux
     681    WRITE ( 14 )  'wall_sflux                    '
     682    WRITE ( 14 )  wall_sflux
    677683    WRITE ( 14 )  'w_max                         '
    678684    WRITE ( 14 )  w_max
Note: See TracChangeset for help on using the changeset viewer.