Changeset 1361 for palm/trunk/SOURCE/advec_ws.f90

Timestamp:

Apr 16, 2014 3:17:48 PM (11 years ago)

Author:

hoffmann

Message:

improved version of two-moment cloud physics

File:

• palm/trunk/SOURCE/advec_ws.f90 (modified) (5 diffs)

palm/trunk/SOURCE/advec_ws.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! accelerator and vector version for qr and nr added
 ! 
 ! Former revisions:
@@ -2233 +2233 @@
        USE statistics,                                                        &
            ONLY:  sums_wspts_ws_l, sums_wsqs_ws_l, sums_wssas_ws_l,           &
-                  weight_substep
+                  sums_wsqrs_ws_l, sums_wsnrs_ws_l, weight_substep
 
        IMPLICIT NONE
@@ -2656 +2656 @@
                         *   weight_substep(intermediate_timestep_count)
                     ENDDO
+                 CASE ( 'qr' )
+                    DO  k = nzb, nzt
+                       sums_wsqrs_ws_l(k,tn) = sums_wsqrs_ws_l(k,tn)         &
+                        + ( flux_t(k) + diss_t(k) )                          &
+                        *   weight_substep(intermediate_timestep_count)
+                    ENDDO
+                 CASE ( 'nr' )
+                    DO  k = nzb, nzt
+                       sums_wsnrs_ws_l(k,tn) = sums_wsnrs_ws_l(k,tn)         &
+                        + ( flux_t(k) + diss_t(k) )                          &
+                        *   weight_substep(intermediate_timestep_count)
+                    ENDDO
 
               END SELECT
@@ -2690 +2702 @@
 !        USE statistics,                                                       &
 !            ONLY:  sums_wspts_ws_l, sums_wsqs_ws_l, sums_wssas_ws_l,          &
-!                   weight_substep
+!                   sums_wsqrs_ws_l, sums_wsnrs_ws_l, weight_substep
 
        IMPLICIT NONE
@@ -2975 +2987 @@
 !                   CASE ( 'q' )
 !                      sums_wsqs_ws_l(k,tn) = sums_wsqs_ws_l(k,tn)           &
-!                      + ( flux_t + diss_t )                                &
+!                      + ( flux_t + diss_t )                                 &
+!                      *   weight_substep(intermediate_timestep_count)
+!                   CASE ( 'qr' )
+!                      sums_wsqrs_ws_l(k,tn) = sums_wsqrs_ws_l(k,tn)         &
+!                      + ( flux_t + diss_t )                                 &
+!                      *   weight_substep(intermediate_timestep_count)
+!                   CASE ( 'nr' )
+!                      sums_wsnrs_ws_l(k,tn) = sums_wsnrs_ws_l(k,tn)         &
+!                      + ( flux_t + diss_t )                                 &
 !                      *   weight_substep(intermediate_timestep_count)
 !