Commit b8f08444 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Added operator selparam - Select parameters by identifier

parent f4b7995d
......@@ -5,9 +5,11 @@
2011-03-11 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* sinfo: changed output of table and code number to parameter idenifier
* info: changed output of code number to parameter idenifier
* diff: changed output of code number to parameter idenifier
* Added operator selparam - Select parameters by identifier
* Added operator delparam - Delete parameters by identifier
* sinfo: changed output of table and code number to parameter identifier
* info: changed output of code number to parameter identifier
* diff: changed output of code number to parameter identifier
2011-03-09 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
......
......@@ -7,11 +7,14 @@ Version 1.5.0 (?? March 2011):
* GRIB2 support via ECMWF GRIB_API
* Added support for netCDF level bounds
* Added option -O to overwrite existing output file (only for ens<STAT>, merge, mergetime)
New operators:
* selparam: Select parameters by identifier
* delparam: Delete parameters by identifier
Changed operators:
* expr: added functions abs(), int(), nint(), sqr()
* sinfo: changed output of table and code number to parameter idenifier
* info: changed output of code number to parameter idenifier
* diff: changed output of code number to parameter idenifier
* sinfo: changed output of table and code number to parameter identifier
* info: changed output of code number to parameter identifier
* diff: changed output of code number to parameter identifier
Fixed bugs:
* sellonlatbox: does not work as expected when selecting all longitutes
* sellonlatbox: initialization missing for unstructured grids
......
......@@ -58,11 +58,13 @@ Operator catalog:
-------------------------------------------------------------
Selection
-------------------------------------------------------------
Selvar selcode Select variables by code number
Selvar delcode Delete variables by code number
Selvar selname Select variables by name
Selvar delname Delete variables by name
Selvar selstdname Select variables by standard name
Selvar selparam Select parameters by identifier
Selvar delparam Delete parameters by identifier
Selvar selcode Select parameters by code number
Selvar delcode Delete parameters by code number
Selvar selname Select parameters by name
Selvar delname Delete parameters by name
Selvar selstdname Select parameters by standard name
Selvar sellevel Select levels
Selvar sellevidx Select levels by index
Selvar selgrid Select grids
......
......@@ -5,7 +5,7 @@
@Section = Selection
@Class = Selection
@Arguments = ifile ofile
@Operators = selcode delcode selname delname selstdname sellevel sellevidx selgrid selzaxis selltype seltabnum
@Operators = selparam delparam selcode delcode selname delname selstdname sellevel sellevidx selgrid selzaxis selltype seltabnum
@BeginDescription
This module selects some fields from @file{ifile} and writes them to @file{ofile}.
......@@ -14,8 +14,48 @@ The fields selected depends on the chosen operator and the parameters.
@EndModule
@BeginOperator_selparam
@Title = Select parameters by identifier
@Parameter = params
@BeginDescription
Selects all fields with parameter identifiers in a user given list.
@EndDescription
@EndOperator
@BeginOperator_delparam
@Title = Delete parameters by identifier
@Parameter = params
@BeginDescription
Deletes all fields with parameter identifiers in a user given list.
@EndDescription
@EndOperator
@BeginOperator_selcode
@Title = Select parameters by code number
@Parameter = codes
@BeginDescription
Selects all fields with code numbers in a user given list.
@EndDescription
@EndOperator
@BeginOperator_delcode
@Title = Delete parameters by code number
@Parameter = codes
@BeginDescription
Deletes all fields with code numbers in a user given list.
@EndDescription
@EndOperator
@BeginOperator_selcode
@Title = Select variables by code number
@Title = Select parameters by code number
@Parameter = codes
@BeginDescription
......@@ -25,7 +65,7 @@ Selects all fields with code numbers in a user given list.
@BeginOperator_delcode
@Title = Delete variables by code number
@Title = Delete parameters by code number
@Parameter = codes
@BeginDescription
......@@ -35,27 +75,27 @@ Deletes all fields with code numbers in a user given list.
@BeginOperator_selname
@Title = Select variables by name
@Parameter = varnames
@Title = Select parameters by name
@Parameter = names
@BeginDescription
Selects all fields with variable names in a user given list.
Selects all fields with parameter names in a user given list.
@EndDescription
@EndOperator
@BeginOperator_delname
@Title = Delete variables by name
@Parameter = varnames
@Title = Delete parameters by name
@Parameter = names
@BeginDescription
Deletes all fields with variable names in a user given list.
Deletes all fields with parameter names in a user given list.
@EndDescription
@EndOperator
@BeginOperator_selstdname
@Title = Select variables by standard name
@Title = Select parameters by standard name
@Parameter = stdnames
@BeginDescription
......@@ -136,9 +176,11 @@ This operator can not be used with netCDF data!
@BeginParameter
@Item = params
INTEGER Comma separated list of parameter identifiers
@Item = codes
INTEGER Comma separated list of code numbers
@Item = varnames
@Item = names
STRING Comma separated list of variable names
@Item = stdnames
STRING Comma separated list of standard names
......
......@@ -18,13 +18,13 @@
/*
This module contains the following operators:
Selvar selparam Select parameter (format: code.tabnum or pnum.cat.dis)
Selvar delparam Delete parameter (format: code.tabnum or pnum.cat.dis)
Selvar selcode Select codes
Selvar delcode Delete codes
Selvar selname Select variables
Selvar delname Delete variables
Selvar selstdname Select variables by CF standard name
Selvar selparam Select parameters by identifier (format: code.tabnum or pnum.cat.dis)
Selvar delparam Delete parameters by identifier (format: code.tabnum or pnum.cat.dis)
Selvar selcode Select parameters by code number
Selvar delcode Delete parameters by code number
Selvar selname Select parameters by name
Selvar delname Delete parameters by name
Selvar selstdname Select parameters by CF standard name
Selvar sellevel Select levels
Selvar sellevidx Select levels by index
Selvar selgrid Select grids
......@@ -82,7 +82,7 @@ void *Selvar(void *argument)
cdoInitialize(argument);
SELPARAM = cdoOperatorAdd("selparam", 0, 0, "parameter");
SELPARAM = cdoOperatorAdd("selparam", 0, 0, "parameters");
SELCODE = cdoOperatorAdd("selcode", 0, 0, "code numbers");
SELNAME = cdoOperatorAdd("selname", 0, 0, "variable names");
SELSTDNAME = cdoOperatorAdd("selstdname", 0, 0, "standard names");
......
......@@ -350,10 +350,12 @@ static char *SplitselHelp[] = {
static char *SelvarHelp[] = {
"NAME",
" selcode, delcode, selname, delname, selstdname, sellevel, sellevidx, selgrid, ",
" selzaxis, selltype, seltabnum - Select fields",
" selparam, delparam, selcode, delcode, selname, delname, selstdname, sellevel, ",
" sellevidx, selgrid, selzaxis, selltype, seltabnum - Select fields",
"",
"SYNOPSIS",
" selparam,params ifile ofile",
" delparam,params ifile ofile",
" selcode,codes ifile ofile",
" delcode,codes ifile ofile",
" selname,varnames ifile ofile",
......@@ -371,15 +373,19 @@ static char *SelvarHelp[] = {
" The fields selected depends on the chosen operator and the parameters.",
"",
"OPERATORS",
" selcode Select variables by code number",
" selparam Select parameters by identifier",
" Selects all fields with parameter identifiers in a user given list.",
" delparam Delete parameters by identifier",
" Deletes all fields with parameter ideniifiers in a user given list.",
" selcode Select parameters by code number",
" Selects all fields with code numbers in a user given list.",
" delcode Delete variables by code number",
" delcode Delete parameters by code number",
" Deletes all fields with code numbers in a user given list.",
" selname Select variables by name",
" Selects all fields with variable names in a user given list.",
" delname Delete variables by name",
" Deletes all fields with variable names in a user given list.",
" selstdname Select variables by standard name",
" selname Select parameters by name",
" Selects all fields with parameter names in a user given list.",
" delname Delete parameters by name",
" Deletes all fields with parameter names in a user given list.",
" selstdname Select parameters by standard name",
" Selects all fields with standard names in a user given list.",
" sellevel Select levels",
" Selects all fields with levels in a user given list.",
......@@ -395,6 +401,7 @@ static char *SelvarHelp[] = {
" Selects all fields with parameter table numbers in a user given list.",
"",
"PARAMETER",
" params INTEGER Comma separated list of parameter identifiers",
" codes INTEGER Comma separated list of code numbers",
" varnames STRING Comma separated list of variable names",
" stdnames STRING Comma separated list of standard names",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment