Changeset 1884 for palm/trunk

Timestamp:

Apr 21, 2016 11:11:40 AM (9 years ago)

Author:

hoffmann

Message:

conservation of mass only chekced if collisions take place

File:

• palm/trunk/SOURCE/lpm_droplet_collision.f90 (modified) (2 diffs)

palm/trunk/SOURCE/lpm_droplet_collision.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!
+! Conservation of should only be checked if collisions took place.
 !
 ! Former revisions:
@@ -505 +505 @@
        ENDIF
  
+!
+!--    Check if LWC is conserved during collision process
+       IF ( ql_v(k,j,i) /= 0.0_wp )  THEN
+          IF ( ql_vp(k,j,i) / ql_v(k,j,i) >= 1.0001_wp  .OR.                      &
+               ql_vp(k,j,i) / ql_v(k,j,i) <= 0.9999_wp )  THEN
+             WRITE( message_string, * ) ' LWC is not conserved during',           &
+                                        ' collision! ',                           &
+                                        ' LWC after condensation: ', ql_v(k,j,i), &
+                                        ' LWC after collision: ', ql_vp(k,j,i)
+             CALL message( 'lpm_droplet_collision', 'PA0040', 2, 2, -1, 6, 1 )
+          ENDIF
+       ENDIF
+
     ENDIF
-    
-
-!
-!-- Check if LWC is conserved during collision process
-    IF ( ql_v(k,j,i) /= 0.0_wp )  THEN
-       IF ( ql_vp(k,j,i) / ql_v(k,j,i) >= 1.0001_wp  .OR.                      &
-            ql_vp(k,j,i) / ql_v(k,j,i) <= 0.9999_wp )  THEN
-          WRITE( message_string, * ) ' LWC is not conserved during',           &
-                                     ' collision! ',                           &
-                                     ' LWC after condensation: ', ql_v(k,j,i), &
-                                     ' LWC after collision: ', ql_vp(k,j,i)
-          CALL message( 'lpm_droplet_collision', 'PA0040', 2, 2, -1, 6, 1 )
-       ENDIF
-    ENDIF
-
+ 
     CALL cpu_log( log_point_s(43), 'lpm_droplet_coll', 'stop' )