diff --git a/definitions/grib2/section.3.def b/definitions/grib2/section.3.def index 1344be9f4..0c416ec11 100644 --- a/definitions/grib2/section.3.def +++ b/definitions/grib2/section.3.def @@ -113,12 +113,12 @@ concept gridType { "cross_section" = { gridDefinitionTemplateNumber=1000;PLPresent=0; } "Hovmoller" = { gridDefinitionTemplateNumber=1100;PLPresent=0; } "time_section" = { gridDefinitionTemplateNumber=1200;PLPresent=0; } - "lambert_lam" = { gridDefinitionTemplateNumber=33001; PLPresent=0; } - "mercator_lam" = { gridDefinitionTemplateNumber=33002; PLPresent=0; } - "polar_stereographic_lam" = { gridDefinitionTemplateNumber=33003; PLPresent=0; } - "lambert_bf" = { gridDefinitionTemplateNumber=33010; PLPresent=0; } - "mercator_bf" = { gridDefinitionTemplateNumber=33011; PLPresent=0; } - "polar_stereographic_bf" = { gridDefinitionTemplateNumber=33012; PLPresent=0; } + "lambert_lam" = { gridDefinitionTemplateNumber=33; PLPresent=0; } + "mercator_lam" = { gridDefinitionTemplateNumber=13; PLPresent=0; } + "polar_stereographic_lam" = { gridDefinitionTemplateNumber=23; PLPresent=0; } + "lambert_bf" = { gridDefinitionTemplateNumber=63; PLPresent=0; } + "mercator_bf" = { gridDefinitionTemplateNumber=61; PLPresent=0; } + "polar_stereographic_bf" = { gridDefinitionTemplateNumber=62; PLPresent=0; } "unknown" = {PLPresent=0;} "unknown_PLPresent" = {PLPresent=1;} } : dump; diff --git a/definitions/grib2/template.3.33002.def b/definitions/grib2/template.3.13.def similarity index 100% rename from definitions/grib2/template.3.33002.def rename to definitions/grib2/template.3.13.def diff --git a/definitions/grib2/template.3.33003.def b/definitions/grib2/template.3.23.def similarity index 100% rename from definitions/grib2/template.3.33003.def rename to definitions/grib2/template.3.23.def diff --git a/definitions/grib2/template.3.33001.def b/definitions/grib2/template.3.33.def similarity index 100% rename from definitions/grib2/template.3.33001.def rename to definitions/grib2/template.3.33.def diff --git a/definitions/grib2/template.3.33011.def b/definitions/grib2/template.3.61.def similarity index 67% rename from definitions/grib2/template.3.33011.def rename to definitions/grib2/template.3.61.def index cd8f2ac22..04ba90edc 100644 --- a/definitions/grib2/template.3.33011.def +++ b/definitions/grib2/template.3.61.def @@ -7,22 +7,16 @@ # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # -# TEMPLATE 3.33011, Bi-Fourier coefficients on Mercator projection +# TEMPLATE 3.61, Bi-Fourier coefficients on Mercator projection transient biFourierMakeTemplate = 0; +include "grib2/template.3.bf.def" + include "grib2/template.3.shape_of_the_earth.def"; -include "grib2/template.3.bf.part1.def" - include "grib2/template.3.10.part1.def" - include "grib2/template.3.10.part2.def" - include "grib2/template.3.10.part3.def" - -include "grib2/template.3.bf.part2.def" -include "grib2/template.3.bf.part3.def" - -# END 2/template.3.33011 ---------------------------------------------------------------------- +# END 2/template.3.61 ---------------------------------------------------------------------- diff --git a/definitions/grib2/template.3.33012.def b/definitions/grib2/template.3.62.def similarity index 66% rename from definitions/grib2/template.3.33012.def rename to definitions/grib2/template.3.62.def index 4c78e2be6..10f7eee57 100644 --- a/definitions/grib2/template.3.33012.def +++ b/definitions/grib2/template.3.62.def @@ -8,22 +8,18 @@ # -# TEMPLATE 3.33012, Bi-Fourier coefficients on polar stereographic projection +# TEMPLATE 3.62, Bi-Fourier coefficients on polar stereographic projection transient biFourierMakeTemplate = 0; +include "grib2/template.3.bf.def" + include "grib2/template.3.shape_of_the_earth.def"; transient oneThousand=1000; -include "grib2/template.3.bf.part1.def" - include "grib2/template.3.20.part1.def" - -include "grib2/template.3.bf.part2.def" - include "grib2/template.3.20.part2.def" -include "grib2/template.3.bf.part3.def" -# END 2/template.3.33012 ---------------------------------------------------------------------- +# END 2/template.3.62 ---------------------------------------------------------------------- diff --git a/definitions/grib2/template.3.33010.def b/definitions/grib2/template.3.63.def similarity index 76% rename from definitions/grib2/template.3.33010.def rename to definitions/grib2/template.3.63.def index 9ba3098a7..cf22bb31f 100644 --- a/definitions/grib2/template.3.33010.def +++ b/definitions/grib2/template.3.63.def @@ -7,24 +7,17 @@ # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. # -# TEMPLATE 3.33010, BiFourier coefficients on lambert projection +# TEMPLATE 3.63, BiFourier coefficients on lambert projection transient biFourierMakeTemplate = 0; -include "grib2/template.3.bf.part1.def" +include "grib2/template.3.bf.def" include "grib2/template.3.shape_of_the_earth.def"; -include "grib2/template.3.bf.part2.def" - include "grib2/template.3.30.part1.def" - include "grib2/template.3.30.part2.def" - -include "grib2/template.3.bf.part3.def" - include "grib2/template.3.30.part3.def" - include "grib2/template.3.30.part4.def" diff --git a/definitions/grib2/template.3.bf.part3.def b/definitions/grib2/template.3.bf.def similarity index 65% rename from definitions/grib2/template.3.bf.part3.def rename to definitions/grib2/template.3.bf.def index 17351e85a..804be828c 100644 --- a/definitions/grib2/template.3.bf.part3.def +++ b/definitions/grib2/template.3.bf.def @@ -1,3 +1,17 @@ +label "BiFourier coefficients"; +constant biFourierCoefficients=1; + +codetable[1] spectralType ('3.6.table',masterDir,localDir) = 99 : no_copy; +alias spectralDataRepresentationType=spectralType; + + + +unsigned[4] biFourierResolutionParameterN : dump; + +unsigned[4] biFourierResolutionParameterM : dump; + +codetable[1] biFourierTruncationType ('3.99.table',masterDir,localDir) : dump; + # Lx - Full domain length in X-direction unsigned[8] Lx; meta geography.LxInMetres scale(Lx,one,thousand) : dump; diff --git a/definitions/grib2/template.3.bf.part1.def b/definitions/grib2/template.3.bf.part1.def deleted file mode 100644 index 8379d2fd1..000000000 --- a/definitions/grib2/template.3.bf.part1.def +++ /dev/null @@ -1,7 +0,0 @@ -label "BiFourier coefficients"; -constant biFourierCoefficients=1; - -codetable[1] spectralType ('3.6.table',masterDir,localDir) = 99 : no_copy; -alias spectralDataRepresentationType=spectralType; - - diff --git a/definitions/grib2/template.3.bf.part2.def b/definitions/grib2/template.3.bf.part2.def deleted file mode 100644 index f42038859..000000000 --- a/definitions/grib2/template.3.bf.part2.def +++ /dev/null @@ -1,7 +0,0 @@ - -unsigned[4] biFourierResolutionParameterN : dump; - -unsigned[4] biFourierResolutionParameterM : dump; - -codetable[1] biFourierTruncationType ('3.99.table',masterDir,localDir) : dump; - diff --git a/tests/lam_bf.sh b/tests/lam_bf.sh index 728475da9..ecc12da06 100755 --- a/tests/lam_bf.sh +++ b/tests/lam_bf.sh @@ -11,3 +11,4 @@ . ./include.sh exec $test_dir/lam_bf +#xterm -e gdb $test_dir/lam_bf