Changeset 3355 for palm

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:

• Makefile (modified) (3 diffs)
• calc_radiation.f90 (deleted)
• header.f90 (modified) (3 diffs)
• modules.f90 (modified) (2 diffs)
• parin.f90 (modified) (3 diffs)
• prognostic_equations.f90 (modified) (5 diffs)
• read_restart_data_mod.f90 (modified) (1 diff)
• write_restart_data_mod.f90 (modified) (1 diff)

palm/trunk/SOURCE/Makefile

@@ -488 +488 @@
         buoyancy.f90 \
         calc_mean_profile.f90 \
-        calc_radiation.f90 \
         check_for_restart.f90 \
         check_open.f90 \
@@ -765 +764 @@
         mod_kinds.o \
         modules.o
-calc_radiation.o: \
-        basic_constants_and_equations_mod.o \
-        mod_kinds.o \
-        modules.o
 check_for_restart.o: \
         mod_kinds.o \
@@ -1451 +1446 @@
         bulk_cloud_model_mod.o \
         buoyancy.o \
-        calc_radiation.o \
         chemistry_model_mod.o \
         chem_modules.o \

palm/trunk/SOURCE/header.f90

@@ -238 +238 @@
 ! 1551 2015-03-03 14:18:16Z maronga
 ! Added informal output for land surface model and radiation model. Removed typo.
-! 
-! 1496 2014-12-02 17:25:50Z maronga
-! Renamed: "radiation -> "cloud_top_radiation"
 ! 
 ! 1484 2014-10-21 10:53:05Z kanani
@@ -1940 +1937 @@
        WRITE ( io, 431 )
     ENDIF
-    IF ( cloud_top_radiation )  WRITE ( io, 132 )
     IF ( humidity  .AND.  cloud_droplets )  THEN
        WRITE ( io, 433 )
@@ -2115 +2111 @@
 131 FORMAT (' --> No pt-equation solved. Neutral stratification with pt = ', &
                   F6.2, ' K assumed')
-132 FORMAT ('     Parameterization of long-wave radiation processes via'/ &
-            '     effective emissivity scheme')
 134 FORMAT (' --> Additional prognostic equation for a passive scalar')
 135 FORMAT (' --> Solve perturbation pressure via ',A,' method (', &

palm/trunk/SOURCE/modules.f90

@@ -415 +415 @@
 ! Increased pr_palm to 120. Increased length of dots_unit and dots_label to 13
 ! digits. Increased length of domask, do2d, and do3d to 20 digits.
-! 
-! 1496 2014-12-02 17:25:50Z maronga
-! Renamed "radiation" -> "cloud_top_radiation"
 ! 
 ! 1484 2014-10-21 10:53:05Z kanani
@@ -1300 +1297 @@
     LOGICAL ::  child_domain  = .FALSE.                          !< flag indicating that model is nested in a parent domain
     LOGICAL ::  cloud_droplets = .FALSE.                         !< namelist parameter
-    LOGICAL ::  cloud_top_radiation = .FALSE.                    !< namelist parameter
     LOGICAL ::  complex_terrain = .FALSE.                        !< namelist parameter
     LOGICAL ::  conserve_volume_flow = .FALSE.                   !< namelist parameter

palm/trunk/SOURCE/parin.f90

@@ -298 +298 @@
 ! 1560 2015-03-06 10:48:54Z keck
 ! +recycling_yshift
-! 
-! 1496 2014-12-02 17:25:50Z maronga
-! Renamed: "radiation -> "cloud_top_radiation"
 ! 
 ! 1484 2014-10-21 10:53:05Z kanani
@@ -554 +551 @@
              canyon_width_x, canyon_width_y, canyon_wall_left,                 &
              canyon_wall_south, cfl_factor, cloud_droplets,   &
-             cloud_top_radiation,                 &
              collective_wait, complex_terrain,           &
              conserve_volume_flow,                                             &
@@ -627 +623 @@
              canyon_width_x, canyon_width_y, canyon_wall_left,                 &
              canyon_wall_south, cfl_factor, cloud_droplets,                    &
-             cloud_top_radiation,                                              &
              collective_wait, complex_terrain,                                 &
              conserve_volume_flow,                                             &

palm/trunk/SOURCE/prognostic_equations.f90

@@ -156 +156 @@
 ! advec_s_bc_mod addded, since advec_s_bc is now a module
 !
-! 1496 2014-12-02 17:25:50Z maronga
-! Renamed "radiation" -> "cloud_top_radiation"
-!
 ! 1484 2014-10-21 10:53:05Z kanani
 ! Changes due to new module structure of the plant canopy model:
@@ -341 +338 @@
         ONLY:  buoyancy
 
-    USE calc_radiation_mod,                                                    &
-        ONLY:  calc_radiation
-
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_integrate, chem_species,  chem_prognostic_equations,       &
@@ -358 +352 @@
 
     USE control_parameters,                                                    &
-        ONLY:  air_chemistry,                                                  &
-               cloud_top_radiation, constant_diffusion,                        &
+        ONLY:  air_chemistry, constant_diffusion,                              &
                dp_external, dp_level_ind_b, dp_smooth_factor, dpdxy, dt_3d,    &
                humidity, intermediate_timestep_count,                          &
                intermediate_timestep_count_max, large_scale_forcing,           &
-               large_scale_subsidence,                  &
-               neutral, nudging, &
+               large_scale_subsidence, neutral, nudging,                       &
                ocean_mode, passive_scalar, plant_canopy, pt_reference,         &
                scalar_advec, scalar_advec, simulated_time, sloping_surface,    &
@@ -827 +819 @@
                                surf_usm_v(0)%shf, surf_usm_v(1)%shf,           &
                                surf_usm_v(2)%shf, surf_usm_v(3)%shf )
-!
-!--          If required compute heating/cooling due to long wave radiation
-!--          processes
-             IF ( cloud_top_radiation )  THEN
-                CALL calc_radiation( i, j )
-             ENDIF
 
 !
@@ -1706 +1692 @@
                          surf_usm_v(0)%shf, surf_usm_v(1)%shf,                 &
                          surf_usm_v(2)%shf, surf_usm_v(3)%shf )
-!
-!--    If required compute heating/cooling due to long wave radiation processes
-       IF ( cloud_top_radiation )  THEN
-          CALL calc_radiation
-       ENDIF
 
 !

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -362 +362 @@
              CASE ( 'cloud_droplets' )
                 READ ( 13 )  cloud_droplets
-             CASE ( 'cloud_top_radiation' )
-                READ ( 13 )  cloud_top_radiation
              CASE ( 'collective_wait' )
                 READ ( 13 )  collective_wait

palm/trunk/SOURCE/write_restart_data_mod.f90

@@ -289 +289 @@
        WRITE ( 14 )  cloud_droplets
 
-       CALL wrd_write_string( 'cloud_top_radiation' ) 
-       WRITE ( 14 )  cloud_top_radiation
-
        CALL wrd_write_string( 'collective_wait' ) 
        WRITE ( 14 )  collective_wait