Changeset de4c5e9 in flexpart.git

Timestamp:

Oct 5, 2017, 9:09:23 AM (7 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:

7233c03

Parents:

08a38b5

Message:

Added option to output particle count per grid cell. Deleted some unused .f90 files.

Location:

src

Files:

• gridcheck_emos.f90 (deleted)
• gridcheck_fnl.f90 (deleted)
• gridcheck_gfs_emos.f90 (deleted)
• gridcheck_nests_emos.f90 (deleted)
• gridcheck_orig_ecmwf.f90 (deleted)
• makefile (modified) (1 diff)
• par_mod.f90 (modified) (2 diffs)
• readlanduse_int1.f90 (deleted)
• readwind.f90 (deleted)
• readwind_gfs_emos.f90 (deleted)
• readwind_mpi.f90 (deleted)
• readwind_nests_emos.f90 (deleted)
• verttransform.f90 (deleted)
• verttransform_ecmwf.f90 (modified) (8 diffs)

src/makefile

@@ -64 +64 @@
         MPIF90    = /usr/bin/mpif90.openmpi
 
-        INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
+        INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
         INCPATH2 = /usr/include
-        LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
+        LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
 endif
 

src/par_mod.f90

@@ -58 +58 @@
   !****************************************************************
 
-  logical, parameter :: lnokernel=.false.
+  logical, parameter :: lnokernel=.true.
 
   !*********************************************************************
@@ -218 +218 @@
   !**************************************************
 
-  integer,parameter :: maxpart=3000000
-  integer,parameter :: maxspec=4
+  integer,parameter :: maxpart=300000000
+  integer,parameter :: maxspec=1
 
   real,parameter :: minmass=0.0001

src/verttransform_ecmwf.f90

@@ -53 +53 @@
 ! Marian Harustak, 12.5.2017 
 !     - Renamed from verttransform to verttransform_ecmwf
-!
+!*****************************************************************************
+! Date: 2017-05-30 modification of a bug in ew. Don Morton (CTBTO project)   *
 !*****************************************************************************
 !                                                                            *
@@ -96 +97 @@
 
   logical :: init = .true.
+  logical :: init_w = .false.
+  logical :: init_r = .true.
+
 
   !ZHG SEP 2014 tests  
@@ -108 +112 @@
   ! CHARACTER(LEN=3)  :: aspec
   ! integer :: virr=0
-  real :: tot_cloud_h
-  real :: dbg_height(nzmax) 
+  !real :: tot_cloud_h
+  !real :: dbg_height(nzmax) 
 !ZHG
 
@@ -128 +132 @@
   if (init) then
 
+
+    if (init_r) then
+
+        open(333,file='heights.txt', &
+          form='formatted')
+        do kz=1,nuvz
+            read(333,*) height(kz)
+        end do
+        close(333)
+        write(*,*) 'height read'
+    else
+
+
 ! Search for a point with high surface pressure (i.e. not above significant topography)
 ! Then, use this point to construct a reference z profile, to be used at all times
@@ -166 +183 @@
     end do
 
+    if (init_w) then
+        open(333,file='heights.txt', &
+          form='formatted')
+        do kz=1,nuvz
+              write(333,*) height(kz)
+        end do
+        close(333)
+    endif
+
+    endif ! init
 
 ! Determine highest levels that can be within PBL
@@ -183 +210 @@
     init=.false.
 
-    dbg_height = height
+!    dbg_height = height
 
   endif
@@ -603 +630 @@
         convp=convprec(ix,jy,1,n)
         prec=lsp+convp
-        tot_cloud_h=0
+!        tot_cloud_h=0
 ! Find clouds in the vertical
         do kz=1, nz-1 !go from top to bottom
@@ -609 +636 @@
 ! assuming rho is in kg/m3 and hz in m gives: kg/kg * kg/m3 *m3/kg /m = m2/m3 
             clw(ix,jy,kz,n)=(clwc(ix,jy,kz,n)*rho(ix,jy,kz,n))*(height(kz+1)-height(kz))
-            tot_cloud_h=tot_cloud_h+(height(kz+1)-height(kz)) 
+!            tot_cloud_h=tot_cloud_h+(height(kz+1)-height(kz)) 
             
 !            icloud_stats(ix,jy,4,n)= icloud_stats(ix,jy,4,n)+clw(ix,jy,kz,n)          ! Column cloud water [m3/m3]