Changeset 785 for palm/trunk/SOURCE/prognostic_equations.f90

Timestamp:

Nov 28, 2011 9:47:19 AM (12 years ago)

Author:

raasch

Message:

scalar quantities can be excluded from Rayleigh damping; bugfix for long lines in configuration file with more than 300 characters

File:

• palm/trunk/SOURCE/prognostic_equations.f90 (modified) (10 diffs)

palm/trunk/SOURCE/prognostic_equations.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
+! new factor rdf_sc allows separate Rayleigh damping of scalars
 !
 ! Former revisions:
@@ -511 +512 @@
                                      sbt * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) &
                                    ) -                                         &
-                           tsc(5) * rdf(k) * ( pt(k,j,i) - pt_init(k) )
+                           tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) )
           ENDDO
 
@@ -602 +603 @@
                                      sbt * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) &
                                       ) -                                      &
-                              tsc(5) * rdf(k) * ( sa(k,j,i) - sa_init(k) )
+                              tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) )
                 IF ( sa_p(k,j,i) < 0.0 )  sa_p(k,j,i) = 0.1 * sa(k,j,i)
              ENDDO
@@ -723 +724 @@
                                       sbt * tend(k,j,i) + tsc(3) * tq_m(k,j,i) &
                                      ) -                                       &
-                             tsc(5) * rdf(k) * ( q(k,j,i) - q_init(k) )
+                             tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) )
                 IF ( q_p(k,j,i) < 0.0 )  q_p(k,j,i) = 0.1 * q(k,j,i)
              ENDDO
@@ -1216 +1217 @@
                                tsc(2) * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) &
                                    ) -                                      &
-                           tsc(5) * rdf(k) * ( pt(k,j,i) - pt_init(k) )
+                           tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) )
           ENDDO
 
@@ -1266 +1267 @@
                                tsc(2) * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) &
                                       ) -                                   &
-                             tsc(5) * rdf(k) * ( sa(k,j,i) - sa_init(k) )
+                             tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) )
                 IF ( sa_p(k,j,i) < 0.0 )  sa_p(k,j,i) = 0.1 * sa(k,j,i)
              ENDDO
@@ -1346 +1347 @@
                                 tsc(2) * tend(k,j,i) + tsc(3) * tq_m(k,j,i) &
                                      ) -                                    &
-                             tsc(5) * rdf(k) * ( q(k,j,i) - q_init(k) )
+                             tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) )
                 IF ( q_p(k,j,i) < 0.0 )  q_p(k,j,i) = 0.1 * q(k,j,i)
              ENDDO
@@ -1846 +1847 @@
                                      sbt * tend(k,j,i) + tsc(3) * tpt_m(k,j,i) &
                                    ) -                                         &
-                           tsc(5) * rdf(k) * ( pt(k,j,i) - pt_init(k) )
+                           tsc(5) * rdf_sc(k) * ( pt(k,j,i) - pt_init(k) )
           ENDDO
        ENDDO
@@ -1940 +1941 @@
                                      sbt * tend(k,j,i) + tsc(3) * tsa_m(k,j,i) &
                                       ) -                                      &
-                              tsc(5) * rdf(k) * ( sa(k,j,i) - sa_init(k) )
+                              tsc(5) * rdf_sc(k) * ( sa(k,j,i) - sa_init(k) )
                 IF ( sa_p(k,j,i) < 0.0 )  sa_p(k,j,i) = 0.1 * sa(k,j,i)
              ENDDO
@@ -2065 +2066 @@
                                       sbt * tend(k,j,i) + tsc(3) * tq_m(k,j,i) &
                                      ) -                                       &
-                             tsc(5) * rdf(k) * ( q(k,j,i) - q_init(k) )
+                             tsc(5) * rdf_sc(k) * ( q(k,j,i) - q_init(k) )
                 IF ( q_p(k,j,i) < 0.0 )  q_p(k,j,i) = 0.1 * q(k,j,i)
              ENDDO