Changeset 2575 for palm/trunk/SOURCE/radiation_model_mod.f90

Timestamp:

Oct 24, 2017 9:57:58 AM (7 years ago)

Author:

maronga

Message:

bugfix in radiation model and improvements in land surface scheme

File:

• palm/trunk/SOURCE/radiation_model_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: calculation of shortwave and longwave albedos for RRTMG swapped
+! 
+! 2547 2017-10-16 12:41:56Z schwenkel
 ! extended by cloud_droplets option, minor bugfix and correct calculation of
 ! cloud droplet number concentration
@@ -187 +190 @@
     USE control_parameters,                                                    &
         ONLY:  cloud_droplets, cloud_physics, g, initializing_actions,         &
-               large_scale_forcing, lsf_surf, microphysics_morrison, phi,      & 
-               pt_surface, rho_surface, surface_pressure,                      &
-               time_since_reference_point
+               latitude, longitude, large_scale_forcing, lsf_surf,             &
+               microphysics_morrison, pt_surface, rho_surface,                 &
+               surface_pressure, time_since_reference_point
 
     USE date_and_time_mod,                                                     &
@@ -299 +302 @@
                 dt_radiation = 0.0_wp,           & !< radiation model timestep
                 emissivity = 9999999.9_wp,       & !< NAMELIST surface emissivity
-                lambda = 0.0_wp,                 & !< longitude in degrees
                 lon = 0.0_wp,                    & !< longitude in radians
                 lat = 0.0_wp,                    & !< latitude in radians
@@ -972 +974 @@
           decl_2 = 2.0_wp * pi / 365.0_wp
           decl_3 = decl_2 * 81.0_wp
-          lat    = phi * pi / 180.0_wp
-          lon    = lambda * pi / 180.0_wp
+          lat    = latitude * pi / 180.0_wp
+          lon    = longitude * pi / 180.0_wp
        ENDIF
 
@@ -1039 +1041 @@
 
           IF ( albedo_type /= 0 )  THEN
+             IF ( albedo_sw_dif == 9999999.9_wp )  THEN
+                albedo_sw_dif = albedo_pars(0,albedo_type)
+                albedo_sw_dir = albedo_sw_dif
+             ENDIF
              IF ( albedo_lw_dif == 9999999.9_wp )  THEN
-                albedo_lw_dif = albedo_pars(0,albedo_type)
+                albedo_lw_dif = albedo_pars(1,albedo_type)
                 albedo_lw_dir = albedo_lw_dif
-             ENDIF
-             IF ( albedo_sw_dif == 9999999.9_wp )  THEN
-                albedo_sw_dif = albedo_pars(1,albedo_type)
-                albedo_sw_dir = albedo_sw_dif
              ENDIF
           ENDIF
@@ -1365 +1367 @@
        ENDIF
        
-       IF ( radiation .AND. radiation_scheme /= 'constant' )  THEN
-          WRITE ( io, 1 )  lambda
-       ENDIF
-
        WRITE( io, 12 ) dt_radiation
  
 
- 1 FORMAT ('    Geograph. longitude            :   lambda = ',F4.1,' degr')
  3 FORMAT (//' Radiation model information:'/                                  &
               ' ----------------------------'/)
@@ -1406 +1403 @@
                                   albedo_lw_dif, albedo_sw_dir, albedo_sw_dif, &
                                   constant_albedo, dt_radiation,               &
-                                  lambda, lw_radiation, net_radiation,         &
+                                  lw_radiation, net_radiation,                 &
                                   radiation_scheme, skip_time_do_radiation,    &
                                   sw_radiation, unscheduled_radiation_calls