Changeset 2608 for palm/trunk/SOURCE/lpm_init.f90

Timestamp:

Nov 13, 2017 2:04:26 PM (6 years ago)

Author:

schwenkel

Message:

Inital revision of diagnostic_quantities_mod allows unified calculation of magnus equation and saturion mixing ratio

File:

• palm/trunk/SOURCE/lpm_init.f90 (modified) (3 diffs)

palm/trunk/SOURCE/lpm_init.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Calculation of magnus equation in external module (diagnostic_quantities_mod).
+! 
+! 2606 2017-11-10 10:36:31Z schwenkel
 ! Changed particle box locations: center of particle box now coincides 
 ! with scalar grid point of same index.
@@ -986 +989 @@
     USE constants,                                                             &
         ONLY: pi
+
+    USE diagnostic_quantities_mod,                                             &
+        ONLY:  magnus
+
 
     USE kinds
@@ -1124 +1131 @@
              t_int  = pt(kp,jp,ip) * ( hyp(kp) / 100000.0_wp )**0.286_wp
 
-             e_s = 611.0_wp * EXP( l_d_rv * ( 3.6609E-3_wp - 1.0_wp / t_int ) )
-             e_a = q(kp,jp,ip) * hyp(kp) / ( 0.378_wp * q(kp,jp,ip) + 0.622_wp )
+             e_s = magnus( t_int )
+             e_a = q(kp,jp,ip) * hyp(kp) / ( q(kp,jp,ip) + 0.622_wp )
 
              sigma   = 0.0761_wp - 0.000155_wp * ( t_int - 273.15_wp )