core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-701: Change type to sfo (Simulation forced with observations)

This commit is contained in:
Shahram Najm 2018-06-18 10:42:00 +01:00
parent 1e188a902d
commit a501414622
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
definitions/Makefile.am
View File

@ -16306,12 +16306,12 @@ dist_definitionsmars_DATA = \
mars/grib.edmo.cl.def\ mars/grib.edmo.cl.def\
mars/grib.edmo.fc.def\ mars/grib.edmo.fc.def\
mars/grib.edmo.ssd.def\ mars/grib.edmo.ssd.def\
mars/grib.efas.an.def\
mars/grib.efas.cf.def\ mars/grib.efas.cf.def\
mars/grib.efas.fc.def\ mars/grib.efas.fc.def\
mars/grib.efas.fu.def\ mars/grib.efas.fu.def\
mars/grib.efas.go.def\ mars/grib.efas.go.def\
mars/grib.efas.pf.def\ mars/grib.efas.pf.def\
mars/grib.efas.sfo.def\
mars/grib.efhc.cf.def\ mars/grib.efhc.cf.def\
mars/grib.efhc.icp.def\ mars/grib.efhc.icp.def\
mars/grib.efhc.pf.def\ mars/grib.efhc.pf.def\

3
definitions/mars/grib.efas.sia.def → definitions/mars/grib.efas.sfo.def
View File

@ -1,4 +1,5 @@
# EFAS Simulated Analysis (Water Balance) # Simulation forced with observations (EFAS)
# Water Balance
# ECC-701 # ECC-701
alias mars.step = endStep; alias mars.step = endStep;

2
definitions/mars/type.table
View File

@ -56,7 +56,7 @@
70 or Ocean reanalysis 70 or Ocean reanalysis
71 fx Flux forcing 71 fx Flux forcing
72 fu Fill-up 72 fu Fill-up
73 sia EFAS simulated Analysis 73 sfo Simulation forced with observations
80 fcmean Forecast mean 80 fcmean Forecast mean
81 fcmax Forecast maximum 81 fcmax Forecast maximum
82 fcmin Forecast minimum 82 fcmin Forecast minimum

4
src/grib_accessor_class_g2_mars_labeling.c
View File

@ -369,8 +369,8 @@ static int extra_set(grib_accessor* a,long val)
break; break;
case 70: /* Ocean reanalysis (or) */ case 70: /* Ocean reanalysis (or) */
case 71: /* Flux forcing (fx) */ case 71: /* Flux forcing (fx) */
case 72: /* EFAS Fill-up (fu) */ case 72: /* Fill-up (fu) */
case 73: /* EFAS Simulated Analysis */ case 73: /* Simulation forced with observations (sfo) */
case 80: /* Forecast mean (fcmean) */ case 80: /* Forecast mean (fcmean) */
case 81: /* Forecast maximum (fcmax) */ case 81: /* Forecast maximum (fcmax) */
case 82: /* Forecast minimum (fcmin) */ case 82: /* Forecast minimum (fcmin) */

2
tests/grib_efas.sh
View File

@ -66,7 +66,7 @@ grib_check_key_equals $temp1 anoffset 25
grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSING MISSING MISSING" grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSING MISSING MISSING"
# MARS step # MARS step
types="sia fu go" types="sfo fu go"
for t in $types; do for t in $types; do
${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \ ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \
$sample $temp1 $sample $temp1