Ignore:
Timestamp:
May 6, 2020 11:39:49 AM (4 years ago)
Author:
schwenkel
Message:

add error number

File:
1 edited

Legend:

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

    r4517 r4521  
    2626! -----------------
    2727! $Id$
     28! Rename variable
     29!
     30! 4517 2020-05-03 14:29:30Z raasch
    2831! added restart with MPI-IO for reading local arrays
    2932!
     
    479482    LOGICAL ::  surf_microphysics_morrison = .FALSE.   !< use 2-moment Morrison (add. prog. eq. for nc and qc)
    480483    LOGICAL ::  surf_microphysics_seifert = .FALSE.    !< use 2-moment Seifert and Beheng scheme
    481     LOGICAL ::  surf_microphysics_ice_extension = .FALSE. !< use 2-moment Seifert and Beheng scheme
     484    LOGICAL ::  surf_microphysics_ice_phase = .FALSE. !< use 2-moment Seifert and Beheng scheme
    482485
    483486
     
    535538           surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v, surf_usm_h, surf_usm_v, surf_type,      &
    536539           vertical_surfaces_exist, surf_bulk_cloud_model, surf_microphysics_morrison,             &
    537            surf_microphysics_seifert, surf_microphysics_ice_extension
     540           surf_microphysics_seifert, surf_microphysics_ice_phase
    538541!
    539542!-- Public subroutines and functions
     
    13151318!
    13161319!--
    1317        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     1320       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    13181321          DEALLOCATE ( surfaces%qis )
    13191322          DEALLOCATE ( surfaces%nis )
     
    14521455!
    14531456!--
    1454        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     1457       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    14551458          ALLOCATE ( surfaces%qis(1:surfaces%ns)   )
    14561459          ALLOCATE ( surfaces%nis(1:surfaces%ns)   )
     
    16111614!
    16121615!--
    1613        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     1616       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    16141617          DEALLOCATE ( surfaces%qisws )
    16151618          DEALLOCATE ( surfaces%nisws )
     
    16901693!
    16911694!--
    1692        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     1695       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    16931696          ALLOCATE ( surfaces%qisws(1:surfaces%ns) )
    16941697          ALLOCATE ( surfaces%nisws(1:surfaces%ns) )
     
    18751878       ENDIF
    18761879
    1877        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     1880       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    18781881          DEALLOCATE ( surfaces%qis )
    18791882          DEALLOCATE ( surfaces%nis )
     
    20082011       ENDIF
    20092012
    2010        IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     2013       IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    20112014          ALLOCATE ( surfaces%qis(1:surfaces%ns)   )
    20122015          ALLOCATE ( surfaces%nis(1:surfaces%ns)   )
     
    26572660                ENDIF
    26582661
    2659                 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     2662                IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    26602663                   surf%qis(num_h) = 0.0_wp
    26612664                   surf%nis(num_h) = 0.0_wp
     
    28382841                   surf%qrsws(num_h) = 0.0_wp
    28392842                ENDIF
    2840                 IF ( surf_bulk_cloud_model  .AND.  surf_microphysics_ice_extension ) THEN
     2843                IF ( surf_bulk_cloud_model  .AND.  surf_microphysics_ice_phase ) THEN
    28412844                   surf%nisws(num_h) = 0.0_wp
    28422845                   surf%qisws(num_h) = 0.0_wp
     
    29822985                   surf%nrsws(num_v) = 0.0_wp
    29832986                ENDIF
    2984                 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_extension)  THEN
     2987                IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase)  THEN
    29852988                   surf%qis(num_v) = 0.0_wp
    29862989                   surf%nis(num_v) = 0.0_wp
Note: See TracChangeset for help on using the changeset viewer.