Changeset 2256 for palm/trunk

Timestamp:

Jun 7, 2017 1:58:08 PM (7 years ago)

Author:

suehring

Message:

change default value of zeta_min; enable scalar/heat/water-fluxes at downward-facing surfaces, bugfix Makefile

Location:

palm/trunk/SOURCE

Files:

• Makefile (modified) (2 diffs)
• modules.f90 (modified) (3 diffs)
• surface_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/Makefile

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Remove ring dependency in init_pegrid
+# 
+# 2238 2017-05-31 16:49:16Z suehring
 # Bugfix, further missing dependency on surface_mod
 # 
@@ -493 +496 @@
 init_masks.o: modules.o mod_kinds.o netcdf_interface_mod.o
 init_ocean.o: modules.o eqn_state_seawater.o mod_kinds.o
-init_pegrid.o: modules.o mod_kinds.o spectra_mod.o pmc_interface_mod.o
+init_pegrid.o: modules.o mod_kinds.o spectra_mod.o
 init_pt_anomaly.o: modules.o mod_kinds.o
 init_rankine.o: modules.o mod_kinds.o

palm/trunk/SOURCE/modules.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Change default value of zeta_min to -20
+! Increase dimension for wall_heatflux, etc. 
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -1331 +1335 @@
     REAL(wp) ::  wall_adjustment_factor = 1.8_wp               !< 
     REAL(wp) ::  zeta_max = 20.0_wp                            !< Maximum value of zeta = z/L
-    REAL(wp) ::  zeta_min = -9990.0_wp                         !< Minimum value of zeta = z/L
+    REAL(wp) ::  zeta_min = -20.0_wp                           !< Minimum value of zeta = z/L
     REAL(wp) ::  z_max_do2d = -1.0_wp                          !< 
     REAL(wp) ::  z0h_factor = 1.0_wp                           !< 
@@ -1364 +1368 @@
     REAL(wp) ::  volume_flow_area(1:3) = 0.0_wp                    !< 
     REAL(wp) ::  volume_flow_initial(1:3) = 0.0_wp                 !< 
-    REAL(wp) ::  wall_heatflux(0:4) = 0.0_wp                       !< 
-    REAL(wp) ::  wall_humidityflux(0:4) = 0.0_wp                   !< 
-    REAL(wp) ::  wall_salinityflux(0:4) = 0.0_wp                   !< 
-    REAL(wp) ::  wall_scalarflux(0:4) = 0.0_wp                     !< 
+    REAL(wp) ::  wall_heatflux(0:5) = 0.0_wp                       !< 
+    REAL(wp) ::  wall_humidityflux(0:5) = 0.0_wp                   !< 
+    REAL(wp) ::  wall_salinityflux(0:5) = 0.0_wp                   !< 
+    REAL(wp) ::  wall_scalarflux(0:5) = 0.0_wp                     !< 
     REAL(wp) ::  subs_vertical_gradient(10) = 0.0_wp               !< 
     REAL(wp) ::  subs_vertical_gradient_level(10) = -9999999.9_wp  !< 

palm/trunk/SOURCE/surface_mod.f90

@@ -24 +24 @@
 ! Former revisions:
 ! -----------------
-
-! Revision 1.1  2016/12/20 10:06:06  suehring
+! $Id$
+! Enable heating at downward-facing surfaces
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 ! Initial revision
 !
@@ -1351 +1353 @@
                    ENDIF
 !
-!--             Set heat-flux at downward-facing surfaces to zero
+!--             Set heat-flux at downward-facing surfaces
                 ELSE
-                   surf%shf(num_h) = 0.0_wp
+                   surf%shf(num_h) = wall_heatflux(5) *                        &
+                                             heatflux_input_conversion(k)
                 ENDIF
 
@@ -1369 +1372 @@
                       ENDIF
                    ELSE
-                      surf%qsws(num_h) = 0.0_wp
+                      surf%qsws(num_h) = wall_humidityflux(5) *                &
+                                             heatflux_input_conversion(k)
                    ENDIF
                 ENDIF
@@ -1379 +1383 @@
 
                          IF ( k-1 /= 0 )                                       &
-                            surf%ssws(num_h) = wall_scalarflux(0) *            &
-                                                  waterflux_input_conversion(k-1)
+                            surf%ssws(num_h) = wall_scalarflux(0)
 
                       ELSE
@@ -1386 +1389 @@
                       ENDIF
                    ELSE
-                      surf%ssws(num_h) = 0.0_wp
+                      surf%ssws(num_h) = wall_scalarflux(5)
                    ENDIF
                 ENDIF