Changeset 1330 for palm/trunk

Timestamp:

Mar 24, 2014 5:29:32 PM (11 years ago)

Author:

suehring

Message:

In case of SGS-particle velocity advection of TKE is also allowed with 5th-order scheme.

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• prognostic_equations.f90 (modified) (2 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! In case of SGS-particle velocity advection of TKE is also allowed with 
+! dissipative 5th-order scheme.
 ! 
 ! Former revisions:
@@ -681 +682 @@
     ENDIF
 
-    IF ( use_sgs_for_particles  .AND.  .NOT. use_upstream_for_tke )  THEN
+    IF ( use_sgs_for_particles  .AND.  .NOT. use_upstream_for_tke .AND.       &
+         scalar_advec /= 'ws-scheme' )  THEN
        use_upstream_for_tke = .TRUE.
        message_string = 'use_upstream_for_tke set .TRUE. because ' // &
-                        'use_sgs_for_particles = .TRUE.'
+                        'use_sgs_for_particles = .TRUE. '          // &
+                        'and scalar_advec /= ws-scheme'
        CALL message( 'check_parameters', 'PA0025', 0, 1, 0, 6, 0 )
     ENDIF

palm/trunk/SOURCE/prognostic_equations.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! In case of SGS-particle velocity advection of TKE is also allowed with 
+! dissipative 5th-order scheme.
 !
 ! Former revisions:
@@ -787 +788 @@
 !--          Tendency-terms for TKE
              tend(:,j,i) = 0.0
-             IF ( timestep_scheme(1:5) == 'runge'  &
-                 .AND.  .NOT. use_upstream_for_tke )  THEN
+             IF ( timestep_scheme(1:5) == 'runge' )  THEN
                  IF ( ws_scheme_sca )  THEN
                      CALL advec_s_ws( i, j, e, 'e', flux_s_e, diss_s_e, &