Changeset 1587 for palm/trunk

Timestamp:

May 4, 2015 2:19:01 PM (10 years ago)

Author:

maronga

Message:

small adjustments for RRTMG

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• radiation_model.f90 (modified) (4 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added check for set of albedos when using RRTMG
 ! 
 ! Former revisions:
@@ -1167 +1167 @@
           CALL message( 'check_parameters', 'PA0410', 1, 2, 0, 6, 0 )
        ENDIF
+       IF ( albedo_type == 0 .AND. radiation_scheme == 'rrtmg' .AND.           &
+          (    albedo_lw_dif == 9999999.9_wp .OR. albedo_lw_dir == 9999999.9_wp&
+          .OR. albedo_sw_dif == 9999999.9_wp .OR. albedo_sw_dir == 9999999.9_wp& 
+          ) ) THEN
+          message_string = 'radiation_scheme = "rrtmg" in combination' //      & 
+                           'with albedo_type = 0 requires setting of ' //      &
+                           'albedo_lw_dif /= 9999999.9' //                     &
+                           'albedo_lw_dir /= 9999999.9' //                     &
+                           'albedo_sw_dif /= 9999999.9 and' //                 &
+                           'albedo_sw_dir /= 9999999.9'
+          CALL message( 'check_parameters', 'PA0411', 1, 2, 0, 6, 0 )
+       ENDIF
+
     ENDIF
 

palm/trunk/SOURCE/radiation_model.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Added albedo class for snow
 ! 
 ! Former revisions:
@@ -123 +123 @@
                                    'desert, rocky',                        & ! 12 
                                    'tundra',                               & ! 13
-                                   'landice',                              & ! 14 
+                                   'land ice',                             & ! 14 
                                    'sea ice',                              & ! 15 
                                    'snow'                                  & ! 16
@@ -178 +178 @@
 !-- Land surface albedos for solar zenith angle of 60° after Briegleb (1992)     
 !-- (shortwave, longwave, broadband):   sw,      lw,      bb,
-    REAL(wp), DIMENSION(0:2,1:15), PARAMETER :: albedo_pars = RESHAPE( (/& 
+    REAL(wp), DIMENSION(0:2,1:16), PARAMETER :: albedo_pars = RESHAPE( (/& 
                                    0.06_wp, 0.06_wp, 0.06_wp,            & !  1
                                    0.09_wp, 0.28_wp, 0.19_wp,            & !  2
@@ -193 +193 @@
                                    0.10_wp, 0.27_wp, 0.19_wp,            & ! 13
                                    0.90_wp, 0.65_wp, 0.77_wp,            & ! 14
-                                   0.95_wp, 0.70_wp, 0.82_wp             & ! 15
-                                 /), (/ 3, 15 /) )
+                                   0.90_wp, 0.65_wp, 0.77_wp,            & ! 15
+                                   0.95_wp, 0.70_wp, 0.82_wp             & ! 16
+                                 /), (/ 3, 16 /) )
 
     REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, TARGET :: &