Changeset 5fc7b68 in flexpart.git

Timestamp:

Jul 16, 2019, 8:45:29 AM (5 years ago)

Author:

Ignacio Pisso <ip@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug

Children:

95a45d3

Parents:

7cebaf3

Message:

small changes in get_wetscav, check positivity of alpha

Location:

src

Files:

• FLEXPART.f90 (modified) (1 diff)
• get_wetscav.f90 (modified) (2 diffs)

src/FLEXPART.f90

@@ -80 +80 @@
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-14)'
+  flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-16)'
   verbosity=0
 

src/get_wetscav.f90

@@ -295 +295 @@
             liq_frac=0
             ice_frac=1
-          else if (act_temp .ge. 273.15) then
+          else if (act_temp .ge. 273.) then
             liq_frac=1
             ice_frac=0
@@ -302 +302 @@
 ! IP bugfix v10.4, calculate ice_frac and liq_frac
             ice_frac= ((act_temp-273.)/(273.-253.))**2.
-            liq_frac = 1-ice_frac   !((act_temp-253.)/(273.-253.))**2.
-
+            !liq_frac = 1-ice_frac   !((act_temp-253.)/(273.-253.))**2.
+            liq_frac=max(0.,1.-ice_frac)
           end if
 ! ZHG: Calculate the aerosol partition based on cloud phase and Ai and Bi