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

Timestamp:

Apr 17, 2020 4:14:16 PM (4 years ago)

Author:

schwenkel

Message:

Implementation of ice microphysics

File:

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

palm/trunk/SOURCE/advec_ws.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Implementation of ice microphysics
+! 
+! 4469 2020-03-23 14:31:00Z suehring
 ! fix mistakenly committed version
 !
@@ -240 +243 @@
                sums_wssas_ws_l, sums_wsus_ws_l, sums_wsvs_ws_l,                &
                sums_wsqcs_ws_l, sums_wsqrs_ws_l,                               &
+               sums_wsqis_ws_l, sums_wsnis_ws_l,                               &
                sums_wsncs_ws_l, sums_wsnrs_ws_l,                               &
                hom, weight_substep
@@ -1938 +1942 @@
              ENDDO
 
+          CASE ( 'qi' )
+
+             DO  k = nzb, nzt
+                sums_wsqis_ws_l(k,tn)  = sums_wsqis_ws_l(k,tn) +               &
+                    ( flux_t(k) / ( w(k,j,i) + SIGN( 1.0E-20_wp, w(k,j,i) ) )  &
+                                * ( w(k,j,i) - hom(k,1,3,0)                 )  &
+                    + diss_t(k) / ( ABS(w(k,j,i)) + 1.0E-20_wp              )  &
+                                *   ABS( w(k,j,i) - hom(k,1,3,0)            )  &
+                    ) * weight_substep(intermediate_timestep_count)
+             ENDDO
 
           CASE ( 'qr' )
@@ -1954 +1968 @@
              DO  k = nzb, nzt
                 sums_wsncs_ws_l(k,tn)  = sums_wsncs_ws_l(k,tn) +               &
+                    ( flux_t(k) / ( w(k,j,i) + SIGN( 1.0E-20_wp, w(k,j,i) ) )  &
+                                * ( w(k,j,i) - hom(k,1,3,0)                 )  &
+                    + diss_t(k) / ( ABS(w(k,j,i)) + 1.0E-20_wp              )  &
+                                *   ABS( w(k,j,i) - hom(k,1,3,0)            )  &
+                    ) * weight_substep(intermediate_timestep_count)
+             ENDDO
+
+          CASE ( 'ni' )
+
+             DO  k = nzb, nzt
+                sums_wsnis_ws_l(k,tn)  = sums_wsnis_ws_l(k,tn) +               &
                     ( flux_t(k) / ( w(k,j,i) + SIGN( 1.0E-20_wp, w(k,j,i) ) )  &
                                 * ( w(k,j,i) - hom(k,1,3,0)                 )  &
@@ -3798 +3823 @@
            CASE ( 'aerosol_mass', 'aerosol_number', 'salsa_gas' )
               sk_num = 9
+           CASE ( 'ni' )
+              sk_num = 10
+           CASE ( 'qi' )
+              sk_num = 11
            CASE DEFAULT
               sk_num = 0
@@ -3824 +3853 @@
        !$ACC PRESENT(sums_wsqrs_ws_l, sums_wsncs_ws_l) &
        !$ACC PRESENT(sums_wsnrs_ws_l, sums_wsss_ws_l) &
+       !$ACC PRESENT(sums_wsnis_ws_l, sums_wsqis_ws_l) &
        !$ACC PRESENT(sums_salsa_ws_l)
        DO  i = nxl, nxr
@@ -4517 +4547 @@
                                *   ABS(w(k,j,i) - hom(k,1,3,0)             )   &
                            ) * weight_substep(intermediate_timestep_count)
+                    CASE ( 10 )
+                       !$ACC ATOMIC
+                       sums_wsnis_ws_l(k,tn)  = sums_wsnis_ws_l(k,tn)          &
+                          + ( flux_t(k)                                        &
+                                / ( w(k,j,i) + SIGN( 1.0E-20_wp, w(k,j,i) ) )  &
+                                * ( w(k,j,i) - hom(k,1,3,0)                 )  &
+                            + diss_t(k)                                        &
+                                / ( ABS(w(k,j,i)) + 1.0E-20_wp              )  &
+                                *   ABS(w(k,j,i) - hom(k,1,3,0)             )  &
+                            ) * weight_substep(intermediate_timestep_count)
+                    CASE ( 11 )
+                       !$ACC ATOMIC
+                       sums_wsqis_ws_l(k,tn)  = sums_wsqis_ws_l(k,tn)          &
+                          + ( flux_t(k)                                        &
+                                / ( w(k,j,i) + SIGN( 1.0E-20_wp, w(k,j,i) ) )  &
+                                * ( w(k,j,i) - hom(k,1,3,0)                 )  &
+                            + diss_t(k)                                        &
+                                / ( ABS(w(k,j,i)) + 1.0E-20_wp              )  &
+                                *   ABS(w(k,j,i) - hom(k,1,3,0)             )  &
+                            ) * weight_substep(intermediate_timestep_count)
 
                 END SELECT