Changeset 3298 for palm/trunk/SOURCE/surface_mod.f90

Timestamp:

Oct 2, 2018 12:21:11 PM (6 years ago)

Author:

kanani

Message:

Merge chemistry branch at r3297 to trunk

Location:

palm/trunk/SOURCE

Files:

• . (modified) (1 prop)
• surface_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/surface_mod.f90

@@ -26 +26 @@
 ! -----------------
 ! $Id$
+! - Minor formatting/clean-up (kanani)
+! - Removed initialization of cssws with surface_csflux values. Only the value 0 
+!   is now passed to all the chemical species of the selected mechanism. 
+!   The real inizialization is conducted in init_3d_model_mod.f90 (Russo)
+! - Added calls and variables for inizialization of chemistry emission 
+!   fluxes (Russo)
+! - Setting of cssws to zero moved (forkel)
+! - Set cssws to zero before setting values (forkel)
+! - Distinguish flux conversion factors for gases and PM (forkel)
+! - Some questions/todo's on conversion factors (forkel)
+!
+! 3294 2018-10-01 02:37:10Z raasch
 ! changes concerning modularization of ocean option
 ! 
@@ -2071 +2083 @@
 
              TYPE( surf_type ) :: surf          !< respective surface type
+
 !
 !--          Store indices of respective surface element
@@ -2173 +2186 @@
 
              DO  lsp = 1, nvar
-                IF ( air_chemistry )  surf%css(lsp,num_h) = 0.0_wp
+                IF ( air_chemistry )  surf%css(lsp,num_h)   = 0.0_wp
+!
+!--             Ensure that fluxes of compounds which are not specified in 
+!--             namelist are all zero --> kanani: revise
+                IF ( air_chemistry )  surf%cssws(lsp,num_h) = 0.0_wp
              ENDDO
 !
@@ -2220 +2237 @@
                    ELSE
                       surf%qsws(num_h) = wall_humidityflux(5) *                &
-                                             heatflux_input_conversion(k)
+                                                waterflux_input_conversion(k)
                    ENDIF
                 ENDIF
@@ -2227 +2244 @@
                    IF ( upward_facing )  THEN
                       IF ( constant_scalarflux )  THEN
-                         surf%ssws(num_h) = surface_scalarflux * rho_air_zw(k-1)
+                         surf%ssws(num_h) = surface_scalarflux  * rho_air_zw(k-1)
 
                          IF ( k-1 /= 0 )                                       &
@@ -3386 +3403 @@
                                   nxr_on_file, nynf, nync, nyn_on_file, nysf,  &
                                   nysc, nys_on_file, found )
+
 
        IMPLICIT NONE