Changeset 5f9d14a in flexpart.git for src/readwind_mpi.f90

Timestamp:

Apr 8, 2015, 2:23:27 PM (9 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:

1585284

Parents:

cd85138

Message:

Updated wet depo scheme

File:

• src/readwind_mpi.f90 (modified) (5 diffs, 1 prop)

src/readwind_mpi.f90

@@ -41 +41 @@
 !  eso 2014:
 !    This version for reading windfields in advance by a separate
-!    MPI process. 
+!    MPI process.
+!    TODO: can be merged with readwind.f90 if using numwfmem in
+!          shift_field
 !**********************************************************************
 !                                                                     *
@@ -97 +99 @@
   integer :: isec1(56),isec2(22+nxmax+nymax)
   real(kind=4) :: zsec4(jpunp)
-  real(kind=4) :: xaux,yaux,xaux0,yaux0
+  real(kind=4) :: xaux,yaux
   real(kind=8) :: xauxin,yauxin
   real,parameter :: eps=1.e-4
@@ -103 +105 @@
   real :: plev1,pmean,tv,fu,hlev1,ff10m,fflev1,conversion_factor
 
-  logical :: hflswitch,strswitch, readcloud
+  logical :: hflswitch,strswitch !,readcloud
 
 !HSO  grib api error messages
@@ -115 +117 @@
   strswitch=.false.
 !hg
-  readcloud=.false.
+!  readcloud=.false.
 !hg end
   levdiff2=nlev_ec-nwz+1
@@ -234 +236 @@
     elseif ((parCat.eq.4).and.(parNum.eq.9).and.(typSurf.eq.1)) then ! SR
       isec1(6)=176         ! indicatorOfParameter
-    elseif ((parCat.eq.2).and.(parNum.eq.17) .or. parId .eq. 180) then ! EWSS
+!    elseif ((parCat.eq.2).and.(parNum.eq.17) .or. parId .eq. 180) then ! EWSS --wrong
+    elseif ((parCat.eq.2).and.(parNum.eq.38) .or. parId .eq. 180) then ! EWSS --correct
       isec1(6)=180         ! indicatorOfParameter
-    elseif ((parCat.eq.2).and.(parNum.eq.18) .or. parId .eq. 181) then ! NSSS
+!    elseif ((parCat.eq.2).and.(parNum.eq.18) .or. parId .eq. 181) then ! NSSS --wrong
+    elseif ((parCat.eq.2).and.(parNum.eq.37) .or. parId .eq. 181) then ! NSSS --correct
       isec1(6)=181         ! indicatorOfParameter
     elseif ((parCat.eq.3).and.(parNum.eq.4)) then ! ORO