diff --git a/ChangeLog b/ChangeLog index a61ca2bcaff27d72db22c4670c8abd7c2ab44fa2..3de66f0466465091b13d7b52bbe041a4b544ab07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-12-15 Manfred Brath <manfred.brath@uni-hamburg.de> + + * ARTS-XML-DATA-2-3-20 + + * planets/Earth/ECMWF/IFS/Eresmaa_137L: + + Corrected wind direction within the surface data and corrected the README. + 2015-11-17 Oliver Lemke <olemke@core-dump.info> * ARTS-XML-DATA-2-3-19 diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/ConvertCompactAtm_ArrayOfMatrix-to-ArrayOfGriddedField4.arts b/planets/Earth/ECMWF/IFS/Eresmaa_137L/ConvertCompactAtm_ArrayOfMatrix-to-ArrayOfGriddedField4.arts index 64374cd2b5a5f1fca5edb0209544b2d9766c1e8f..a4468e3081553330c975d696ee040d165e00961b 100644 --- a/planets/Earth/ECMWF/IFS/Eresmaa_137L/ConvertCompactAtm_ArrayOfMatrix-to-ArrayOfGriddedField4.arts +++ b/planets/Earth/ECMWF/IFS/Eresmaa_137L/ConvertCompactAtm_ArrayOfMatrix-to-ArrayOfGriddedField4.arts @@ -7,7 +7,7 @@ Arts2 { ## ./arts/build/src/arts arts-xml-data/planets/Earth/ECMWF/IFS/Eresmaa_137L/ConvertCompactAtm_ArrayOfMatrix-to-ArrayOfGriddedField4.arts StringCreate( datapath ) - StringSet( datapath, "arts-xml-data/planets/Earth/ECMWF/IFS/Eresmaa_137L/" ) + StringSet( datapath, "./" ) ArrayOfStringCreate( filenames ) ArrayOfStringCreate( fieldnames ) ArrayOfStringCreate( filenames_extra ) diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/README b/planets/Earth/ECMWF/IFS/Eresmaa_137L/README index f088336831fbbcd9bbf08f188a7494aa7ef49a5b..0c84bd6951b33ea75389a7d0b0d92df213ff90ab 100644 --- a/planets/Earth/ECMWF/IFS/Eresmaa_137L/README +++ b/planets/Earth/ECMWF/IFS/Eresmaa_137L/README @@ -33,7 +33,7 @@ Files 5) 2m Temperature [K] 6) 2m Dew point temperature [K] 7) 10m wind speed [m/s] - 8) 10m wind direction [0-360 DEG] + 8) 10m wind direction [-180 to 180 DEG] (to where the wind blows) 9) Stratiform precipitation at surface [m] 10) Convective precipitation at surface [m] 11) Snowfall at surface [m] (water equival.) diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol.xml.gz index ed9efcebd015cd59f7ca4faaf5543c42b351244f..602a656cc67259ab33f449847b0c058e77901959 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_extra.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_extra.xml.gz index c788b959a41740da8e261c3be3ac2ec7e871371c..ad602e560baddbd07c9bd2e3ad8ad179d8225d7a 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_extra.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_extra.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_surface.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_surface.xml.gz index f36eb0a99ba91c7d2174e96724f37bd38175a743..9225869e197b85499db1fcaa1b10d8796e97a86c 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_surface.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_ccol_surface.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz.xml.gz index 57addc0c59bee1ec66eb31eb00d4381cf0720239..beafd16cf186b9528615cdd1b736524c2e945c61 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_extra.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_extra.xml.gz index b34a1f442ec4d37468eb6f16abd34cb9456b12d6..917e3f4baf189784d807db16f44655d06aadc56e 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_extra.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_extra.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_surface.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_surface.xml.gz index 439fda794d33484854d87a6765b48e3309e42198..bd52aa4abf5b60daf9c7f2346fc82641bc3e51b9 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_surface.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_oz_surface.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q.xml.gz index ed4bb630add5b7d48bef91b625d53b1179c3205e..77a8c66f065ded979344ddcb4a786401422a8c39 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_extra.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_extra.xml.gz index 438db444bc73530b6194acb2c40726f995536f11..41fedef59f774927fdd865a264755a7f296572db 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_extra.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_extra.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_surface.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_surface.xml.gz index 4456835cbd4f08187909483b2316110b83ddc738..2c9cee5e37ebc6d36c0a16acfc1cae90fe1935c5 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_surface.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_q_surface.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol.xml.gz index f89ea4af3fd87de4670acfc08048a82b400ed00b..2dcb6bfa58640a265bd08ae18b0d52ec238a3f41 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_extra.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_extra.xml.gz index f1e416477d63259f898e37c23581b8b79136dfe4..32bdf9dc21a16a3c41a21ed49f46982639123073 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_extra.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_extra.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_surface.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_surface.xml.gz index fe83bff733db7bc542cff758c7ea3341cea68da1..54554bc0e131f54780b7e8c3644c06d4e6aa3f97 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_surface.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_rcol_surface.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t.xml.gz index 2de11c3b30e0248f71f59ee502b9a7c831710b8d..62fae437b371f6c9467ffa9251b5376358ffde48 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_extra.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_extra.xml.gz index e96d856990be76326db12402cadb10ceb8b4a739..8adb03e39caddd0edce8deb25ecfc6def11410a2 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_extra.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_extra.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_surface.xml.gz b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_surface.xml.gz index c72b77445ac39c5a92770370552c7c17aab1be99..ad791036d6c820d0792afedb3cbc19a67df3bdd0 100644 Binary files a/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_surface.xml.gz and b/planets/Earth/ECMWF/IFS/Eresmaa_137L/eresmaal137_all_t_surface.xml.gz differ diff --git a/planets/Earth/ECMWF/IFS/Eresmaa_137L/extract_arts_l137.f90 b/planets/Earth/ECMWF/IFS/Eresmaa_137L/extract_arts_l137.f90 index 6634137d9b104016265f5bdf980d6f207e258a8d..7286bb05950c5f4557262c3962d9ae54262ca7bd 100644 --- a/planets/Earth/ECMWF/IFS/Eresmaa_137L/extract_arts_l137.f90 +++ b/planets/Earth/ECMWF/IFS/Eresmaa_137L/extract_arts_l137.f90 @@ -216,8 +216,10 @@ end SUBROUTINE delta_z SUBROUTINE wind_speed_and_direction(vx,vy,wspeed,wdir) ! wspeed : wind speed [m/s] - ! wdir : wind direction [0-360 degrees] - ! CAUTION: The meteorological wind direction is the direction where the wind comes from. + ! wdir : wind direction [-180 to 180 degrees] + ! Zero degree is north. Physical flow direction. + ! This means, the direction is to where the wind blows. + ! ! vx, vy : 2d vector components of the wind implicit none @@ -228,20 +230,7 @@ SUBROUTINE wind_speed_and_direction(vx,vy,wspeed,wdir) wspeed = sqrt(vx**2 + vy**2) ! calculate the wind direction - if (vx == 0.0) then - ! it is a straight wind either from the north or the south - if (vy < 0) then - wdir = 0 ! wind comes straight from the north - else - wdir = 180. ! wind comes straight from the south - endif - else - ! other wind directions - wdir = 90 - atan(vy/vx) - if ((vx > 0. .and. vy > 0.) .or. (vx > 0 .and. vy < 0) ) then - wdir = wdir + 180. - endif - endif + wdir = -atan2(vx,vy)*180/3.141592653589793; return