Changeset 4824 for palm/trunk

Timestamp:

Dec 12, 2020 8:45:23 PM (4 years ago)

Author:

moh.hefny

Message:

bugfix in surface_data_output_mod and radiation_model_mod

Location:

palm/trunk/SOURCE

Files:

• radiation_model_mod.f90 (modified) (5 diffs)
• surface_data_output_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/radiation_model_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! Bugfix: change the unit of radiation fluxes, few formating changes
+!
+! 4801 2020-11-27 16:06:40Z raasch
 ! bugfix for r4800
 !
@@ -1539 +1542 @@
     ELSE
        SELECT CASE ( var )
-          CASE ( 'rad_lw_cs_hr', 'rad_lw_hr', 'rad_lw_in', 'rad_lw_out', 'rad_sw_cs_hr',           &
-                 'rad_sw_hr', 'rad_sw_in', 'rad_sw_out' )
+          CASE ( 'rad_lw_cs_hr', 'rad_lw_hr', 'rad_sw_cs_hr', 'rad_sw_hr' )
              IF ( .NOT.  radiation  .OR.  radiation_scheme /= 'rrtmg' )  THEN
                 message_string = '"output of "' // var // '" requires radiation = .TRUE. and ' //  &
@@ -1547 +1549 @@
              ENDIF
              unit = 'K/h'
+
+          CASE ( 'rad_lw_in', 'rad_lw_out', 'rad_sw_in', 'rad_sw_out' )
+             IF ( .NOT.  radiation  .OR.  radiation_scheme /= 'rrtmg' )  THEN
+                message_string = '"output of "' // var // '" requires radiation = .TRUE. and ' //  &
+                                 'radiation_scheme = "rrtmg"'
+                CALL message( 'check_parameters', 'PA0406', 1, 2, 0, 6, 0 )
+             ENDIF
+             unit = 'W/m2'
 
           CASE ( 'rad_net*', 'rad_lw_in*', 'rad_lw_out*', 'rad_sw_in*', 'rad_sw_out*' )
@@ -6296 +6306 @@
 !--     Reset for the input from next reflective pass
         surfins = 0.0_wp
-        surfinl = 0.00_wp
+        surfinl = 0.0_wp
 !
 !--     Reflected radiation
@@ -6637 +6647 @@
                                            uvec        !< z, y, x unit vector of incoming flux
 
-
-
-
-
-
-
-
-
-
-
-
+   
     xshift = uvec(3) / uvec(1) * boxsize(1)
     xmin = MIN( 0._wp, - xshift )

palm/trunk/SOURCE/surface_data_output_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: correct the down-ward surf_lsm index in the routine surface_data_output_collect_2d
+!
+! 4805 2020-12-02 12:05:34Z gronemeier
 ! Bugfix: add time_dosurf to restart data
 !
@@ -4040 +4043 @@
        ENDDO
     ELSE
-       n_surf = n_surf + surf_lsm_h(0)%ns
+       n_surf = n_surf + surf_lsm_h(1)%ns
     ENDIF
     IF ( ALLOCATED( var_usm_h0 ) )  THEN