Changeset db712a8 in flexpart.git for src/initialize.f90

Timestamp:

Mar 3, 2016, 12:34:56 PM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

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

Children:

38b7917

Parents:

b0434e1

Message:

Completed handling of nested wind fields with cloud water (for wet deposition).

File:

• src/initialize.f90 (modified) (2 diffs)

src/initialize.f90

@@ -99 +99 @@
   jyp=jy+1
 
-  h=max(hmix(ix ,jy ,1,memind(1)), &
+  h=max(hmix(ix ,jy,1,memind(1)), &
        hmix(ixp,jy ,1,memind(1)), &
        hmix(ix ,jyp,1,memind(1)), &
@@ -157 +157 @@
     wp=rannumb(nrand+2)
     if (.not.turbswitch) then     ! modified by mc
+      wp=wp*sigw
+    else if (cblflag.eq.1) then   ! modified by mc
+      if(-h/ol.gt.5) then
+!if (ol.lt.0.) then
+!if (ol.gt.0.) then !by mc : only for test correct is lt.0
+        call initialize_cbl_vel(idummy,zt,ust,wst,h,sigw,wp,ol)
+      else
         wp=wp*sigw
-    else if (cblflag.eq.1) then   ! modified by mc
-        if(-h/ol.gt.5) then
-        !if (ol.lt.0.) then
-        !if (ol.gt.0.) then !by mc : only for test correct is lt.0
-            call initialize_cbl_vel(idummy,zt,ust,wst,h,sigw,wp,ol)
-        else
-            wp=wp*sigw
-        end if            
+      end if
     end if