Changeset 8a65cb0 in flexpart.git for src/initialize.f90

Timestamp:

Mar 2, 2015, 3:11:55 PM (9 years ago)

Author:

Espen Sollum ATMOS <espen@…>

Branches:

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

Children:

1d207bb

Parents:

60403cd

Message:

Added code, makefile for dev branch

File:

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

src/initialize.f90

@@ -69 +69 @@
   use interpol_mod
   use hanna_mod
+  use random_mod, only: ran3
 
   implicit none
@@ -75 +76 @@
   integer :: ldt,nrand
   integer(kind=2) :: icbt
-  real :: zt,dz,dz1,dz2,up,vp,wp,usigold,vsigold,wsigold,ran3
+  real :: zt,dz,dz1,dz2,up,vp,wp,usigold,vsigold,wsigold
   real(kind=dp) :: xt,yt
   save idummy
@@ -155 +156 @@
     vp=rannumb(nrand+1)*sigv
     wp=rannumb(nrand+2)
-    if (.not.turbswitch) wp=wp*sigw
+    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
+        end if            
+    end if