Changeset 2042

Timestamp:

Nov 2, 2016 1:47:31 PM (8 years ago)

Author:

suehring

Message:

Bugfix, read and write restart data for wall fluxes; additional checks for wall fluxes

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (4 diffs)
• read_var_list.f90 (modified) (2 diffs)
• write_var_list.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Additional checks for wall_heatflux, wall_humidityflux and wall_scalarflux.
+! Bugfix, check for constant_scalarflux.
 ! 
 ! Former revisions:
@@ -1735 +1736 @@
     ENDIF
 
+    IF ( ANY( wall_heatflux /= 0.0_wp )  .AND.                        &
+         surface_heatflux == 9999999.9_wp )  THEN
+       message_string = 'wall_heatflux additionally requires ' //     &
+                        'setting of surface_heatflux'
+       CALL message( 'check_parameters', 'PA0443', 1, 2, 0, 6, 0 )
+    ENDIF
+
 !
 !   This IF clause needs revision, got too complex!!
@@ -1854 +1862 @@
 !-- Set boundary conditions for total water content
     IF ( humidity )  THEN
+
+       IF ( ANY( wall_humidityflux /= 0.0_wp )  .AND.                        &
+            surface_waterflux == 9999999.9_wp )  THEN
+          message_string = 'wall_humidityflux additionally requires ' //     &
+                           'setting of surface_waterflux'
+          CALL message( 'check_parameters', 'PA0444', 1, 2, 0, 6, 0 )
+       ENDIF
+
        CALL set_bc_scalars( 'q', bc_q_b, bc_q_t, ibc_q_b, ibc_q_t,           &
                             'PA0071', 'PA0072' )
@@ -1883 +1899 @@
     
     IF ( passive_scalar )  THEN
+
+       IF ( ANY( wall_scalarflux /= 0.0_wp )  .AND.                        &
+            surface_scalarflux == 9999999.9_wp )  THEN
+          message_string = 'wall_scalarflux additionally requires ' //     &
+                           'setting of surface_scalarflux'
+          CALL message( 'check_parameters', 'PA0445', 1, 2, 0, 6, 0 )
+       ENDIF
+
+       IF ( surface_scalarflux == 9999999.9_wp )  constant_scalarflux = .FALSE.
+
        CALL set_bc_scalars( 's', bc_s_b, bc_s_t, ibc_s_b, ibc_s_t,             &
                             'PA0071', 'PA0072' )

palm/trunk/SOURCE/read_var_list.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix, read restart data for wall_heatflux, wall_qflux and wall_sflux
 ! 
 ! Former revisions:
@@ -764 +764 @@
           CASE ( 'subs_vertical_gradient_level_i' )
              READ ( 13 )  subs_vertical_gradient_level_i
+          CASE ( 'wall_heatflux' )
+             READ ( 13 )  wall_heatflux
+          CASE ( 'wall_qflux' )
+             READ ( 13 )  wall_qflux
+          CASE ( 'wall_sflux' )
+             READ ( 13 )  wall_sflux
           CASE ( 'w_max' )
              READ ( 13 )  w_max

palm/trunk/SOURCE/write_var_list.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix, write restart data for wall_heatflux, wall_qflux and wall_sflux
 ! 
 ! Former revisions:
@@ -675 +675 @@
     WRITE ( 14 )  'subs_vertical_gradient_level_i'
     WRITE ( 14 )  subs_vertical_gradient_level_i
+    WRITE ( 14 )  'wall_heatflux                 '
+    WRITE ( 14 )  wall_heatflux
+    WRITE ( 14 )  'wall_qflux                    '
+    WRITE ( 14 )  wall_qflux
+    WRITE ( 14 )  'wall_sflux                    '
+    WRITE ( 14 )  wall_sflux
     WRITE ( 14 )  'w_max                         '
     WRITE ( 14 )  w_max