From 14752dc8f9b6c7ec3ebb8ca698481b8479098728 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Thu, 16 Jun 2016 18:52:29 +0100 Subject: [PATCH 1/8] ECC-200 Update tools dox files --- tools/grib_copy.dox | 25 ++-- tools/grib_dump.dox | 227 +++---------------------------------- tools/grib_filter.dox | 61 +++++----- tools/grib_get.dox | 22 ++-- tools/grib_get_data.dox | 14 ++- tools/grib_index_build.dox | 14 ++- tools/grib_ls.dox | 34 +++--- tools/grib_set.dox | 19 ++-- 8 files changed, 127 insertions(+), 289 deletions(-) diff --git a/tools/grib_copy.dox b/tools/grib_copy.dox index 3889c481c..a2ca31f6a 100644 --- a/tools/grib_copy.dox +++ b/tools/grib_copy.dox @@ -11,25 +11,28 @@ \n \n -r \n Repack data. Sometimes after setting some keys involving properties of the packing algorithm a repacking of data is needed. This repacking is performed setting this -r option. - \n \n -p key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -p key[:{s/d/i}],key[:{s/d/i}],... \n Declaration of keys to print. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be requested. Default type is string. - \n \n -P key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -P key[:{s/d/i}],key[:{s/d/i}],... \n As -p adding the declared keys to the default list. - \n \n -w key[:{s/d/l}]=value,key[:{s/d/l}]=value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]=value,... \n Where clause. Only grib messages matching the key/value constraints are copied to the output_grib_file. - For each key a string (key:s) or a double (key:d) or a long (key:l) + A valid constraint is of type key=value or key!=value. + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be defined. Default type is string. \n \n -B order by directive \n - Order by. The output will be ordered according the order by directive. - Order by example: "step asc, centre desc" (step ascending and centre discending) + Order by. The output will be ordered according to the order by directive. + Order by example: "step asc, centre desc" (step ascending and centre descending) \n \n -V \n Version. \n \n -W width \n Minimum width of each column in output. Default is 10. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. \n \n -g \n Copy GTS header. \n \n -G \n GRIBEX compatibility mode. \n \n -7 \n Does not fail when the message has wrong length @@ -44,6 +47,10 @@ \verbatim > grib_copy -w levtype!=pl ../data/tigge_pf_ecmwf.grib2 out.grib \endverbatim\n +-# To copy only the first three fields from a file\n +\verbatim +> grib_copy -w count=1/2/3 ../data/tigge_pf_ecmwf.grib2 out.grib +\endverbatim\n -# A grib_file with multi field messages can be converted in single field messages with a simple grib_copy.\n \verbatim @@ -52,6 +59,6 @@ with a simple grib_copy.\n -# Use the square brackets to insert the value of a key in the name of the output file.\n \verbatim -> grib_copy in.grib out_[shortName].grib +> grib_copy in.grib 'out_[shortName].grib' \endverbatim\n */ diff --git a/tools/grib_dump.dox b/tools/grib_dump.dox index 1ba2d0d03..3cc006912 100644 --- a/tools/grib_dump.dox +++ b/tools/grib_dump.dox @@ -9,21 +9,29 @@ \section OPTIONS -O \n Octet mode. WMO documentation style dump. \n \n -D \n Debug mode. - \n \n -d \n Print all data values. Available only in C mode - \n \n -C \n C code mode. A C code program generating the grib message is dumped. + \n \n -d \n Print all data values. + \n \n -j \n JSON mode (JavaScript Object Notation). \n \n -t \n Print type information. \n \n -H \n Print octet content in hexadecimal format. \n \n -a \n Dump aliases. - \n \n -w key[:{s/d/l}]{=/!=}value,key[:{s/d/l}]{=/!=}value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]{=/!=}value,... \n Where clause. - Grib messages are processed only if they match all the key/value constraints. + Messages are processed only if they match all the key/value constraints. A valid constraint is of type key=value or key!=value. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be specified. Default type is string. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -s key[:{s/d/i}]=value,key[:{s/d/i}]=value,... \n + Key/values to set. + For each key a string (key:s), a double (key:d) or an integer (key:i) + type can be defined. By default the native type is set. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. \n \n -7 \n Does not fail when the message has wrong length \n \n -V \n Version. - \n \n -G \n GRIBEX compatibility mode. + \n \n -X offset \n + Input file offset in bytes. Processing of the input file will start from "offset". + \n \n -x \n Fast parsing option, only headers are loaded. \n \n \section grib_dump_examples grib_dump examples -# To dump in a WMO documentation style with hexadecimal octet values (-H).\n @@ -38,209 +46,4 @@ \verbatim > grib_dump -D ../data/regular_latlon_surface.grib1 \endverbatim\n --# To obtain a C code example from a grib file.\n -\code ->grib_dump -C ../data/regular_latlon_surface.grib1 -#include - -/* This code was generated automatically */ - - -int main(int argc,const char** argv) -{ - grib_handle *h = NULL; - size_t size = 0; - double* vdouble = NULL; - long* vlong = NULL; - FILE* f = NULL; - const char* p = NULL; - const void* buffer = NULL; - - if(argc != 2) { - fprintf(stderr,"usage: %s out\n",argv[0]); - exit(1); - } - - h = grib_handle_new_from_samples(NULL,"GRIB1"); - if(!h) { - fprintf(stderr,"Cannot create grib handle\n"); - exit(1); - } - - GRIB_CHECK(grib_set_long(h,"parametersVersion",1),0); - GRIB_CHECK(grib_set_long(h,"truncateLaplacian",0),0); - GRIB_CHECK(grib_set_long(h,"truncateDegrees",0),0); - GRIB_CHECK(grib_set_long(h,"dummy",1),0); - GRIB_CHECK(grib_set_long(h,"changingPrecision",0),0); - GRIB_CHECK(grib_set_long(h,"unitsFactor",1),0); - GRIB_CHECK(grib_set_long(h,"unitsBias",0),0); - GRIB_CHECK(grib_set_long(h,"timeRangeIndicatorFromStepRange",-1),0); - GRIB_CHECK(grib_set_long(h,"eps",0),0); - GRIB_CHECK(grib_set_long(h,"editionNumber",1),0); - GRIB_CHECK(grib_set_long(h,"productionStatusOfProcessedData",0),0); - GRIB_CHECK(grib_set_long(h,"table2Version",128),0); - - /* 98 = European Center for Medium-Range Weather Forecasts (grib1/0.table) */ - GRIB_CHECK(grib_set_long(h,"centre",98),0); - - GRIB_CHECK(grib_set_long(h,"generatingProcessIdentifier",130),0); - GRIB_CHECK(grib_set_long(h,"gridDefinition",255),0); - - /* 128 = 10000000 - (1=1) Section 2 included - (2=0) Section 3 omited - See grib1/1.table */ - GRIB_CHECK(grib_set_long(h,"section1Flags",128),0); - - - /* 167 = 2 metre temperature (K) (grib1/2.98.128.table) */ - GRIB_CHECK(grib_set_long(h,"indicatorOfParameter",167),0); - - - /* 1 = Surface (of the Earth, which includes sea surface) (grib1/3.table) */ - GRIB_CHECK(grib_set_long(h,"indicatorOfTypeOfLevel",1),0); - - GRIB_CHECK(grib_set_long(h,"level",0),0); - GRIB_CHECK(grib_set_long(h,"yearOfCentury",8),0); - GRIB_CHECK(grib_set_long(h,"month",2),0); - GRIB_CHECK(grib_set_long(h,"day",6),0); - GRIB_CHECK(grib_set_long(h,"hour",12),0); - GRIB_CHECK(grib_set_long(h,"minute",0),0); - GRIB_CHECK(grib_set_long(h,"second",0),0); - - /* 1 = Hour (grib1/4.table) */ - GRIB_CHECK(grib_set_long(h,"unitOfTimeRange",1),0); - - GRIB_CHECK(grib_set_long(h,"P1",0),0); - GRIB_CHECK(grib_set_long(h,"P2",0),0); - - /* 0 = Forecast product valid at reference time + P1 (P1>0) (grib1/5.table) */ - GRIB_CHECK(grib_set_long(h,"timeRangeIndicator",0),0); - - GRIB_CHECK(grib_set_long(h,"numberIncludedInAverage",0),0); - GRIB_CHECK(grib_set_long(h,"numberMissingFromAveragesOrAccumulations",0),0); - GRIB_CHECK(grib_set_long(h,"centuryOfReferenceTimeOfData",21),0); - - /* 0 = Unknown code table entry (grib1/0.ecmf.table) */ - GRIB_CHECK(grib_set_long(h,"subCentre",0),0); - - GRIB_CHECK(grib_set_long(h,"decimalScaleFactor",0),0); - GRIB_CHECK(grib_set_long(h,"setLocalDefinition",0),0); - GRIB_CHECK(grib_set_long(h,"dataDate",20080206),0); - GRIB_CHECK(grib_set_long(h,"dataTime",1200),0); - - /* 1 = Hour (stepUnits.table) */ - GRIB_CHECK(grib_set_long(h,"stepUnits",1),0); - - GRIB_CHECK(grib_set_long(h,"deleteLocalDefinition",0),0); - - /* 1 = MARS labelling or ensemble forecast data (grib1/localDefinitionNumber.98.table) */ - GRIB_CHECK(grib_set_long(h,"localDefinitionNumber",1),0); - - - /* 1 = Operational archive (mars/class.table) */ - GRIB_CHECK(grib_set_long(h,"marsClass",1),0); - - - /* 2 = Analysis (mars/type.table) */ - GRIB_CHECK(grib_set_long(h,"marsType",2),0); - - - /* 1025 = Atmospheric model (mars/stream.table) */ - GRIB_CHECK(grib_set_long(h,"marsStream",1025),0); - - p = "0001"; - size = strlen(p)+1; - GRIB_CHECK(grib_set_string(h,"experimentVersionNumber",p,&size),0); - GRIB_CHECK(grib_set_long(h,"perturbationNumber",0),0); - GRIB_CHECK(grib_set_long(h,"numberOfForecastsInEnsemble",0),0); - - /* x */ - - GRIB_CHECK(grib_set_long(h,"gridDescriptionSectionPresent",1),0); - GRIB_CHECK(grib_set_long(h,"GDSPresent",1),0); - GRIB_CHECK(grib_set_long(h,"bitmapPresent",0),0); - GRIB_CHECK(grib_set_long(h,"radius",6367470),0); - GRIB_CHECK(grib_set_long(h,"shapeOfTheEarth",6),0); - GRIB_CHECK(grib_set_long(h,"numberOfVerticalCoordinateValues",0),0); - GRIB_CHECK(grib_set_long(h,"pvlLocation",255),0); - - /* 0 = Latitude/Longitude Grid (grib1/6.table) */ - GRIB_CHECK(grib_set_long(h,"dataRepresentationType",0),0); - - GRIB_CHECK(grib_set_long(h,"Ni",16),0); - GRIB_CHECK(grib_set_long(h,"Nj",31),0); - GRIB_CHECK(grib_set_long(h,"latitudeOfFirstGridPoint",60000),0); - GRIB_CHECK(grib_set_long(h,"longitudeOfFirstGridPoint",0),0); - - /* 128 = 10000000 - (1=1) Direction increments given - (2=0) Earth assumed spherical with radius = 6367.47 km - (5=0) u and v components resolved relative to easterly and northerly directions - See grib1/7.table */ - GRIB_CHECK(grib_set_long(h,"resolutionAndComponentFlags",128),0); - - GRIB_CHECK(grib_set_long(h,"ijDirectionIncrementGiven",1),0); - GRIB_CHECK(grib_set_long(h,"earthIsOblate",0),0); - GRIB_CHECK(grib_set_long(h,"uvRelativeToGrid",0),0); - GRIB_CHECK(grib_set_long(h,"latitudeOfLastGridPoint",0),0); - GRIB_CHECK(grib_set_long(h,"longitudeOfLastGridPoint",30000),0); - GRIB_CHECK(grib_set_long(h,"iDirectionIncrement",2000),0); - GRIB_CHECK(grib_set_long(h,"jDirectionIncrement",2000),0); - - /* 0 = 00000000 - (1=0) Points scan in +i direction - (2=0) Points scan in -j direction - (3=0) Adjacent points in i direction are consecutive - See grib1/8.table */ - GRIB_CHECK(grib_set_long(h,"scanningMode",0),0); - - GRIB_CHECK(grib_set_long(h,"iScansNegatively",0),0); - GRIB_CHECK(grib_set_long(h,"jScansPositively",0),0); - GRIB_CHECK(grib_set_long(h,"jPointsAreConsecutive",0),0); - GRIB_CHECK(grib_set_long(h,"iScansPositively",1),0); - - /* ITERATOR */ - - - /* NEAREST */ - - GRIB_CHECK(grib_set_long(h,"PVPresent",0),0); - GRIB_CHECK(grib_set_long(h,"PLPresent",0),0); - GRIB_CHECK(grib_set_long(h,"missingValue",9999),0); - GRIB_CHECK(grib_set_long(h,"sphericalHarmonics",0),0); - GRIB_CHECK(grib_set_long(h,"complexPacking",0),0); - GRIB_CHECK(grib_set_long(h,"integerPointValues",0),0); - GRIB_CHECK(grib_set_long(h,"additionalFlagPresent",0),0); - GRIB_CHECK(grib_set_long(h,"hideThis",0),0); - GRIB_CHECK(grib_set_long(h,"bitsPerValue",16),0); - GRIB_CHECK(grib_set_long(h,"dirty_statistics",1),0); - GRIB_CHECK(grib_set_long(h,"dataLength",124),0); - GRIB_CHECK(grib_set_long(h,"changeDecimalPrecision",0),0); - GRIB_CHECK(grib_set_long(h,"decimalPrecision",0),0); - GRIB_CHECK(grib_set_long(h,"bitsPerValueAndRepack",16),0); -/* Save the message */ - - f = fopen(argv[1],"w"); - if(!f) { - perror(argv[1]); - exit(1); - } - - GRIB_CHECK(grib_get_message(h,&buffer,&size),0); - - if(fwrite(buffer,1,size,f) != size) { - perror(argv[1]); - exit(1); - } - - if(fclose(f)) { - perror(argv[1]); - exit(1); - } - - grib_handle_delete(h); - return 0; -} -\endcode\n */ diff --git a/tools/grib_filter.dox b/tools/grib_filter.dox index e9c0031c5..ac0a54150 100644 --- a/tools/grib_filter.dox +++ b/tools/grib_filter.dox @@ -1,8 +1,8 @@ /*! \page grib_filter grib_filter -Latest training course presentation on grib_filter available here. \section DESCRIPTION - Apply the rules defined in rules_file to each grib message - in the grib files provided as arguments. + Apply the rules defined in rules_file to each GRIB message + in the GRIB files provided as arguments. + If you specify '-' (a single dash) for the rules_file, the rules will be read from standard input. \section USAGE grib_filter @@ -10,13 +10,15 @@ Latest training course presentation on grib_filter available =0.5 is printed) - \n \n -P key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -P key[:{s/d/i}],key[:{s/d/i}],... \n As -p adding the declared keys to the default list. - \n \n -w key[:{s/d/l}]{=/!=}value,key[:{s/d/l}]{=/!=}value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]{=/!=}value,... \n Where clause. - Grib messages are processed only if they match all the key/value constraints. + Messages are processed only if they match all the key/value constraints. A valid constraint is of type key=value or key!=value. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be specified. Default type is string. \n \n -n namespace \n All the keys belonging to namespace are printed. - \n \n -s key[:{s/d/l}]=value,key[:{s/d/l}]=value,... \n + \n \n -s key[:{s/d/i}]=value,key[:{s/d/i}]=value,... \n Key/values to set. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be defined. By default the native type is set. \n \n -V \n Version. \n \n -W width \n Minimum width of each column in output. Default is 10. \n \n -m \n Mars keys are printed. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. \n \n -g \n Copy GTS header. \n \n -G \n GRIBEX compatibility mode. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. \n \n -7 \n Does not fail when the message has wrong length + \n \n -X offset \n + Input file offset in bytes. Processing of the input file will start from "offset". \n \n -i index \n Data value corresponding to the given index is printed. \n \n diff --git a/tools/grib_get_data.dox b/tools/grib_get_data.dox index 312e26fd6..a50af0887 100644 --- a/tools/grib_get_data.dox +++ b/tools/grib_get_data.dox @@ -7,26 +7,28 @@ [options] grib_file grib_file ... \section OPTIONS --M \n Multi-grib support off. Turn off support for multiple fields in single grib message. +-M \n Multi-field support off. Turn off support for multiple fields in single grib message. \n \n -m missingValue \n The missing value is given through this option. Any string is allowed and it is printed in place of the missing values. Default is to skip the missing values. - \n \n -p key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -p key[:{s/d/i}],key[:{s/d/i}],... \n Declaration of keys to print. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be requested. Default type is string. \n \n -F format \n C style format for values. Default is "%.10e" - \n \n -w key[:{s/d/l}]{=/!=}value,key[:{s/d/l}]{=/!=}value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]{=/!=}value,... \n Where clause. - Grib messages are processed only if they match all the key/value constraints. + Messages are processed only if they match all the key/value constraints. A valid constraint is of type key=value or key!=value. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be specified. Default type is string. \n \n -f \n Force. Force the execution not to fail on error. \n \n -G \n GRIBEX compatibility mode. \n \n -7 \n Does not fail when the message has wrong length + \n \n -X offset \n + Input file offset in bytes. Processing of the input file will start from "offset". \n \n -V \n Version. \n \n \section grib_get_data_examples grib_get_data examples diff --git a/tools/grib_index_build.dox b/tools/grib_index_build.dox index 3abcf58bf..7909861d2 100644 --- a/tools/grib_index_build.dox +++ b/tools/grib_index_build.dox @@ -8,13 +8,19 @@ \section OPTIONS -f \n Force. Force the execution not to fail on error. - \n \n -o output_grib_file \n - Output grib is written to ouput_grib_file. - If an ouput grib file is required and -o is not used, the ouput grib is written to filtered.out + \n \n -o output_index_file \n + Output is written to output_index_file. + If an output index file is required and -o is not used, the output index is written to gribidx \n \n -k key1,key2,... \n Specify a list of keys to index on. By default the input files are indexed on the MARS keys. + For each key a string (key:s) or a double (key:d) or an integer (key:i) + type can be requested. \n \n -V \n Version. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. + \n \n -N \n Do not compress index. + By default the index is compressed to remove keys with only one value. \n \n \section grib_index_build_examples grib_index_build examples -# By default grib_index_build will index on the MARS keys. \n diff --git a/tools/grib_ls.dox b/tools/grib_ls.dox index 9df9f28cd..73fd328cd 100644 --- a/tools/grib_ls.dox +++ b/tools/grib_ls.dox @@ -8,32 +8,33 @@ [options] grib_file grib_file ... \section OPTIONS --p key[:{s/d/l}],key[:{s/d/l}],... \n +-p key[:{s/d/i}],key[:{s/d/i}],... \n Declaration of keys to print. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be requested. Default type is string. \n \n -F format \n C style format for floating point values. - \n \n -P key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -P key[:{s/d/i}],key[:{s/d/i}],... \n As -p adding the declared keys to the default list. - \n \n -w key[:{s/d/l}]{=/!=}value,key[:{s/d/l}]{=/!=}value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]{=/!=}value,... \n Where clause. - Grib messages are processed only if they match all the key/value constraints. + Messages are processed only if they match all the key/value constraints. A valid constraint is of type key=value or key!=value. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be specified. Default type is string. - \n \n -j \n json output \n \n -B order by directive \n - Order by. The output will be ordered according the order by directive. - Order by example: "step asc, centre desc" (step ascending and centre discending) + \n \n -j \n json output + \n \n -B order by directive \n + Order by. The output will be ordered according to the order by directive. + Order by example: "step asc, centre desc" (step ascending and centre descending) \n \n -l Latitude,Longitude[,MODE,file] \n Value close to the point of a Latitude/Longitude. Allowed values for MODE are: 4 (4 values in the nearest points are printed) Default 1 (the value at the nearest point is printed) file (file is used as mask. The closer point with mask value>=0.5 is printed) - \n \n -s key[:{s/d/l}]=value,key[:{s/d/l}]=value,... \n + \n \n -s key[:{s/d/i}]=value,key[:{s/d/i}]=value,... \n Key/values to set. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be defined. By default the native type is set. \n \n -i index \n Data value corresponding to the given index is printed. @@ -43,10 +44,13 @@ \n \n -V \n Version. \n \n -W width \n Minimum width of each column in output. Default is 10. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. \n \n -g \n Copy GTS header. - \n \n -G \n GRIBEX compatibility mode. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. \n \n -7 \n Does not fail when the message has wrong length + \n \n -X offset \n + Input file offset in bytes. Processing of the input file will start from "offset". \n \n -x \n Fast parsing option, only headers are loaded. \n \n \section grib_ls_examples grib_ls examples @@ -75,9 +79,9 @@ Only the pressure levels are listed with the following line.\n ../data/reduced_gaussian_surface.grib2 paramId shortName value 167 2t 282.002 -1 of 1 grib messages in ../data/reduced_gaussian_surface.grib2 +1 of 1 messages in ../data/reduced_gaussian_surface.grib2 -1 of 1 total grib messages in 1 files +1 of 1 total messages in 1 files Input Point: latitude=51.46 longitude=-1.33 Grid Point chosen #3 index=749 latitude=51.63 longitude=0.00 distance=93.81 (Km) Other grid Points diff --git a/tools/grib_set.dox b/tools/grib_set.dox index 4be27f5d1..ce5946260 100644 --- a/tools/grib_set.dox +++ b/tools/grib_set.dox @@ -9,35 +9,38 @@ [options] grib_file grib_file ... output_grib_file \section OPTIONS --s key[:{s/d/l}]=value,key[:{s/d/l}]=value,... \n +-s key[:{s/d/i}]=value,key[:{s/d/i}]=value,... \n Key/values to set. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be defined. By default the native type is set. \n \n -r \n Repack data. Sometimes after setting some keys involving properties of the packing algorithm a repacking of data is needed. This repacking is performed setting this -r option. \n \n -d value \n Set all the data values to "value". - \n \n -p key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -p key[:{s/d/i}],key[:{s/d/i}],... \n Declaration of keys to print. - For each key a string (key:s) or a double (key:d) or a long (key:l) + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be requested. Default type is string. - \n \n -P key[:{s/d/l}],key[:{s/d/l}],... \n + \n \n -P key[:{s/d/i}],key[:{s/d/i}],... \n As -p adding the declared keys to the default list. - \n \n -w key[:{s/d/l}]=value,key[:{s/d/l}]=value,... \n + \n \n -w key[:{s/d/i}]{=/!=}value,key[:{s/d/i}]=value,... \n Where clause. Set is only executed for grib messages matching all the key/value constraints. If a grib message does not match the constraints it is copied unchanged to the output_grib_file. This behaviour can be changed setting the option -S. - For each key a string (key:s) or a double (key:d) or a long (key:l) + A valid constraint is of type key=value or key!=value. + For each key a string (key:s), a double (key:d) or an integer (key:i) type can be defined. Default type is string. \n \n -7 \n Does not fail when the message has wrong length \n \n -S \n Strict. Only grib messages matching all the constraints are copied to the output file \n \n -V \n Version. - \n \n -M \n Multi-grib support off. Turn off support for multiple fields in single grib message. + \n \n -M \n Multi-field support off. Turn off support for multiple fields in single grib message. \n \n -g \n Copy GTS header. \n \n -G \n GRIBEX compatibility mode. + \n \n -T T | B | M | A \n Message type. T->GTS, B->BUFR, M->METAR (Experimental),A->Any (Experimental). + The input file is interpreted according to the message type. \n \n -f \n Force. Force the execution not to fail on error. \n \n -v \n Verbose. \n \n From b4561a903cd18fd045d90e5a9a64327552e6473b Mon Sep 17 00:00:00 2001 From: Enrico Fucile Date: Fri, 17 Jun 2016 09:46:44 +0100 Subject: [PATCH 2/8] improved comments in example --- examples/F90/bufr_get_string_array.f90 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/F90/bufr_get_string_array.f90 b/examples/F90/bufr_get_string_array.f90 index 6b42c997e..c822def45 100644 --- a/examples/F90/bufr_get_string_array.f90 +++ b/examples/F90/bufr_get_string_array.f90 @@ -29,25 +29,35 @@ character(len=max_strsize) , dimension(:),allocatable :: stationOrSiteName ! unpack the data values call codes_set(ibufr,'unpack',1) + + ! get the width of the strings which is te same for all of them call codes_get(ibufr,'stationOrSiteName->width',strsize) + + ! the width is given in bits strsize=strsize/8 + + ! max_strsize has to be set to a value >= to the size of the strings that we are getting + ! back from the call to codes_get_string_array if (strsize > max_strsize) then print *,'stationOrSiteName array dimension is ',max_strsize,' and should be ',strsize call exit(1) end if + ! allocating the array of strings to be passed to codes_get_string_array is mandatory call codes_get_size(ibufr,'stationOrSiteName',n) allocate(stationOrSiteName(n)) + ! passing an array of strings stationOrSiteName which must be allocated beforehand call codes_get_string_array(ibufr,'stationOrSiteName',stationOrSiteName) do i=1,n write(*,'(A)')trim(stationOrSiteName(i)) end do - !remember to deallocate what was allocated by codes_get_string_array + !remember to deallocate deallocate(stationOrSiteName) - ! release the bufr message + ! release memory associated with bufr handle + ! ibufr won't be accessible any more from codes_release on call codes_release(ibufr) ! close file From 740369aafd42ff387d3c8f6c61f2529ef4b80c45 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 17 Jun 2016 11:26:25 +0100 Subject: [PATCH 3/8] Uerra changes --- tigge/tigge_check.c | 29 +++++++----- tigge/tigge_check.h | 112 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 117 insertions(+), 24 deletions(-) diff --git a/tigge/tigge_check.c b/tigge/tigge_check.c index 65f754d1d..94a9b9fc5 100755 --- a/tigge/tigge_check.c +++ b/tigge/tigge_check.c @@ -371,11 +371,19 @@ static void point_in_time(grib_handle* h,const parameter* p,double min,double ma case 0: /* Analysis */ if (is_uerra) CHECK(eq(h,"productDefinitionTemplateNumber",0)||eq(h,"productDefinitionTemplateNumber",1)); + if (get(h,"productDefinitionTemplateNumber") == 1){ + CHECK(ne(h,"numberOfForecastsInEnsemble",0)); + CHECK(le(h,"perturbationNumber",get(h,"numberOfForecastsInEnsemble"))); + } break; case 1: /* Forecast */ if (is_uerra) CHECK(eq(h,"productDefinitionTemplateNumber",0)||eq(h,"productDefinitionTemplateNumber",1)); + if (get(h,"productDefinitionTemplateNumber") == 1){ + CHECK(ne(h,"numberOfForecastsInEnsemble",0)); + CHECK(le(h,"perturbationNumber",get(h,"numberOfForecastsInEnsemble"))); + } break; case 2: /* Analysis and forecast products */ @@ -1145,30 +1153,29 @@ static void verify(grib_handle* h) CHECK(eq(h,"productionStatusOfProcessedData",6)||eq(h,"productionStatusOfProcessedData",7)); /* S2S prod||test */ CHECK(le(h,"endStep",100*24)); } - else if (is_uerra){ - CHECK(eq(h,"productionStatusOfProcessedData",8)||eq(h,"productionStatusOfProcessedData",9)); /* UERRA prod||test */ - CHECK(le(h,"endStep",30)); - } - else + else if (!is_uerra) { CHECK(eq(h,"productionStatusOfProcessedData",4)||eq(h,"productionStatusOfProcessedData",5)); /* TIGGE prod||test */ CHECK(le(h,"endStep",30*24)); } - if (is_uerra){ - CHECK((eq(h,"step",1)||eq(h,"step",2)||eq(h,"step",4)||eq(h,"step",5))||(get(h,"step") % 3) == 0); - } else if (is_lam){ CHECK((get(h,"step") % 3) == 0); } - else + else if (!is_uerra) { CHECK((get(h,"step") % 6) == 0); } if (is_uerra){ - /* 0 = analysis , 2 = analysis or forecast */ - CHECK(eq(h,"typeOfProcessedData",0)||eq(h,"typeOfProcessedData",2)); + CHECK(eq(h,"productionStatusOfProcessedData",8)||eq(h,"productionStatusOfProcessedData",9)); /* UERRA prod||test */ + CHECK(le(h,"endStep",30)); + /* 0 = analysis , 1 = forecast */ + CHECK(eq(h,"typeOfProcessedData",0)||eq(h,"typeOfProcessedData",1)); + if (get(h,"typeOfProcessedData") == 0) + CHECK(eq(h,"step",0)); + else + CHECK((eq(h,"step",1)||eq(h,"step",2)||eq(h,"step",4)||eq(h,"step",5))||(get(h,"step") % 3) == 0); } else { diff --git a/tigge/tigge_check.h b/tigge/tigge_check.h index e2bc6f6a1..a708a0baf 100644 --- a/tigge/tigge_check.h +++ b/tigge/tigge_check.h @@ -1082,7 +1082,6 @@ s2s/ammc: warning: s2s.mx2t6_20151224_26.grib2, field 47 [surface_air_maximum_te {"scaleFactorOfFirstFixedSurface", GRIB_TYPE_LONG, 0}, {"scaledValueOfFirstFixedSurface", GRIB_TYPE_LONG, 10}, - /* {"typeOfSecondFixedSurface", GRIB_TYPE_LONG, 255}, */ {NULL, }, }, {&three_hourly, &given_level}, @@ -1382,9 +1381,6 @@ warning: s2s.z_tigge_c_kwbc_20150817000000_ncep_prod_pf_pl_0000_015_0500_w.grib2 12, { {"model", GRIB_TYPE_STRING, 0, "glob"}, - - {"paramId", GRIB_TYPE_LONG, 135}, - {"discipline", GRIB_TYPE_LONG, 0}, {"parameterCategory", GRIB_TYPE_LONG, 2}, {"parameterNumber", GRIB_TYPE_LONG, 8}, @@ -2803,7 +2799,7 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t 10, 150, { - {"paramId", GRIB_TYPE_LONG, 228256}, + {"paramId", GRIB_TYPE_LONG, 49}, {"class", GRIB_TYPE_STRING, 0, "ur"}, {"discipline", GRIB_TYPE_LONG, 0}, {"parameterCategory", GRIB_TYPE_LONG, 2}, @@ -2817,13 +2813,14 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&since_prev_pp, &given_level}, }, { - "2_metre_maximum_temperature_uerra", /* TBD xxx Length of time range 1/3/6 checks? */ + "2_metre_maximum_temperature_uerra", 200, 340, 200, 340, { - {"paramId", GRIB_TYPE_LONG, 228257}, + {"paramId", GRIB_TYPE_LONG, 201}, + {"class", GRIB_TYPE_STRING, 0, "ur"}, {"discipline", GRIB_TYPE_LONG, 0}, {"parameterCategory", GRIB_TYPE_LONG, 0}, {"parameterNumber", GRIB_TYPE_LONG, 0}, @@ -2834,13 +2831,14 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&since_prev_pp, &given_level}, }, { - "2_metre_minimum_temperature_uerra", /* TBD xxx Length of time range 1/3/6 checks? */ + "2_metre_minimum_temperature_uerra", 200, 340, 200, 340, { - {"paramId", GRIB_TYPE_LONG, 228258}, + {"paramId", GRIB_TYPE_LONG, 202}, + {"class", GRIB_TYPE_STRING, 0, "ur"}, {"discipline", GRIB_TYPE_LONG, 0}, {"parameterCategory", GRIB_TYPE_LONG, 0}, {"parameterNumber", GRIB_TYPE_LONG, 0}, @@ -2900,7 +2898,23 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&point_in_time, &predefined_level}, }, { - "liquid_non-frozen_soil_moisture_sfc", + "liquid_non-frozen_soil_moisture_level", + -1e-19, + 0, + 450, + 800, + { + {"paramId", GRIB_TYPE_LONG, 260210}, + {"discipline", GRIB_TYPE_LONG, 2}, + {"parameterCategory", GRIB_TYPE_LONG, 3}, + {"parameterNumber", GRIB_TYPE_LONG, 10}, + {"typeOfFirstFixedSurface", GRIB_TYPE_LONG, 151}, + {NULL, }, + }, + {&point_in_time, &given_level}, + }, + { + "liquid_non-frozen_soil_moisture_layer", -1e-19, 0, 450, @@ -2919,7 +2933,23 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&point_in_time, &given_thickness}, }, { - "volumetric_soil_moisture_sfc", + "volumetric_soil_moisture_level", + -1e-19, + 0, + 450, + 800, + { + {"paramId", GRIB_TYPE_LONG, 260199}, + {"discipline", GRIB_TYPE_LONG, 2}, + {"parameterCategory", GRIB_TYPE_LONG, 0}, + {"parameterNumber", GRIB_TYPE_LONG, 25}, + {"typeOfFirstFixedSurface", GRIB_TYPE_LONG, 151}, + {NULL, }, + }, + {&point_in_time, &given_level}, + }, + { + "volumetric_soil_moisture_layer", -1e-19, 0, 450, @@ -2944,7 +2974,7 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t -1e+10, 1e+10, { - {"paramId", GRIB_TYPE_LONG, 260433}, + {"paramId", GRIB_TYPE_LONG, 260364}, {"discipline", GRIB_TYPE_LONG, 2}, {"parameterCategory", GRIB_TYPE_LONG, 3}, {"parameterNumber", GRIB_TYPE_LONG, 26}, @@ -2954,7 +2984,7 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&point_in_time, &predefined_level}, }, { - "soil_temperature_sfc", + "soil_temperature_level", 200, 230, 300, @@ -2970,6 +3000,43 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t }, {&point_in_time, &given_level}, }, + { + "soil_temperature_level", + 200, + 230, + 300, + 350, + { + {"paramId", GRIB_TYPE_LONG, 260360}, + {"discipline", GRIB_TYPE_LONG, 2}, + {"parameterCategory", GRIB_TYPE_LONG, 3}, + {"parameterNumber", GRIB_TYPE_LONG, 18}, + {"typeOfFirstFixedSurface", GRIB_TYPE_LONG, 151}, + {"scaleFactorOfFirstFixedSurface", GRIB_TYPE_LONG, 0}, + {NULL, }, + }, + {&point_in_time, &given_level}, + }, + + { + "soil_temperature_layer", + 200, + 230, + 300, + 350, + { + {"paramId", GRIB_TYPE_LONG, 260360}, + {"discipline", GRIB_TYPE_LONG, 2}, + {"parameterCategory", GRIB_TYPE_LONG, 3}, + {"parameterNumber", GRIB_TYPE_LONG, 18}, + {"typeOfFirstFixedSurface", GRIB_TYPE_LONG, 151}, + {"scaleFactorOfFirstFixedSurface", GRIB_TYPE_LONG, 0}, + {"typeOfSecondFixedSurface", GRIB_TYPE_LONG, 151}, + {"scaleFactorOfSecondFixedSurface", GRIB_TYPE_LONG, 0}, + {NULL, }, + }, + {&point_in_time, &given_thickness}, + }, { "total_column_water_sfc.ur", 0, @@ -2988,5 +3055,24 @@ s2s/ammc/enfo:s2s.tcc_20151004_9.grib2, field 21 [total_cloud_cover_sfc.glob]: t {&point_in_time, &predefined_thickness}, }, + { + "w_vertical_velocity_pl", + -20, + 0, + 0, + 20, + { + {"class", GRIB_TYPE_STRING, 0, "ur"}, + {"paramId", GRIB_TYPE_LONG, 135}, + {"discipline", GRIB_TYPE_LONG, 0}, + {"parameterCategory", GRIB_TYPE_LONG, 2}, + {"parameterNumber", GRIB_TYPE_LONG, 8}, + + {"typeOfFirstFixedSurface", GRIB_TYPE_LONG, 100}, + {NULL, }, + }, + {&point_in_time, &given_level, &pressure_level}, + }, + }; From 7bf4d8a9cc8349acf730bb4ac04c077e5fbc7d7a Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 17 Jun 2016 11:57:00 +0100 Subject: [PATCH 4/8] DWD definitions and GRIB-909: Percolation --- definitions/grib2/cfVarName.def | 5 +- definitions/grib2/localConcepts/edzw/name.def | 582 +++++++++++++++++- .../grib2/localConcepts/edzw/paramId.def | 582 +++++++++++++++++- .../grib2/localConcepts/edzw/shortName.def | 582 +++++++++++++++++- .../grib2/localConcepts/edzw/units.def | 582 +++++++++++++++++- definitions/grib2/name.def | 1 + definitions/grib2/paramId.def | 1 + definitions/grib2/shortName.def | 1 + definitions/grib2/units.def | 1 + 9 files changed, 2327 insertions(+), 10 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 2593839e4..538cd031c 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -612,6 +612,7 @@ parameterCategory = 0 ; parameterNumber = 16 ; typeOfStatisticalProcessing = 1 ; + typeOfFirstFixedSurface = 177 ; } #Cloudy brightness temperature 'clbt' = { @@ -2859,13 +2860,13 @@ parameterNumber = 5 ; } #Radiance (with respect to wave length) -'p3120' = { +'swrad' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 6 ; } #Wind mixing energy -'p3126' = { +'wmixe' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 19 ; diff --git a/definitions/grib2/localConcepts/edzw/name.def b/definitions/grib2/localConcepts/edzw/name.def index 6118b4cc2..0e26f672f 100755 --- a/definitions/grib2/localConcepts/edzw/name.def +++ b/definitions/grib2/localConcepts/edzw/name.def @@ -1,4 +1,4 @@ -# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-02-03 10:04 +# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-06-03 11:40 #paramId: 500000 #Pressure (S) (not reduced) 'Pressure (S) (not reduced)' = { @@ -1933,7 +1933,6 @@ parameterCategory = 3 ; parameterNumber = 0 ; typeOfFirstFixedSurface = 107 ; - unitsFactor = 100 ; } #paramId: 500302 @@ -6134,6 +6133,536 @@ parameterNumber = 42 ; } +#paramId: 503229 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 1 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503230 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 2 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 2' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503231 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 3 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503232 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 4 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 4' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 4 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503233 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 5 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 5' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 5 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503234 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 6 +'Prognostic mass mixing ratio of volcanic ash particles for bin number 6' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 6 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503235 +#Modal prognostic mass mixing ratio of volcanic ash particles (fine mode) +'Modal prognostic mass mixing ratio of volcanic ash particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503236 +#Modal prognostic mass mixing ratio of volcanic ash particles (medium mode) +'Modal prognostic mass mixing ratio of volcanic ash particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503237 +#Modal prognostic mass mixing ratio of volcanic ash particles (coarse mode) +'Modal prognostic mass mixing ratio of volcanic ash particles (coarse mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503238 +#Modal prognostic specific number concentration of volcanic ash particles (fine mode) +'Modal prognostic specific number concentration of volcanic ash particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503239 +#Modal prognostic specific number concentration of volcanic ash particles (medium mode) +'Modal prognostic specific number concentration of volcanic ash particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503240 +#Modal prognostic specific number concentration of volcanic ash particles (coarse mode) +'Modal prognostic specific number concentration of volcanic ash particles (coarse mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503241 +#Modal prognostic mass mixing ratio of mineral dust particles (fine mode) +'Modal prognostic mass mixing ratio of mineral dust particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503242 +#Modal prognostic mass mixing ratio of mineral dust particles (medium mode) +'Modal prognostic mass mixing ratio of mineral dust particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503243 +#Modal prognostic mass mixing ratio of mineral dust particles (coarse mode) +'Modal prognostic mass mixing ratio of mineral dust particles (coarse mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503244 +#Modal prognostic specific number concentration of mineral dust particles (fine mode) +'Modal prognostic specific number concentration of mineral dust particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503245 +#Modal prognostic specific number concentration of mineral dust particles (medium mode) +'Modal prognostic specific number concentration of mineral dust particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503246 +#Modal prognostic specific number concentration of mineral dust particles (coarsemode) +'Modal prognostic specific number concentration of mineral dust particles (coarsemode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503247 +#Modal prognostic mass mixing ratio of sea salt particles (fine mode) +'Modal prognostic mass mixing ratio of sea salt particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503248 +#Modal prognostic mass mixing ratio of sea salt particles (medium mode) +'Modal prognostic mass mixing ratio of sea salt particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503249 +#Modal prognostic mass mixing ratio of sea salt particles (coarse mode) +'Modal prognostic mass mixing ratio of sea salt particles (coarse mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503250 +#Modal prognostic specific number concentration of sea salt particles (fine mode) +'Modal prognostic specific number concentration of sea salt particles (fine mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503251 +#Modal prognostic specific number concentration of sea salt particles (medium mode) +'Modal prognostic specific number concentration of sea salt particles (medium mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503252 +#Modal prognostic specific number concentration of sea salt particles (coarse mode) +'Modal prognostic specific number concentration of sea salt particles (coarse mode)' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503253 +#Prognostic specific activity concentration of Caesium 137 +'Prognostic specific activity concentration of Caesium 137' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30172 ; + } + +#paramId: 503254 +#Prognostic specific activity concentration of Iodine 131 aerosol +'Prognostic specific activity concentration of Iodine 131 aerosol' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30141 ; + } + +#paramId: 503255 +#Prognostic specific activity concentration of Tellurium 132 +'Prognostic specific activity concentration of Tellurium 132' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30129 ; + } + +#paramId: 503256 +#Prognostic specific activity concentration of Zirconium 95 +'Prognostic specific activity concentration of Zirconium 95' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30079 ; + } + +#paramId: 503257 +#Prognostic specific activity concentration of Xenon 133 +'Prognostic specific activity concentration of Xenon 133' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30161 ; + } + +#paramId: 503258 +#Prognostic specific activity concentration of Iodine 131 elementary gaseous +'Prognostic specific activity concentration of Iodine 131 elementary gaseous' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30138 ; + } + +#paramId: 503259 +#Prognostic specific activity concentration of Iodine 131 organic bounded +'Prognostic specific activity concentration of Iodine 131 organic bounded' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30139 ; + } + +#paramId: 503260 +#Prognostic specific activity concentration of Barium 140 +'Prognostic specific activity concentration of Barium 140' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30175 ; + } + +#paramId: 503261 +#Prognostic specific activity concentration of Ruthenium 103 +'Prognostic specific activity concentration of Ruthenium 103' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30102 ; + } + +#paramId: 503262 +#Diagnostic total mass concentration of volcanic ash +'Diagnostic total mass concentration of volcanic ash' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 0 ; + constituentType = 62025 ; + } + +#paramId: 503263 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 46500 ; + constituentType = 62025 ; + } + +#paramId: 503265 +#Diagnostic total column of mass concentration of volcanic ash +'Diagnostic total column of mass concentration of volcanic ash' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 10 ; + constituentType = 62025 ; + } + +#paramId: 503266 +#Diagnostic height of model layer with maximal total mass concentration of volcanic ash +'Diagnostic height of model layer with maximal total mass concentration of volcanic ash' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 62 ; + constituentType = 62025 ; + } + +#paramId: 503267 +#Diagnostic volcanic ash optical depth +'Diagnostic volcanic ash optical depth' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62025 ; + } + +#paramId: 503268 +#Diagnostic mineral dust optical depth +'Diagnostic mineral dust optical depth' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62001 ; + } + +#paramId: 503269 +#Diagnostic sea salt optical depth +'Diagnostic sea salt optical depth' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62008 ; + } + +#paramId: 503270 +#Diagnostic vmaximum activity concentration of radionuclides in a layer +'Diagnostic vmaximum activity concentration of radionuclides in a layer' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 15 ; + } + +#paramId: 503273 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL200-FL350 +'Diagnostic maximum total mass concentration of volcanic ash in layer FL200-FL350' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 46500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 24000 ; + constituentType = 62025 ; + } + +#paramId: 503274 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 70000 ; + constituentType = 62025 ; + } + +#paramId: 503275 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL350-FL550 +'Diagnostic maximum total mass concentration of volcanic ash in layer FL350-FL550' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 24000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 9100 ; + constituentType = 62025 ; + } + +#paramId: 503276 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL100-FL245 +'Diagnostic maximum total mass concentration of volcanic ash in layer FL100-FL245' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 70000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 38500 ; + constituentType = 62025 ; + } + +#paramId: 503277 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL245-FL390 +'Diagnostic maximum total mass concentration of volcanic ash in layer FL245-FL390' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 38500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 20000 ; + constituentType = 62025 ; + } + +#paramId: 503278 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL390-FL530 +'Diagnostic maximum total mass concentration of volcanic ash in layer FL390-FL530' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 20000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 10000 ; + constituentType = 62025 ; + } + +#paramId: 503279 +#Diagnostic maximum total mass concentration of volcanic ash in a layer +'Diagnostic maximum total mass concentration of volcanic ash in a layer' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + constituentType = 62025 ; + } + +#paramId: 503280 +#Aerosol optical depth +'Aerosol optical depth' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + } + #paramId: 500092 #Solar radiation heating rate 'Solar radiation heating rate' = { @@ -10833,3 +11362,52 @@ parameterNumber = 202 ; } +#paramId: 503282 +#Diagnostic total column of activity concentration of radionuclides +'Diagnostic total column of activity concentration of radionuclides' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 192 ; + typeOfFirstFixedSurface = 10 ; + } + +#paramId: 503283 +#Liquid water potential temperature variance +'Liquid water potential temperature variance' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 0 ; + } + +#paramId: 503284 +#Total water specific humidity variance +'Total water specific humidity variance' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 1 ; + } + +#paramId: 503285 +#Liquid water potential temperature - total water specific humidity covariance +'Liquid water potential temperature - total water specific humidity covariance' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 2 ; + } + +#paramId: 503286 +#Impervious (paved or sealed) surface fraction +'Impervious (paved or sealed) surface fraction' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 196 ; + } + +#paramId: 503287 +#Antropogenic heat flux (e.g. urban heating, traffic) +'Antropogenic heat flux (e.g. urban heating, traffic)' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 197 ; + } + diff --git a/definitions/grib2/localConcepts/edzw/paramId.def b/definitions/grib2/localConcepts/edzw/paramId.def index 6827f59db..d76ff24dd 100755 --- a/definitions/grib2/localConcepts/edzw/paramId.def +++ b/definitions/grib2/localConcepts/edzw/paramId.def @@ -1,4 +1,4 @@ -# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-02-03 10:04 +# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-06-03 11:40 #paramId: 500000 #Pressure (S) (not reduced) '500000' = { @@ -2603,7 +2603,6 @@ parameterCategory = 3 ; parameterNumber = 0 ; typeOfFirstFixedSurface = 107 ; - unitsFactor = 100 ; } #paramId: 500302 @@ -11372,3 +11371,582 @@ parameterNumber = 202 ; } +#paramId: 503229 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 1 +'503229' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503230 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 2 +'503230' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503231 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 3 +'503231' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503232 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 4 +'503232' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 4 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503233 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 5 +'503233' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 5 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503234 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 6 +'503234' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 6 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503235 +#Modal prognostic mass mixing ratio of volcanic ash particles (fine mode) +'503235' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503236 +#Modal prognostic mass mixing ratio of volcanic ash particles (medium mode) +'503236' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503237 +#Modal prognostic mass mixing ratio of volcanic ash particles (coarse mode) +'503237' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503238 +#Modal prognostic specific number concentration of volcanic ash particles (fine mode) +'503238' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503239 +#Modal prognostic specific number concentration of volcanic ash particles (medium mode) +'503239' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503240 +#Modal prognostic specific number concentration of volcanic ash particles (coarse mode) +'503240' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503241 +#Modal prognostic mass mixing ratio of mineral dust particles (fine mode) +'503241' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503242 +#Modal prognostic mass mixing ratio of mineral dust particles (medium mode) +'503242' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503243 +#Modal prognostic mass mixing ratio of mineral dust particles (coarse mode) +'503243' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503244 +#Modal prognostic specific number concentration of mineral dust particles (fine mode) +'503244' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503245 +#Modal prognostic specific number concentration of mineral dust particles (medium mode) +'503245' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503246 +#Modal prognostic specific number concentration of mineral dust particles (coarsemode) +'503246' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503247 +#Modal prognostic mass mixing ratio of sea salt particles (fine mode) +'503247' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503248 +#Modal prognostic mass mixing ratio of sea salt particles (medium mode) +'503248' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503249 +#Modal prognostic mass mixing ratio of sea salt particles (coarse mode) +'503249' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503250 +#Modal prognostic specific number concentration of sea salt particles (fine mode) +'503250' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503251 +#Modal prognostic specific number concentration of sea salt particles (medium mode) +'503251' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503252 +#Modal prognostic specific number concentration of sea salt particles (coarse mode) +'503252' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503253 +#Prognostic specific activity concentration of Caesium 137 +'503253' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30172 ; + } + +#paramId: 503254 +#Prognostic specific activity concentration of Iodine 131 aerosol +'503254' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30141 ; + } + +#paramId: 503255 +#Prognostic specific activity concentration of Tellurium 132 +'503255' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30129 ; + } + +#paramId: 503256 +#Prognostic specific activity concentration of Zirconium 95 +'503256' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30079 ; + } + +#paramId: 503257 +#Prognostic specific activity concentration of Xenon 133 +'503257' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30161 ; + } + +#paramId: 503258 +#Prognostic specific activity concentration of Iodine 131 elementary gaseous +'503258' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30138 ; + } + +#paramId: 503259 +#Prognostic specific activity concentration of Iodine 131 organic bounded +'503259' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30139 ; + } + +#paramId: 503260 +#Prognostic specific activity concentration of Barium 140 +'503260' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30175 ; + } + +#paramId: 503261 +#Prognostic specific activity concentration of Ruthenium 103 +'503261' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30102 ; + } + +#paramId: 503262 +#Diagnostic total mass concentration of volcanic ash +'503262' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 0 ; + constituentType = 62025 ; + } + +#paramId: 503263 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'503263' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 46500 ; + constituentType = 62025 ; + } + +#paramId: 503265 +#Diagnostic total column of mass concentration of volcanic ash +'503265' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 10 ; + constituentType = 62025 ; + } + +#paramId: 503266 +#Diagnostic height of model layer with maximal total mass concentration of volcanic ash +'503266' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 62 ; + constituentType = 62025 ; + } + +#paramId: 503267 +#Diagnostic volcanic ash optical depth +'503267' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62025 ; + } + +#paramId: 503268 +#Diagnostic mineral dust optical depth +'503268' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62001 ; + } + +#paramId: 503269 +#Diagnostic sea salt optical depth +'503269' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62008 ; + } + +#paramId: 503270 +#Diagnostic vmaximum activity concentration of radionuclides in a layer +'503270' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 15 ; + } + +#paramId: 503273 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL200-FL350 +'503273' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 46500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 24000 ; + constituentType = 62025 ; + } + +#paramId: 503274 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'503274' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 70000 ; + constituentType = 62025 ; + } + +#paramId: 503275 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL350-FL550 +'503275' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 24000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 9100 ; + constituentType = 62025 ; + } + +#paramId: 503276 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL100-FL245 +'503276' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 70000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 38500 ; + constituentType = 62025 ; + } + +#paramId: 503277 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL245-FL390 +'503277' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 38500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 20000 ; + constituentType = 62025 ; + } + +#paramId: 503278 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL390-FL530 +'503278' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 20000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 10000 ; + constituentType = 62025 ; + } + +#paramId: 503279 +#Diagnostic maximum total mass concentration of volcanic ash in a layer +'503279' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + constituentType = 62025 ; + } + +#paramId: 503280 +#Aerosol optical depth +'503280' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + } + +#paramId: 503282 +#Diagnostic total column of activity concentration of radionuclides +'503282' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 192 ; + typeOfFirstFixedSurface = 10 ; + } + +#paramId: 503283 +#Liquid water potential temperature variance +'503283' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 0 ; + } + +#paramId: 503284 +#Total water specific humidity variance +'503284' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 1 ; + } + +#paramId: 503285 +#Liquid water potential temperature - total water specific humidity covariance +'503285' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 2 ; + } + +#paramId: 503286 +#Impervious (paved or sealed) surface fraction +'503286' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 196 ; + } + +#paramId: 503287 +#Antropogenic heat flux (e.g. urban heating, traffic) +'503287' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 197 ; + } + diff --git a/definitions/grib2/localConcepts/edzw/shortName.def b/definitions/grib2/localConcepts/edzw/shortName.def index ed29ce7b7..43123161e 100755 --- a/definitions/grib2/localConcepts/edzw/shortName.def +++ b/definitions/grib2/localConcepts/edzw/shortName.def @@ -1,4 +1,4 @@ -# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-02-03 10:04 +# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-06-03 11:40 #paramId: 500000 #Pressure (S) (not reduced) 'PS' = { @@ -1933,7 +1933,6 @@ parameterCategory = 3 ; parameterNumber = 0 ; typeOfFirstFixedSurface = 107 ; - unitsFactor = 100 ; } #paramId: 500302 @@ -6134,6 +6133,536 @@ parameterNumber = 42 ; } +#paramId: 503229 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 1 +'ASH1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503230 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 2 +'ASH2' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503231 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 3 +'ASH3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503232 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 4 +'ASH4' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 4 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503233 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 5 +'ASH5' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 5 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503234 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 6 +'ASH6' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 6 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503235 +#Modal prognostic mass mixing ratio of volcanic ash particles (fine mode) +'ASHA' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503236 +#Modal prognostic mass mixing ratio of volcanic ash particles (medium mode) +'ASHB' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503237 +#Modal prognostic mass mixing ratio of volcanic ash particles (coarse mode) +'ASHC' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503238 +#Modal prognostic specific number concentration of volcanic ash particles (fine mode) +'ASHA0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503239 +#Modal prognostic specific number concentration of volcanic ash particles (medium mode) +'ASHB0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503240 +#Modal prognostic specific number concentration of volcanic ash particles (coarse mode) +'ASHC0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503241 +#Modal prognostic mass mixing ratio of mineral dust particles (fine mode) +'DUSTA' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503242 +#Modal prognostic mass mixing ratio of mineral dust particles (medium mode) +'DUSTB' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503243 +#Modal prognostic mass mixing ratio of mineral dust particles (coarse mode) +'DUSTC' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503244 +#Modal prognostic specific number concentration of mineral dust particles (fine mode) +'DUSTA0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503245 +#Modal prognostic specific number concentration of mineral dust particles (medium mode) +'DUSTB0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503246 +#Modal prognostic specific number concentration of mineral dust particles (coarsemode) +'DUSTC0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503247 +#Modal prognostic mass mixing ratio of sea salt particles (fine mode) +'SEASA' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503248 +#Modal prognostic mass mixing ratio of sea salt particles (medium mode) +'SEASB' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503249 +#Modal prognostic mass mixing ratio of sea salt particles (coarse mode) +'SEASC' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503250 +#Modal prognostic specific number concentration of sea salt particles (fine mode) +'SEASA0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503251 +#Modal prognostic specific number concentration of sea salt particles (medium mode) +'SEASB0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503252 +#Modal prognostic specific number concentration of sea salt particles (coarse mode) +'SEASC0' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503253 +#Prognostic specific activity concentration of Caesium 137 +'Cs_137' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30172 ; + } + +#paramId: 503254 +#Prognostic specific activity concentration of Iodine 131 aerosol +'I_131a' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30141 ; + } + +#paramId: 503255 +#Prognostic specific activity concentration of Tellurium 132 +'Te_132' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30129 ; + } + +#paramId: 503256 +#Prognostic specific activity concentration of Zirconium 95 +'Zr_95' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30079 ; + } + +#paramId: 503257 +#Prognostic specific activity concentration of Xenon 133 +'Xe_133' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30161 ; + } + +#paramId: 503258 +#Prognostic specific activity concentration of Iodine 131 elementary gaseous +'I_131g' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30138 ; + } + +#paramId: 503259 +#Prognostic specific activity concentration of Iodine 131 organic bounded +'I_131o' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30139 ; + } + +#paramId: 503260 +#Prognostic specific activity concentration of Barium 140 +'Ba_140' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30175 ; + } + +#paramId: 503261 +#Prognostic specific activity concentration of Ruthenium 103 +'Ru_103' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30102 ; + } + +#paramId: 503262 +#Diagnostic total mass concentration of volcanic ash +'ASH_TOTAL_MC' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 0 ; + constituentType = 62025 ; + } + +#paramId: 503263 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'ASH_MAX_TOTAL_MC_SFC_200' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 46500 ; + constituentType = 62025 ; + } + +#paramId: 503265 +#Diagnostic total column of mass concentration of volcanic ash +'ASH_TOTAL_MC_VI' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 10 ; + constituentType = 62025 ; + } + +#paramId: 503266 +#Diagnostic height of model layer with maximal total mass concentration of volcanic ash +'ASH_HML_MAX' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 62 ; + constituentType = 62025 ; + } + +#paramId: 503267 +#Diagnostic volcanic ash optical depth +'AOD_ASH' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62025 ; + } + +#paramId: 503268 +#Diagnostic mineral dust optical depth +'AOD_DUST' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62001 ; + } + +#paramId: 503269 +#Diagnostic sea salt optical depth +'AOD_SEAS' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62008 ; + } + +#paramId: 503270 +#Diagnostic vmaximum activity concentration of radionuclides in a layer +'RADIONUC_MAX_AC_LAYER' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 15 ; + } + +#paramId: 503273 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL200-FL350 +'ASH_MAX_TOTAL_MC_200_350' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 46500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 24000 ; + constituentType = 62025 ; + } + +#paramId: 503274 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'ASH_MAX_TOTAL_MC_SFC_100' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 70000 ; + constituentType = 62025 ; + } + +#paramId: 503275 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL350-FL550 +'ASH_MAX_TOTAL_MC_350_550' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 24000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 9100 ; + constituentType = 62025 ; + } + +#paramId: 503276 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL100-FL245 +'ASH_MAX_TOTAL_MC_100_245' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 70000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 38500 ; + constituentType = 62025 ; + } + +#paramId: 503277 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL245-FL390 +'ASH_MAX_TOTAL_MC_245_390' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 38500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 20000 ; + constituentType = 62025 ; + } + +#paramId: 503278 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL390-FL530 +'ASH_MAX_TOTAL_MC_390_530' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 20000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 10000 ; + constituentType = 62025 ; + } + +#paramId: 503279 +#Diagnostic maximum total mass concentration of volcanic ash in a layer +'ASH_MAX_TOTAL_MC_LAYER' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + constituentType = 62025 ; + } + +#paramId: 503280 +#Aerosol optical depth +'AEROSOL_OPTICAL_DEPTH' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + } + #paramId: 500092 #Solar radiation heating rate 'SOHR_RAD' = { @@ -10833,3 +11362,52 @@ parameterNumber = 202 ; } +#paramId: 503282 +#Diagnostic total column of activity concentration of radionuclides +'RADIONUC_AC_VI' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 192 ; + typeOfFirstFixedSurface = 10 ; + } + +#paramId: 503283 +#Liquid water potential temperature variance +'THLTHLCOV' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 0 ; + } + +#paramId: 503284 +#Total water specific humidity variance +'QTQTCOV' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 1 ; + } + +#paramId: 503285 +#Liquid water potential temperature - total water specific humidity covariance +'THLQTCOV' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 2 ; + } + +#paramId: 503286 +#Impervious (paved or sealed) surface fraction +'FR_PAVED' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 196 ; + } + +#paramId: 503287 +#Antropogenic heat flux (e.g. urban heating, traffic) +'AHF' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 197 ; + } + diff --git a/definitions/grib2/localConcepts/edzw/units.def b/definitions/grib2/localConcepts/edzw/units.def index f3e35042c..8dbd96c5e 100755 --- a/definitions/grib2/localConcepts/edzw/units.def +++ b/definitions/grib2/localConcepts/edzw/units.def @@ -1,4 +1,4 @@ -# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-02-03 10:04 +# Automatically generated by get_definitions.sql from database PRJ_TDCFDOKU.GRIB_PARAMETER@MIRAKEL.DWD.DE, do not edit! 2016-06-03 11:40 #paramId: 500000 #Pressure (S) (not reduced) 'Pa' = { @@ -1933,7 +1933,6 @@ parameterCategory = 3 ; parameterNumber = 0 ; typeOfFirstFixedSurface = 107 ; - unitsFactor = 100 ; } #paramId: 500302 @@ -6134,6 +6133,536 @@ parameterNumber = 42 ; } +#paramId: 503229 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 1 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503230 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 2 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503231 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 3 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503232 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 4 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 4 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503233 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 5 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 5 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503234 +#Prognostic mass mixing ratio of volcanic ash particles for bin number 6 +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 6 ; + typeOfDistributionFunction = 1 ; + } + +#paramId: 503235 +#Modal prognostic mass mixing ratio of volcanic ash particles (fine mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503236 +#Modal prognostic mass mixing ratio of volcanic ash particles (medium mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503237 +#Modal prognostic mass mixing ratio of volcanic ash particles (coarse mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503238 +#Modal prognostic specific number concentration of volcanic ash particles (fine mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503239 +#Modal prognostic specific number concentration of volcanic ash particles (medium mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503240 +#Modal prognostic specific number concentration of volcanic ash particles (coarse mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62025 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503241 +#Modal prognostic mass mixing ratio of mineral dust particles (fine mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503242 +#Modal prognostic mass mixing ratio of mineral dust particles (medium mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503243 +#Modal prognostic mass mixing ratio of mineral dust particles (coarse mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503244 +#Modal prognostic specific number concentration of mineral dust particles (fine mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503245 +#Modal prognostic specific number concentration of mineral dust particles (medium mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503246 +#Modal prognostic specific number concentration of mineral dust particles (coarsemode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62001 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503247 +#Modal prognostic mass mixing ratio of sea salt particles (fine mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503248 +#Modal prognostic mass mixing ratio of sea salt particles (medium mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503249 +#Modal prognostic mass mixing ratio of sea salt particles (coarse mode) +'kg kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 2 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503250 +#Modal prognostic specific number concentration of sea salt particles (fine mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 1 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503251 +#Modal prognostic specific number concentration of sea salt particles (medium mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 2 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503252 +#Modal prognostic specific number concentration of sea salt particles (coarse mode) +'kg-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 60 ; + constituentType = 62008 ; + modeNumber = 3 ; + typeOfDistributionFunction = 7 ; + } + +#paramId: 503253 +#Prognostic specific activity concentration of Caesium 137 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30172 ; + } + +#paramId: 503254 +#Prognostic specific activity concentration of Iodine 131 aerosol +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30141 ; + } + +#paramId: 503255 +#Prognostic specific activity concentration of Tellurium 132 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30129 ; + } + +#paramId: 503256 +#Prognostic specific activity concentration of Zirconium 95 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30079 ; + } + +#paramId: 503257 +#Prognostic specific activity concentration of Xenon 133 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30161 ; + } + +#paramId: 503258 +#Prognostic specific activity concentration of Iodine 131 elementary gaseous +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30138 ; + } + +#paramId: 503259 +#Prognostic specific activity concentration of Iodine 131 organic bounded +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30139 ; + } + +#paramId: 503260 +#Prognostic specific activity concentration of Barium 140 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30175 ; + } + +#paramId: 503261 +#Prognostic specific activity concentration of Ruthenium 103 +'Bq kg-1' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 14 ; + constituentType = 30102 ; + } + +#paramId: 503262 +#Diagnostic total mass concentration of volcanic ash +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 0 ; + constituentType = 62025 ; + } + +#paramId: 503263 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 46500 ; + constituentType = 62025 ; + } + +#paramId: 503265 +#Diagnostic total column of mass concentration of volcanic ash +'kg m-2' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 10 ; + constituentType = 62025 ; + } + +#paramId: 503266 +#Diagnostic height of model layer with maximal total mass concentration of volcanic ash +'m' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 62 ; + constituentType = 62025 ; + } + +#paramId: 503267 +#Diagnostic volcanic ash optical depth +'Numeric' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62025 ; + } + +#paramId: 503268 +#Diagnostic mineral dust optical depth +'Numeric' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62001 ; + } + +#paramId: 503269 +#Diagnostic sea salt optical depth +'Numeric' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + aerosolType = 62008 ; + } + +#paramId: 503270 +#Diagnostic vmaximum activity concentration of radionuclides in a layer +'Bq m-3' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 15 ; + } + +#paramId: 503273 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL200-FL350 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 46500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 24000 ; + constituentType = 62025 ; + } + +#paramId: 503274 +#Diagnostic maximum total mass concentration of volcanic ash in layer SFC-FL200 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 101325 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 70000 ; + constituentType = 62025 ; + } + +#paramId: 503275 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL350-FL550 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 24000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 9100 ; + constituentType = 62025 ; + } + +#paramId: 503276 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL100-FL245 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 70000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 38500 ; + constituentType = 62025 ; + } + +#paramId: 503277 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL245-FL390 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 38500 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 20000 ; + constituentType = 62025 ; + } + +#paramId: 503278 +#Diagnostic maximum total mass concentration of volcanic ash in layer FL390-FL530 +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + typeOfSecondFixedSurface = 100 ; + scaleFactorOfSecondFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 20000 ; + typeOfFirstFixedSurface = 100 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 10000 ; + constituentType = 62025 ; + } + +#paramId: 503279 +#Diagnostic maximum total mass concentration of volcanic ash in a layer +'kg m-3' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 61 ; + constituentType = 62025 ; + } + +#paramId: 503280 +#Aerosol optical depth +'Numeric' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 102 ; + } + #paramId: 500092 #Solar radiation heating rate 'K s-1' = { @@ -10833,3 +11362,52 @@ parameterNumber = 202 ; } +#paramId: 503282 +#Diagnostic total column of activity concentration of radionuclides +'Bq m-2' = { + discipline = 0 ; + parameterCategory = 18 ; + parameterNumber = 192 ; + typeOfFirstFixedSurface = 10 ; + } + +#paramId: 503283 +#Liquid water potential temperature variance +'K2' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 0 ; + } + +#paramId: 503284 +#Total water specific humidity variance +'kg2 kg-2' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 1 ; + } + +#paramId: 503285 +#Liquid water potential temperature - total water specific humidity covariance +'K kg kg-1' = { + discipline = 0 ; + parameterCategory = 198 ; + parameterNumber = 2 ; + } + +#paramId: 503286 +#Impervious (paved or sealed) surface fraction +'Proportion' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 196 ; + } + +#paramId: 503287 +#Antropogenic heat flux (e.g. urban heating, traffic) +'W m-2' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 197 ; + } + diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 3cd4fa51a..d0fed7ac2 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -612,6 +612,7 @@ parameterCategory = 0 ; parameterNumber = 16 ; typeOfStatisticalProcessing = 1 ; + typeOfFirstFixedSurface = 177 ; } #Cloudy brightness temperature 'Cloudy brightness temperature' = { diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 56f209d5c..b9e3a7fa0 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -611,6 +611,7 @@ discipline = 1 ; parameterCategory = 0 ; parameterNumber = 16 ; + typeOfFirstFixedSurface = 177 ; typeOfStatisticalProcessing = 1 ; } #Cloudy brightness temperature diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 29c936a76..9a2015a34 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -612,6 +612,7 @@ parameterCategory = 0 ; parameterNumber = 16 ; typeOfStatisticalProcessing = 1 ; + typeOfFirstFixedSurface = 177 ; } #Cloudy brightness temperature 'clbt' = { diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 0bdb7020d..56d8cf437 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -612,6 +612,7 @@ parameterCategory = 0 ; parameterNumber = 16 ; typeOfStatisticalProcessing = 1 ; + typeOfFirstFixedSurface = 177 ; } #Cloudy brightness temperature 'K' = { From ed6ba1f56da5c64b7e8c302a87b27b3af329ade7 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 17 Jun 2016 12:32:38 +0100 Subject: [PATCH 5/8] ECC-200 initial doxygen run --- doxygen/environment.dox | 12 +- doxygen/grib_api_wiz.cfg | 4 +- doxygen/head.html | 364 +-------------------------------------- doxygen/make_dox_web.sh | 12 +- doxygen/tail.html | 1 - 5 files changed, 17 insertions(+), 376 deletions(-) diff --git a/doxygen/environment.dox b/doxygen/environment.dox index 31e101ab6..84b0bd013 100644 --- a/doxygen/environment.dox +++ b/doxygen/environment.dox @@ -1,5 +1,5 @@ /*! \defgroup environment Environment variables -Environment variables applicable to eccodes: +Environment variables applicable to ecCodes: \b ECCODES_DEBUG - If set to 1, it will enable debug level logging messages to be displayed by the library. @@ -7,16 +7,16 @@ Environment variables applicable to eccodes: \b ECCODES_IO_BUFFER_SIZE - Defines the size in bytes of the buffer used in the IO calls from Fortran and in the tools. -\b ECCODES_NO_ABORT - When set to 1 it causes grib_api not to abort execution on failing asserts. +\b ECCODES_NO_ABORT - When set to 1 it causes ecCodes not to abort execution on failing asserts. -\b GRIB_API_WRITE_ON_FAIL - When set to 1 it will write the last processed grib message in a file named $PID_$FILEID_error.grib on failure in a fortran function used without the return code argument. +\b ECCODES_GRIB_WRITE_ON_FAIL - When set to 1 it will write the last processed GRIB message in a file named $PID_$FILEID_error.grib on failure in a fortran function used without the return code argument. -\b ECCODES_DEFINITION_PATH - Set to the folder containing the set of definition files you want grib_api to use instead of the default one. +\b ECCODES_DEFINITION_PATH - Set to the folder containing the set of definition files you want ecCodes to use instead of the default one. -\b ECCODES_GRIBEX_MODE_ON - When set to 1 it will enable the GRIBEX compatibility mode and grib_api will produce GRIB messages readable by GRIBEX. +\b ECCODES_GRIBEX_MODE_ON - When set to 1 it will enable the GRIBEX compatibility mode and ecCodes will produce GRIB messages readable by GRIBEX. \b ECCODES_GRIB_IEEE_PACKING - Accepted values 32 or 64 for 32 or 64 bits IEEE floating point respectively. The GRIB message produced will contain data written in IEEE floating point without packing. -\b ECCODES_SAMPLES_PATH - Set to the folder containing the set of samples you want grib_api to use instead of the default one. +\b ECCODES_SAMPLES_PATH - Set to the folder containing the set of samples you want ecCodes to use instead of the default one. */ diff --git a/doxygen/grib_api_wiz.cfg b/doxygen/grib_api_wiz.cfg index d089389df..f93de6ef2 100644 --- a/doxygen/grib_api_wiz.cfg +++ b/doxygen/grib_api_wiz.cfg @@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = NO -STRIP_FROM_PATH = /var/tmp/mac/p4/grib_api/main/doxygen/ +STRIP_FROM_PATH = /home/ma/masn/git/eccodes/doxygen/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = YES @@ -105,7 +105,7 @@ INPUT = grib_api.dox \ ../tools/grib_keys.dox \ ../tools/grib_copy.dox \ ../tools/grib_index_build.dox \ - ../python/eccodes.py + gribapi.py FILE_PATTERNS = *.c \ *.cc \ *.cxx \ diff --git a/doxygen/head.html b/doxygen/head.html index 6c3b5b6ce..9a16301cb 100644 --- a/doxygen/head.html +++ b/doxygen/head.html @@ -12,366 +12,4 @@ -GRIB API Manual - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Home page  -
- - - - - - - - - - - - - - - - - - - -
Home Your Room Login Contact Feedback Site Map Search: -  
-
-
Discover this product  - - - - - - - - - -
About Us
- Overview
- Getting here
- Committees 		Products
- Forecasts
- Order Data
- Order -Software
- 		Services
- Computing
- Archive
- PrepIFS
- 		Research
- Modelling
- Reanalysis
- Seasonal
- 		Publications
- Newsletters
- Manuals
- Libraries
- 		News&Events
- Calendar
- Employment
- Open Tenders
-
-
-   - - - - - -
- -Home >  -Publications >  -Manuals > -Grib API>  -  -
-
  -   -

-

-
- - - - - - - - - - - -
GRIB API Manual
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Installation
Python
Fortran 90
C
GRIB Conversion
GRIBEX keys
Keys
Examples
Tools
-
-
- -
- - - - - - - - - - - - - -
Software
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BUFR
CREX
GRIBEX
GRIB API
Interpolation
Magics
Metview
SMS
Ordering -forms
Software -licence
Payment rules
-
-
- -
- - - - - - - - - - - - - - - - - - -
Related Manuals
- - - - -
- - - - - - - - - - - - - - - - -
GRIBEX -manual
Interpolation -manual
Metview Manuals
-

Magics Manuals

-
-
-
- -
- -  
- 		  - - - +ecCodes Manual diff --git a/doxygen/make_dox_web.sh b/doxygen/make_dox_web.sh index 37c17f572..b5b127ce6 100755 --- a/doxygen/make_dox_web.sh +++ b/doxygen/make_dox_web.sh @@ -1,13 +1,17 @@ #!/bin/sh - -./prepare_pydocs.pl < ../python/eccode.py > eccode.py +set -e +./prepare_pydocs.pl < ../python/gribapi.py > gribapi.py cd ../tools ./make_dox.ksh cd ../doxygen -p4 edit ../html_web/* + rm -f ../html_web/* -doxygen grib_api_site.cfg + +DOXYGEN_EXE=doxygen +# DOXYGEN_EXE=/tmp/doxygen-1.5.3/bin/doxygen +$DOXYGEN_EXE grib_api_site.cfg + cp doxygen.css ../html_web/ ./build_gribex.ksh gribex ../html_web/gribexkeys ./make_site.ksh diff --git a/doxygen/tail.html b/doxygen/tail.html index 8ec52f90b..a17e1343f 100644 --- a/doxygen/tail.html +++ b/doxygen/tail.html @@ -16,7 +16,6 @@ Top of page -25.02.2011
From dc378c3fdb7bf6dff10d04fc95604a44d10b8ff7 Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Sat, 18 Jun 2016 17:10:19 +0100 Subject: [PATCH 6/8] Work on memfs --- memfs/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/grib_context.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/memfs/CMakeLists.txt b/memfs/CMakeLists.txt index a25899c45..7f9c466ec 100644 --- a/memfs/CMakeLists.txt +++ b/memfs/CMakeLists.txt @@ -12,7 +12,7 @@ set_source_files_properties( ${CMAKE_CURRENT_BINARY_DIR}/memfs.c PROPERTIES OBJE # "${PROJECT_SOURCE_DIR}/memfs.py" ${definition_files}" ) -ecbuild_add_library(TARGET grib_api_memfs +ecbuild_add_library(TARGET eccodes_memfs CONDITION HAVE_MEMFS SOURCES ${CMAKE_CURRENT_BINARY_DIR}/memfs.c GENERATED ${CMAKE_CURRENT_BINARY_DIR}/memfs.c ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fae67286a..292afae4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -401,7 +401,7 @@ configure_file( eccodes_version.h.in eccodes_version.h @ONLY ) # DEPENDANT action.c ) if(HAVE_MEMFS) - list(APPEND ECCODES_EXTRA_LIBRARIES grib_api_memfs) + list(APPEND ECCODES_EXTRA_LIBRARIES eccodes_memfs) endif() diff --git a/src/grib_context.c b/src/grib_context.c index cf55f79cd..69f1d6590 100644 --- a/src/grib_context.c +++ b/src/grib_context.c @@ -416,6 +416,13 @@ grib_context* grib_context_get_default() default_grib_context.log_stream=stdout; } +#ifdef HAVE_MEMFS + if(!default_grib_context.grib_samples_path) + default_grib_context.grib_samples_path = ""; + if(!default_grib_context.grib_definition_files_path) + default_grib_context.grib_definition_files_path = ""; +#endif + #ifdef ECCODES_SAMPLES_PATH if(!default_grib_context.grib_samples_path) default_grib_context.grib_samples_path = ECCODES_SAMPLES_PATH ; From 8d6f29c7c1c145667467e80341b104ee6890424f Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Sat, 18 Jun 2016 18:01:59 +0100 Subject: [PATCH 7/8] Work on memfs --- eccodes_config.h.in | 9 +++++++++ memfs.py | 2 +- src/grib_context.c | 7 ------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eccodes_config.h.in b/eccodes_config.h.in index 8f8a6f773..21cd2b245 100644 --- a/eccodes_config.h.in +++ b/eccodes_config.h.in @@ -98,4 +98,13 @@ #cmakedefine HAVE_MEMFS +#ifdef HAVE_MEMFS +#undef ECCODES_DEFINITION_PATH +#define ECCODES_DEFINITION_PATH "/MEMFS/definitions" +#undef ECCODES_SAMPLES_PATH +#define ECCODES_SAMPLES_PATH "/MEMFS/samples" +#undef ECCODES_IFS_SAMPLES_PATH +#define ECCODES_IFS_SAMPLES_PATH "/MEMFS/ifs_samples" +#endif + #endif /* eccodes_config_h */ diff --git a/memfs.py b/memfs.py index 77ff5cd81..a77bf9e68 100755 --- a/memfs.py +++ b/memfs.py @@ -166,7 +166,7 @@ for n in NAMES: """ % (n,), file=g) print(""" - /*printf("%s ===> %s\\n", path, start);*/ + /* printf("%s ===> %s\\n", path, start); */ if(start == NULL) { return NULL; } diff --git a/src/grib_context.c b/src/grib_context.c index 69f1d6590..cf55f79cd 100644 --- a/src/grib_context.c +++ b/src/grib_context.c @@ -416,13 +416,6 @@ grib_context* grib_context_get_default() default_grib_context.log_stream=stdout; } -#ifdef HAVE_MEMFS - if(!default_grib_context.grib_samples_path) - default_grib_context.grib_samples_path = ""; - if(!default_grib_context.grib_definition_files_path) - default_grib_context.grib_definition_files_path = ""; -#endif - #ifdef ECCODES_SAMPLES_PATH if(!default_grib_context.grib_samples_path) default_grib_context.grib_samples_path = ECCODES_SAMPLES_PATH ; From ac6633244b88a354264c22f9d546d7bc15ce7f0d Mon Sep 17 00:00:00 2001 From: Baudouin Raoult Date: Sat, 18 Jun 2016 18:18:14 +0100 Subject: [PATCH 8/8] Work on memfs --- memfs.py | 20 +++----------------- src/grib_context.c | 30 +++++++++++++++++------------- 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/memfs.py b/memfs.py index a77bf9e68..ab8810710 100755 --- a/memfs.py +++ b/memfs.py @@ -67,7 +67,7 @@ struct entry { items = [(v, k) for k, v in FILES.items()] for k, v in sorted(items): - print ('{"%s", &%s[0], sizeof(%s) / sizeof(%s[0]) },' % (k, v, v, v), file=g) + print ('{"/MEMFS%s", &%s[0], sizeof(%s) / sizeof(%s[0]) },' % (k, v, v, v), file=g) print("""}; @@ -155,25 +155,11 @@ static size_t entries_count = sizeof(entries)/sizeof(entries[0]); static const unsigned char* find(const char* path, size_t* length) { size_t i; - const char* start = NULL; -""", file=g) - -for n in NAMES: - print(""" - if(start == NULL) { - start = strstr(path, "/%s/"); - } -""" % (n,), file=g) - -print(""" - /* printf("%s ===> %s\\n", path, start); */ - if(start == NULL) { - return NULL; - } for(i = 0; i < entries_count; i++) { - if(strcmp(start, entries[i].path) == 0) { + if(strcmp(path, entries[i].path) == 0) { + /*printf("Found in MEMFS %s\\n", path);*/ *length = entries[i].length; return entries[i].content; } diff --git a/src/grib_context.c b/src/grib_context.c index cf55f79cd..bfb0b05c6 100644 --- a/src/grib_context.c +++ b/src/grib_context.c @@ -629,7 +629,11 @@ char *grib_context_full_defs_path(grib_context* c,const char* basename) while (dir) { sprintf(full,"%s/%s",dir->value,basename); +#ifdef HAVE_MEMFS + if(access(full,F_OK) == 0 || codes_memfs_exists(full)) { +#else if (!access(full,F_OK)) { +#endif fullpath=(grib_string_list*)grib_context_malloc_clear_persistent(c,sizeof(grib_string_list)); Assert(fullpath); fullpath->value=grib_context_strdup(c,full); @@ -641,19 +645,19 @@ char *grib_context_full_defs_path(grib_context* c,const char* basename) } dir=dir->next; } -#ifdef HAVE_MEMFS - sprintf(full,"/definitions/%s",basename); - if(codes_memfs_exists(full)) { - fullpath=(grib_string_list*)grib_context_malloc_clear_persistent(c,sizeof(grib_string_list)); - Assert(fullpath); - fullpath->value=grib_context_strdup(c,full); - GRIB_MUTEX_LOCK(&mutex_c); - grib_trie_insert(c->def_files,basename,fullpath); - grib_context_log(c,GRIB_LOG_DEBUG,"Found def file %s in MEMFS",full); - GRIB_MUTEX_UNLOCK(&mutex_c); - return fullpath->value; - } -#endif +// #ifdef HAVE_MEMFS +// sprintf(full,"/definitions/%s",basename); +// if(codes_memfs_exists(full)) { +// fullpath=(grib_string_list*)grib_context_malloc_clear_persistent(c,sizeof(grib_string_list)); +// Assert(fullpath); +// fullpath->value=grib_context_strdup(c,full); +// GRIB_MUTEX_LOCK(&mutex_c); +// grib_trie_insert(c->def_files,basename,fullpath); +// grib_context_log(c,GRIB_LOG_DEBUG,"Found def file %s in MEMFS",full); +// GRIB_MUTEX_UNLOCK(&mutex_c); +// return fullpath->value; +// } +// #endif } GRIB_MUTEX_LOCK(&mutex_c);