Changeset 553d0a7 in flexpart.git

Timestamp:

Nov 7, 2022, 10:31:29 AM (18 months ago)

Author:

Pirmin Kaufmann <pirmin.kaufmann@…>

Branches:

scaling-bug

Parents:

49e63b9

Message:

Removed conversion factor for CP in GRIB2. Changed conversion factor for SDE (snow depth) and added recognition of SD (water equivalent) parameterNumber in GRIB2.

Location:

src

Files:

• readwind_ecmwf.f90 (modified) (3 diffs)
• readwind_ecmwf_mpi.f90 (modified) (3 diffs)

src/readwind_ecmwf.f90

@@ -201 +201 @@
     elseif ((parCat.eq.0).and.(parNum.eq.6).and.(typSurf.eq.103)) then ! 2D
       isec1(6)=168         ! indicatorOfParameter
-    elseif ((parCat.eq.1).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SD
+    elseif ((parCat.eq.1).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SDE
       isec1(6)=141         ! indicatorOfParameter
-      conversion_factor=1000.
+      conversion_factor=0.1  ! convert snow depth to water equivalent
+    elseif ((parCat.eq.1).and.(parNum.eq.254).and.(typSurf.eq.1)) then ! SD
+      isec1(6)=141         ! indicatorOfParameter
     elseif ((parCat.eq.6).and.(parNum.eq.1) .or. parId .eq. 164) then ! CC
       isec1(6)=164         ! indicatorOfParameter
     elseif ((parCat.eq.1).and.(parNum.eq.9) .or. parId .eq. 142) then ! LSP
       isec1(6)=142         ! indicatorOfParameter
-    elseif ((parCat.eq.1).and.(parNum.eq.10)) then ! CP
+    elseif ((parCat.eq.1).and.(parNum.eq.10)) then ! ACPCP
       isec1(6)=143         ! indicatorOfParameter
-      conversion_factor=1000.
     elseif ((parCat.eq.0).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SHF
       isec1(6)=146         ! indicatorOfParameter
@@ -305 +306 @@
            zsec4(nxfield*(ny-j-1)+i+1)
       if(isec1(6).eq.141) sd(i,j,1,n)= &!! SNOW DEPTH
-           zsec4(nxfield*(ny-j-1)+i+1)/conversion_factor
+           zsec4(nxfield*(ny-j-1)+i+1)*conversion_factor
       if(isec1(6).eq.151) msl(i,j,1,n)= &!! SEA LEVEL PRESS.
            zsec4(nxfield*(ny-j-1)+i+1)
@@ -323 +324 @@
       endif
       if(isec1(6).eq.143) then                      !! CONVECTIVE PREC.
-        convprec(i,j,1,n)=zsec4(nxfield*(ny-j-1)+i+1)/conversion_factor
+        convprec(i,j,1,n)=zsec4(nxfield*(ny-j-1)+i+1)
         if (convprec(i,j,1,n).lt.0.) convprec(i,j,1,n)=0.
       endif

src/readwind_ecmwf_mpi.f90

@@ -211 +211 @@
     elseif ((parCat.eq.0).and.(parNum.eq.6).and.(typSurf.eq.103)) then ! 2D
       isec1(6)=168         ! indicatorOfParameter
-    elseif ((parCat.eq.1).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SD
+    elseif ((parCat.eq.1).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SDE
       isec1(6)=141         ! indicatorOfParameter
-      conversion_factor=1000.
+      conversion_factor=0.1  ! convert snow depth to water equivalent
+    elseif ((parCat.eq.1).and.(parNum.eq.254).and.(typSurf.eq.1)) then ! SD
+      isec1(6)=141         ! indicatorOfParameter
     elseif ((parCat.eq.6).and.(parNum.eq.1) .or. parId .eq. 164) then ! CC
       isec1(6)=164         ! indicatorOfParameter
     elseif ((parCat.eq.1).and.(parNum.eq.9) .or. parId .eq. 142) then ! LSP
       isec1(6)=142         ! indicatorOfParameter
-    elseif ((parCat.eq.1).and.(parNum.eq.10)) then ! CP
+    elseif ((parCat.eq.1).and.(parNum.eq.10)) then ! ACPCP
       isec1(6)=143         ! indicatorOfParameter
-      conversion_factor=1000.
     elseif ((parCat.eq.0).and.(parNum.eq.11).and.(typSurf.eq.1)) then ! SHF
       isec1(6)=146         ! indicatorOfParameter
@@ -315 +316 @@
            zsec4(nxfield*(ny-j-1)+i+1)
       if(isec1(6).eq.141) sd(i,j,1,n)= &!! SNOW DEPTH
-           zsec4(nxfield*(ny-j-1)+i+1)/conversion_factor
+           zsec4(nxfield*(ny-j-1)+i+1)*conversion_factor
       if(isec1(6).eq.151) msl(i,j,1,n)= &!! SEA LEVEL PRESS.
            zsec4(nxfield*(ny-j-1)+i+1)
@@ -333 +334 @@
       endif
       if(isec1(6).eq.143) then                      !! CONVECTIVE PREC.
-        convprec(i,j,1,n)=zsec4(nxfield*(ny-j-1)+i+1)/conversion_factor
+        convprec(i,j,1,n)=zsec4(nxfield*(ny-j-1)+i+1)
         if (convprec(i,j,1,n).lt.0.) convprec(i,j,1,n)=0.
       endif