Changeset 4126 for palm

Timestamp:

Jul 30, 2019 11:09:11 AM (5 years ago)

Author:

gronemeier

Message:

renaming in biometeorology_mod, adding of example cases for biometeorolgy

Location:

palm/trunk

Files:

• EXAMPLES/bio_meteorology (added)
• EXAMPLES/bio_meteorology/canyon (added)
• EXAMPLES/bio_meteorology/canyon/INPUT (added)
• EXAMPLES/bio_meteorology/canyon/INPUT/canyon_p3d (added)
• EXAMPLES/bio_meteorology/canyon/INPUT/canyon_uvlookup (added)
• EXAMPLES/bio_meteorology/cube_mini (added)
• EXAMPLES/bio_meteorology/cube_mini/INPUT (added)
• EXAMPLES/bio_meteorology/cube_mini/INPUT/cube_mini_p3d (added)
• EXAMPLES/bio_meteorology/cube_mini/INPUT/cube_mini_uvlookup (added)
• SOURCE/biometeorology_mod.f90 (modified) (13 diffs)
• SOURCE/time_integration.f90 (modified) (3 diffs)

palm/trunk/SOURCE/biometeorology_mod.f90

@@ -27 +27 @@
 ! -----------------
 ! $Id$
+! renamed vitd3_exposure_av into vitd3_dose,
+! renamed uvem_calc_exposure into bio_calculate_uv_exposure
+! 
+! 3885 2019-04-11 11:29:34Z kanani
 ! Changes related to global restructuring of location messages and introduction 
 ! of additional debug messages
@@ -274 +278 @@
     REAL(wp), DIMENSION(0:71,0:9) ::  radiance_array_temp          = 0.0_wp  !< temporary radiance data
 
-    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  vitd3_exposure     !< result variable for instantaneous vitamin-D weighted exposures
-    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  vitd3_exposure_av  !< result variable for summation of vitamin-D weighted exposures
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  vitd3_exposure  !< result variable for instantaneous vitamin-D weighted exposures
+    REAL(wp), DIMENSION(:,:), ALLOCATABLE ::  vitd3_dose      !< result variable for summation of vitamin-D weighted exposures
 
     REAL(wp), DIMENSION(0:35,0:9,0:90) ::  radiance_lookup_table   = 0.0_wp  !< radiance lookup table
@@ -290 +294 @@
 !
 !-- UVEM PUBLIC variables and methods
-    PUBLIC uvem_calc_exposure, uv_exposure
+    PUBLIC bio_calculate_uv_exposure, uv_exposure
 
 !
@@ -386 +390 @@
 !
 !-- Calculate UV exposure grid
-    INTERFACE uvem_calc_exposure
-       MODULE PROCEDURE uvem_calc_exposure
-    END INTERFACE uvem_calc_exposure
+    INTERFACE bio_calculate_uv_exposure
+       MODULE PROCEDURE bio_calculate_uv_exposure
+    END INTERFACE bio_calculate_uv_exposure
 
  CONTAINS
@@ -462 +466 @@
 
           CASE ( 'uvem_vitd3dose*' )
-             IF ( .NOT. ALLOCATED( vitd3_exposure_av ) )  THEN
-                ALLOCATE( vitd3_exposure_av(nysg:nyng,nxlg:nxrg) )
+             IF ( .NOT. ALLOCATED( vitd3_dose ) )  THEN
+                ALLOCATE( vitd3_dose(nysg:nyng,nxlg:nxrg) )
              ENDIF
-             vitd3_exposure_av = 0.0_wp
+             vitd3_dose = 0.0_wp
 
           CASE DEFAULT
@@ -607 +611 @@
 !--       This is a cumulated dose. No mode == 'average' for this quantity.
           CASE ( 'uvem_vitd3dose*' )
-             IF ( ALLOCATED( vitd3_exposure_av ) )  THEN
+             IF ( ALLOCATED( vitd3_dose ) )  THEN
                 DO  i = nxlg, nxrg
                    DO  j = nysg, nyng
-                      vitd3_exposure_av(j,i) = vitd3_exposure_av(j,i) + vitd3_exposure(j,i)
+                      vitd3_dose(j,i) = vitd3_dose(j,i) + vitd3_exposure(j,i)
                    ENDDO
                 ENDDO
@@ -805 +809 @@
 
        CASE ( 'uvem_vitd3*' )
-          IF (  .NOT.  uv_exposure )  THEN
-             message_string = 'output of "' // TRIM( var ) // '" requi' //     &
-                      'res a namelist &uvexposure_par'
-             CALL message( 'uvem_check_data_output', 'UV0001', 1, 2, 0, 6, 0 )
-          ENDIF
+!           IF (  .NOT.  uv_exposure )  THEN
+!              message_string = 'output of "' // TRIM( var ) // '" requi' //     &
+!                       'res a namelist &uvexposure_par'
+!              CALL message( 'uvem_check_data_output', 'UV0001', 1, 2, 0, 6, 0 )
+!           ENDIF
           IF ( k == 0  .OR.  data_output(i)(ilen-2:ilen) /= '_xy' )  THEN
              message_string = 'illegal value for data_output: "' //            &
@@ -823 +827 @@
 
        CASE ( 'uvem_vitd3dose*' )
-          IF (  .NOT.  uv_exposure )  THEN
-             message_string = 'output of "' // TRIM( var ) // '" requi' //     &
-                      'res  a namelist &uvexposure_par'
-             CALL message( 'uvem_check_data_output', 'UV0001', 1, 2, 0, 6, 0 )
-          ENDIF
+!           IF (  .NOT.  uv_exposure )  THEN
+!              message_string = 'output of "' // TRIM( var ) // '" requi' //     &
+!                       'res  a namelist &uvexposure_par'
+!              CALL message( 'uvem_check_data_output', 'UV0001', 1, 2, 0, 6, 0 )
+!           ENDIF
           IF ( k == 0  .OR.  data_output(i)(ilen-2:ilen) /= '_xy' )  THEN
              message_string = 'illegal value for data_output: "' //            &
@@ -835 +839 @@
           ENDIF
           unit = 'IU/av-h'
-          IF ( .NOT. ALLOCATED( vitd3_exposure_av ) )  THEN
-             ALLOCATE( vitd3_exposure_av(nysg:nyng,nxlg:nxrg) )
+          IF ( .NOT. ALLOCATED( vitd3_dose ) )  THEN
+             ALLOCATE( vitd3_dose(nysg:nyng,nxlg:nxrg) )
           ENDIF
-          vitd3_exposure_av = 0.0_wp
+          vitd3_dose = 0.0_wp
 
        CASE DEFAULT
@@ -1030 +1034 @@
              DO  i = nxl, nxr
                 DO  j = nys, nyn
-                   local_pf(i,j,nzb+1) = vitd3_exposure_av(j,i)
+                   local_pf(i,j,nzb+1) = vitd3_dose(j,i)
                 ENDDO
              ENDDO
@@ -1250 +1254 @@
         ONLY: message_string
 
-    IF ( .NOT. radiation_interactions )  THEN
+    IF ( (.NOT. radiation_interactions) .AND. ( thermal_comfort ) )  THEN
        message_string = 'The mrt calculation requires ' //                     &
                         'enabled radiation_interactions but it ' //            &
@@ -4290 +4294 @@
 !> Module-specific routine for new module
 !---------------------------------------------------------------------------------------------------------------------!
- SUBROUTINE uvem_calc_exposure
+ SUBROUTINE bio_calculate_uv_exposure
 
     USE indices,                                                                                                      &
@@ -4439 +4443 @@
     ENDIF
 
- END SUBROUTINE uvem_calc_exposure
+ END SUBROUTINE bio_calculate_uv_exposure
 
  END MODULE biometeorology_mod

palm/trunk/SOURCE/time_integration.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! renamed routine to calculate uv exposure
+! 
+! 4111 2019-07-22 18:16:57Z suehring
 ! advc_flags_1 / advc_flags_2 renamed to advc_flags_m / advc_flags_s
 ! 
@@ -545 +548 @@
 
     USE biometeorology_mod,                                                                        &
-        ONLY:  bio_calculate_thermal_index_maps, thermal_comfort, uvem_calc_exposure, uv_exposure
+        ONLY:  bio_calculate_thermal_index_maps, thermal_comfort, bio_calculate_uv_exposure,       &
+               uv_exposure
 
     USE bulk_cloud_model_mod,                                                                      &
@@ -1704 +1708 @@
 !--       If required, do UV exposure calculations
           IF ( uv_exposure )  THEN
-             CALL uvem_calc_exposure
+             CALL bio_calculate_uv_exposure
           ENDIF
        ENDIF