Changeset 1976 for palm/trunk/SOURCE/data_output_2d.f90

Timestamp:

Jul 27, 2016 1:28:04 PM (8 years ago)

Author:

maronga

Message:

further modularization of land surface model (2D/3D output and restart data). Bugfix for restart runs without land surface model

File:

• palm/trunk/SOURCE/data_output_2d.f90 (modified) (5 diffs)

palm/trunk/SOURCE/data_output_2d.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Output of radiation quantities is now done directly in the respective module
 ! 
 ! Former revisions:
@@ -26 +26 @@
 !
 ! 1972 2016-07-26 07:52:02Z maronga
-! Output of land surface quantities is now done directly in the respective module
+! Output of land surface quantities is now done directly in the respective 
+! module
 ! 
 ! 1960 2016-07-12 16:34:24Z suehring
@@ -195 +196 @@
 
     USE radiation_model_mod,                                                   &
-        ONLY:  rad_net, rad_net_av, rad_sw_in, rad_sw_in_av, rad_sw_out,       &
-               rad_sw_out_av, rad_sw_cs_hr, rad_sw_cs_hr_av, rad_sw_hr,        &
-               rad_sw_hr_av, rad_lw_in, rad_lw_in_av, rad_lw_out,              &
-               rad_lw_out_av, rad_lw_cs_hr, rad_lw_cs_hr_av, rad_lw_hr,        &
-               rad_lw_hr_av
+        ONLY:  radiation, radiation_data_output_2d
 
     IMPLICIT NONE
@@ -753 +750 @@
                 IF ( mode == 'xy' )  level_z = zu
 
-             CASE ( 'rad_net*_xy' )        ! 2d-array
-                IF ( av == 0 ) THEN
-                   DO  i = nxlg, nxrg
-                      DO  j = nysg, nyng
-                         local_pf(i,j,nzb+1) =  rad_net(j,i)
-                      ENDDO
-                   ENDDO
-                ELSE
-                   DO  i = nxlg, nxrg
-                      DO  j = nysg, nyng 
-                         local_pf(i,j,nzb+1) =  rad_net_av(j,i)
-                      ENDDO
-                   ENDDO
-                ENDIF
-                resorted = .TRUE.
-                two_d = .TRUE.
-                level_z(nzb+1) = zu(nzb+1)
-
-
-             CASE ( 'rad_lw_in_xy', 'rad_lw_in_xz', 'rad_lw_in_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_lw_in
-                ELSE
-                   to_be_resorted => rad_lw_in_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'rad_lw_out_xy', 'rad_lw_out_xz', 'rad_lw_out_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_lw_out
-                ELSE
-                   to_be_resorted => rad_lw_out_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'rad_lw_cs_hr_xy', 'rad_lw_cs_hr_xz', 'rad_lw_cs_hr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_lw_cs_hr
-                ELSE
-                   to_be_resorted => rad_lw_cs_hr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zw
-
-             CASE ( 'rad_lw_hr_xy', 'rad_lw_hr_xz', 'rad_lw_hr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_lw_hr
-                ELSE
-                   to_be_resorted => rad_lw_hr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zw
-
-             CASE ( 'rad_sw_in_xy', 'rad_sw_in_xz', 'rad_sw_in_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_sw_in
-                ELSE
-                   to_be_resorted => rad_sw_in_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'rad_sw_out_xy', 'rad_sw_out_xz', 'rad_sw_out_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_sw_out
-                ELSE
-                   to_be_resorted => rad_sw_out_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zu
-
-             CASE ( 'rad_sw_cs_hr_xy', 'rad_sw_cs_hr_xz', 'rad_sw_cs_hr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_sw_cs_hr
-                ELSE
-                   to_be_resorted => rad_sw_cs_hr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zw
-
-             CASE ( 'rad_sw_hr_xy', 'rad_sw_hr_xz', 'rad_sw_hr_yz' )
-                IF ( av == 0 )  THEN
-                   to_be_resorted => rad_sw_hr
-                ELSE
-                   to_be_resorted => rad_sw_hr_av
-                ENDIF
-                IF ( mode == 'xy' )  level_z = zw
+
 
              CASE ( 'rho_xy', 'rho_xz', 'rho_yz' )
@@ -1034 +950 @@
                    CALL lsm_data_output_2d( av, do2d(av,if), found, grid, mode,&
                                             local_pf, two_d, nzb_do, nzt_do )
+                ENDIF
+
+!
+!--             Radiation quantity
+                IF ( .NOT. found  .AND.  radiation )  THEN
+                   CALL radiation_data_output_2d( av, do2d(av,if), found, grid,&
+                                                  mode, local_pf, two_d  )
                 ENDIF