Ignore:
Timestamp:
Aug 9, 2012 8:28:32 AM (12 years ago)
Author:
fricke
Message:

merge fricke branch back into trunk

Location:
palm/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

  • palm/trunk/SOURCE

  • palm/trunk/SOURCE/read_var_list.f90

    r941 r978  
    44! Current revisions:
    55! ------------------
    6 !
     6! -km_damp_max, outflow_damping_width
     7! +pt_damping_factor, pt_damping_width
     8! +z0h_factor
    79!
    810! Former revisions:
     
    385387          CASE ( 'km_constant' )
    386388             READ ( 13 )  km_constant
    387           CASE ( 'km_damp_max' )
    388              READ ( 13 )  km_damp_max
    389389          CASE ( 'lad' )
    390390             READ ( 13 )  lad
     
    446446          CASE ( 'omega_sor' )
    447447             READ ( 13 )  omega_sor
    448           CASE ( 'outflow_damping_width' )
    449              READ ( 13 )  outflow_damping_width
    450448          CASE ( 'output_for_t0' )
    451449             READ (13)    output_for_t0
     
    476474          CASE ( 'psolver' )
    477475             READ ( 13 )  psolver
     476          CASE ( 'pt_damping_factor' )
     477             READ ( 13 )  pt_damping_factor
     478          CASE ( 'pt_damping_width' )
     479             READ ( 13 )  pt_damping_width
    478480          CASE ( 'pt_init' )
    479481             READ ( 13 )  pt_init
     
    684686          CASE ( 'w_max_ijk' )
    685687             READ ( 13 )  w_max_ijk
     688          CASE ( 'z0h_factor' )
     689             READ ( 13 )  z0h_factor
    686690
    687691          CASE DEFAULT
Note: See TracChangeset for help on using the changeset viewer.