Changeset 3355 for palm


Ignore:
Timestamp:
Oct 16, 2018 2:03:34 PM (6 years ago)
Author:
knoop
Message:

removed calc_radiation.f90 and related cloud_top_radiation namelist parameter (functionality replaced by radiation model)

Location:
palm/trunk/SOURCE
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/Makefile

    r3347 r3355  
    488488        buoyancy.f90 \
    489489        calc_mean_profile.f90 \
    490         calc_radiation.f90 \
    491490        check_for_restart.f90 \
    492491        check_open.f90 \
     
    765764        mod_kinds.o \
    766765        modules.o
    767 calc_radiation.o: \
    768         basic_constants_and_equations_mod.o \
    769         mod_kinds.o \
    770         modules.o
    771766check_for_restart.o: \
    772767        mod_kinds.o \
     
    14511446        bulk_cloud_model_mod.o \
    14521447        buoyancy.o \
    1453         calc_radiation.o \
    14541448        chemistry_model_mod.o \
    14551449        chem_modules.o \
  • palm/trunk/SOURCE/header.f90

    r3347 r3355  
    238238! 1551 2015-03-03 14:18:16Z maronga
    239239! Added informal output for land surface model and radiation model. Removed typo.
    240 !
    241 ! 1496 2014-12-02 17:25:50Z maronga
    242 ! Renamed: "radiation -> "cloud_top_radiation"
    243240!
    244241! 1484 2014-10-21 10:53:05Z kanani
     
    19401937       WRITE ( io, 431 )
    19411938    ENDIF
    1942     IF ( cloud_top_radiation )  WRITE ( io, 132 )
    19431939    IF ( humidity  .AND.  cloud_droplets )  THEN
    19441940       WRITE ( io, 433 )
     
    21152111131 FORMAT (' --> No pt-equation solved. Neutral stratification with pt = ', &
    21162112                  F6.2, ' K assumed')
    2117 132 FORMAT ('     Parameterization of long-wave radiation processes via'/ &
    2118             '     effective emissivity scheme')
    21192113134 FORMAT (' --> Additional prognostic equation for a passive scalar')
    21202114135 FORMAT (' --> Solve perturbation pressure via ',A,' method (', &
  • palm/trunk/SOURCE/modules.f90

    r3337 r3355  
    415415! Increased pr_palm to 120. Increased length of dots_unit and dots_label to 13
    416416! digits. Increased length of domask, do2d, and do3d to 20 digits.
    417 !
    418 ! 1496 2014-12-02 17:25:50Z maronga
    419 ! Renamed "radiation" -> "cloud_top_radiation"
    420417!
    421418! 1484 2014-10-21 10:53:05Z kanani
     
    13001297    LOGICAL ::  child_domain  = .FALSE.                          !< flag indicating that model is nested in a parent domain
    13011298    LOGICAL ::  cloud_droplets = .FALSE.                         !< namelist parameter
    1302     LOGICAL ::  cloud_top_radiation = .FALSE.                    !< namelist parameter
    13031299    LOGICAL ::  complex_terrain = .FALSE.                        !< namelist parameter
    13041300    LOGICAL ::  conserve_volume_flow = .FALSE.                   !< namelist parameter
  • palm/trunk/SOURCE/parin.f90

    r3347 r3355  
    298298! 1560 2015-03-06 10:48:54Z keck
    299299! +recycling_yshift
    300 !
    301 ! 1496 2014-12-02 17:25:50Z maronga
    302 ! Renamed: "radiation -> "cloud_top_radiation"
    303300!
    304301! 1484 2014-10-21 10:53:05Z kanani
     
    554551             canyon_width_x, canyon_width_y, canyon_wall_left,                 &
    555552             canyon_wall_south, cfl_factor, cloud_droplets,   &
    556              cloud_top_radiation,                 &
    557553             collective_wait, complex_terrain,           &
    558554             conserve_volume_flow,                                             &
     
    627623             canyon_width_x, canyon_width_y, canyon_wall_left,                 &
    628624             canyon_wall_south, cfl_factor, cloud_droplets,                    &
    629              cloud_top_radiation,                                              &
    630625             collective_wait, complex_terrain,                                 &
    631626             conserve_volume_flow,                                             &
  • palm/trunk/SOURCE/prognostic_equations.f90

    r3337 r3355  
    156156! advec_s_bc_mod addded, since advec_s_bc is now a module
    157157!
    158 ! 1496 2014-12-02 17:25:50Z maronga
    159 ! Renamed "radiation" -> "cloud_top_radiation"
    160 !
    161158! 1484 2014-10-21 10:53:05Z kanani
    162159! Changes due to new module structure of the plant canopy model:
     
    341338        ONLY:  buoyancy
    342339
    343     USE calc_radiation_mod,                                                    &
    344         ONLY:  calc_radiation
    345 
    346340    USE chemistry_model_mod,                                                   &
    347341        ONLY:  chem_integrate, chem_species,  chem_prognostic_equations,       &
     
    358352
    359353    USE control_parameters,                                                    &
    360         ONLY:  air_chemistry,                                                  &
    361                cloud_top_radiation, constant_diffusion,                        &
     354        ONLY:  air_chemistry, constant_diffusion,                              &
    362355               dp_external, dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d,    &
    363356               humidity, intermediate_timestep_count,                          &
    364357               intermediate_timestep_count_max, large_scale_forcing,           &
    365                large_scale_subsidence,                  &
    366                neutral, nudging, &
     358               large_scale_subsidence, neutral, nudging,                       &
    367359               ocean_mode, passive_scalar, plant_canopy, pt_reference,         &
    368360               scalar_advec, scalar_advec, simulated_time, sloping_surface,    &
     
    827819                               surf_usm_v(0)%shf, surf_usm_v(1)%shf,           &
    828820                               surf_usm_v(2)%shf, surf_usm_v(3)%shf )
    829 !
    830 !--          If required compute heating/cooling due to long wave radiation
    831 !--          processes
    832              IF ( cloud_top_radiation )  THEN
    833                 CALL calc_radiation( i, j )
    834              ENDIF
    835821
    836822!
     
    17061692                         surf_usm_v(0)%shf, surf_usm_v(1)%shf,                 &
    17071693                         surf_usm_v(2)%shf, surf_usm_v(3)%shf )
    1708 !
    1709 !--    If required compute heating/cooling due to long wave radiation processes
    1710        IF ( cloud_top_radiation )  THEN
    1711           CALL calc_radiation
    1712        ENDIF
    17131694
    17141695!
  • palm/trunk/SOURCE/read_restart_data_mod.f90

    r3298 r3355  
    362362             CASE ( 'cloud_droplets' )
    363363                READ ( 13 )  cloud_droplets
    364              CASE ( 'cloud_top_radiation' )
    365                 READ ( 13 )  cloud_top_radiation
    366364             CASE ( 'collective_wait' )
    367365                READ ( 13 )  collective_wait
  • palm/trunk/SOURCE/write_restart_data_mod.f90

    r3294 r3355  
    289289       WRITE ( 14 )  cloud_droplets
    290290
    291        CALL wrd_write_string( 'cloud_top_radiation' )
    292        WRITE ( 14 )  cloud_top_radiation
    293 
    294291       CALL wrd_write_string( 'collective_wait' )
    295292       WRITE ( 14 )  collective_wait
Note: See TracChangeset for help on using the changeset viewer.