Changeset 1976 for palm/trunk/SOURCE/data_output_mask.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_mask.f90 (modified) (4 diffs)

palm/trunk/SOURCE/data_output_mask.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Output of radiation quantities is now done directly in the respective module
 ! 
 ! Former revisions:
@@ -127 +127 @@
 
     USE radiation_model_mod,                                                   &
-        ONLY:  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,         &
-               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
-
+        ONLY:  radiation, radiation_data_output_mask
 
     IMPLICIT NONE
@@ -425 +421 @@
              ENDIF
 
-          CASE ( 'rad_lw_in' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_lw_in
-             ELSE
-                to_be_resorted => rad_lw_in_av
-             ENDIF
-
-          CASE ( 'rad_lw_out' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_lw_out
-             ELSE
-                to_be_resorted => rad_lw_out_av
-             ENDIF
-
-          CASE ( 'rad_lw_cs_hr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_lw_cs_hr
-             ELSE
-                to_be_resorted => rad_lw_cs_hr_av
-             ENDIF
-
-          CASE ( 'rad_lw_hr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_lw_hr
-             ELSE
-                to_be_resorted => rad_lw_hr_av
-             ENDIF
-
-          CASE ( 'rad_sw_in' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_sw_in
-             ELSE
-                to_be_resorted => rad_sw_in_av
-             ENDIF
-
-          CASE ( 'rad_sw_out' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_sw_out
-             ELSE
-                to_be_resorted => rad_sw_out_av
-             ENDIF
-
-          CASE ( 'rad_sw_cs_hr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_sw_cs_hr
-             ELSE
-                to_be_resorted => rad_sw_cs_hr_av
-             ENDIF
-
-          CASE ( 'rad_sw_hr' )
-             IF ( av == 0 )  THEN
-                to_be_resorted => rad_sw_hr
-             ELSE
-                to_be_resorted => rad_sw_hr_av
-             ENDIF
-
           CASE ( 'rho' )
              IF ( av == 0 )  THEN
@@ -531 +471 @@
 
           CASE DEFAULT
+
+!
+!--          Radiation quantity
+             IF ( radiation )  THEN
+                CALL radiation_data_output_mask(av, domask(mid,av,if), found,  &
+                                                local_pf )
+             ENDIF
+
 !
 !--          User defined quantity
-             CALL user_data_output_mask(av, domask(mid,av,if), found, local_pf )
+             IF ( .NOT. found )  THEN
+                CALL user_data_output_mask(av, domask(mid,av,if), found,       &
+                                           local_pf )
+             ENDIF
+
              resorted = .TRUE.