diff --git a/definitions/Makefile.am b/definitions/Makefile.am index 700b8f4c1..06db12299 100644 --- a/definitions/Makefile.am +++ b/definitions/Makefile.am @@ -16306,12 +16306,12 @@ dist_definitionsmars_DATA = \ mars/grib.edmo.cl.def\ mars/grib.edmo.fc.def\ mars/grib.edmo.ssd.def\ - mars/grib.efas.an.def\ mars/grib.efas.cf.def\ mars/grib.efas.fc.def\ mars/grib.efas.fu.def\ mars/grib.efas.go.def\ mars/grib.efas.pf.def\ + mars/grib.efas.sfo.def\ mars/grib.efhc.cf.def\ mars/grib.efhc.icp.def\ mars/grib.efhc.pf.def\ diff --git a/definitions/mars/grib.efas.sia.def b/definitions/mars/grib.efas.sfo.def similarity index 91% rename from definitions/mars/grib.efas.sia.def rename to definitions/mars/grib.efas.sfo.def index 0d8be9c8e..a66d7053d 100644 --- a/definitions/mars/grib.efas.sia.def +++ b/definitions/mars/grib.efas.sfo.def @@ -1,4 +1,5 @@ -# EFAS Simulated Analysis (Water Balance) +# Simulation forced with observations (EFAS) +# Water Balance # ECC-701 alias mars.step = endStep; diff --git a/definitions/mars/type.table b/definitions/mars/type.table index e7a3b60bd..d9f6486b3 100644 --- a/definitions/mars/type.table +++ b/definitions/mars/type.table @@ -56,7 +56,7 @@ 70 or Ocean reanalysis 71 fx Flux forcing 72 fu Fill-up -73 sia EFAS simulated Analysis +73 sfo Simulation forced with observations 80 fcmean Forecast mean 81 fcmax Forecast maximum 82 fcmin Forecast minimum diff --git a/src/grib_accessor_class_g2_mars_labeling.c b/src/grib_accessor_class_g2_mars_labeling.c index b80148547..18492138b 100644 --- a/src/grib_accessor_class_g2_mars_labeling.c +++ b/src/grib_accessor_class_g2_mars_labeling.c @@ -369,8 +369,8 @@ static int extra_set(grib_accessor* a,long val) break; case 70: /* Ocean reanalysis (or) */ case 71: /* Flux forcing (fx) */ - case 72: /* EFAS Fill-up (fu) */ - case 73: /* EFAS Simulated Analysis */ + case 72: /* Fill-up (fu) */ + case 73: /* Simulation forced with observations (sfo) */ case 80: /* Forecast mean (fcmean) */ case 81: /* Forecast maximum (fcmax) */ case 82: /* Forecast minimum (fcmin) */ diff --git a/tests/grib_efas.sh b/tests/grib_efas.sh index 3dca6cdc9..1d4f686f4 100755 --- a/tests/grib_efas.sh +++ b/tests/grib_efas.sh @@ -66,7 +66,7 @@ grib_check_key_equals $temp1 anoffset 25 grib_check_key_equals $temp1 anoffsetFirst,anoffsetLast,anoffsetFrequency "MISSING MISSING MISSING" # MARS step -types="sia fu go" +types="sfo fu go" for t in $types; do ${tools_dir}/grib_set -s setLocalDefinition=1,localDefinitionNumber=41,type=$t,stepType=accum,stepRange=12-36,paramId=260268 \ $sample $temp1