diff --git a/definitions/grib2/destine_datasetActivity.table b/definitions/grib2/destine_activity.table similarity index 100% rename from definitions/grib2/destine_datasetActivity.table rename to definitions/grib2/destine_activity.table diff --git a/definitions/grib2/destine_datasetVersion.table b/definitions/grib2/destine_datasetVersion.table deleted file mode 100644 index 0b2efc64e..000000000 --- a/definitions/grib2/destine_datasetVersion.table +++ /dev/null @@ -1,16 +0,0 @@ -0 unknown unknown -1 v20231001 v20231001 -2 v20231015 v20231015 -3 v20231101 v20231101 -4 v20231115 v20231115 -5 v20231201 v20231201 -6 v20231215 v20231215 -7 v20240101 v20240101 -8 v20240115 v20240115 -9 v20240201 v20240201 -10 v20240215 v20240215 -11 v20240301 v20240301 -12 v20240315 v20240315 -13 v20240401 v20240401 -14 v20240415 v20240415 -65535 65535 Missing diff --git a/definitions/grib2/destine_datasetExperiment.table b/definitions/grib2/destine_experiment.table similarity index 100% rename from definitions/grib2/destine_datasetExperiment.table rename to definitions/grib2/destine_experiment.table diff --git a/definitions/grib2/destine_resolution.table b/definitions/grib2/destine_resolution.table new file mode 100644 index 000000000..cf3263497 --- /dev/null +++ b/definitions/grib2/destine_resolution.table @@ -0,0 +1,4 @@ +0 unknown unknown +1 standard Standard resolution model output with guaranteed availability +2 highres High resolution model output with limited availability +65535 65535 Missing \ No newline at end of file diff --git a/definitions/grib2/local.destine.climate-dt.def b/definitions/grib2/local.destine.climate-dt.def index 596d7a9d5..e1266ce6e 100644 --- a/definitions/grib2/local.destine.climate-dt.def +++ b/definitions/grib2/local.destine.climate-dt.def @@ -1,13 +1,19 @@ # DestinE MARS ClimateDT keywords -codetable[2] datasetVersion "grib2/destine_datasetVersion.table" : dump; -alias mars.datasetVersion = datasetVersion; +codetable[2] activity "grib2/destine_activity.table" : dump; +alias mars.activity = activity; -codetable[2] datasetActivity "grib2/destine_datasetActivity.table" : dump; -alias mars.datasetActivity = datasetActivity; +codetable[2] experiment "grib2/destine_experiment.table" : dump; +alias mars.study = experiment; -codetable[2] datasetExperiment "grib2/destine_datasetExperiment.table" : dump; -alias mars.datasetExperiment = datasetExperiment; +unsigned[1] generation = 255 : dump; +alias mars.generation = generation; codetable[2] model "grib2/destine_model.table" : dump; -alias mars.model = model; \ No newline at end of file +alias mars.model = model; + +unsigned[1] realisation = 255 : dump; +alias mars.realisation = realisation; + +codetable[2] resolution "grib2/destine_resolution.table" : dump; +alias mars.resolution = resolution; diff --git a/definitions/grib2/localConcepts/destine/destineOriginConcept.def b/definitions/grib2/localConcepts/destine/destineOriginConcept.def index 9869ef9d0..041905d77 100644 --- a/definitions/grib2/localConcepts/destine/destineOriginConcept.def +++ b/definitions/grib2/localConcepts/destine/destineOriginConcept.def @@ -6,4 +6,4 @@ "BSC" = { centre=98; subCentre=1000; } "CSC" = { centre=98; subCentre=1001; } "DKRZ" = { centre=98; subCentre=1002; } -"Climate DT consortium (CSC,BSC,AWI,MPI-M)" = { centre=98; subCentre=1003; } +"Climate DT consortium (CSC,AWI,BSC,MPI-M)" = { centre=98; subCentre=1003; } diff --git a/definitions/grib2/localConcepts/destine/gridSpecificationConcept.def b/definitions/grib2/localConcepts/destine/gridSpecificationConcept.def index 28c7a5c47..1ae35446d 100644 --- a/definitions/grib2/localConcepts/destine/gridSpecificationConcept.def +++ b/definitions/grib2/localConcepts/destine/gridSpecificationConcept.def @@ -7,4 +7,7 @@ 'H512' = {numberOfDataPoints=3145728; gridDefinitionTemplateNumber=150; Nside=512;} 'H1024' = {numberOfDataPoints=12582912; gridDefinitionTemplateNumber=150; Nside=1024;} 'O1280' = {numberOfDataPoints=6599680; gridDefinitionTemplateNumber=40; Nj=2560;} -'O8000' = {numberOfDataPoints=256288000; gridDefinitionTemplateNumber=40; Nj=16000;} \ No newline at end of file +'O2560' = {numberOfDataPoints=26306560; gridDefinitionTemplateNumber=40; Nj=5120;} +'O8000' = {numberOfDataPoints=256288000; gridDefinitionTemplateNumber=40; Nj=16000;} +'F90' = {numberOfDataPoints=65160; gridDefinitionTemplateNumber=0; Ni=360; Nj=181; } +'F360' = {numberOfDataPoints=1038240; gridDefinitionTemplateNumber=0; Ni=1440; Nj=721; } diff --git a/definitions/grib2/products_12.def b/definitions/grib2/products_12.def index 569b90b65..35c5f909c 100644 --- a/definitions/grib2/products_12.def +++ b/definitions/grib2/products_12.def @@ -2,6 +2,4 @@ # Destination Earth (DestinE) -constant marsClass = 'd1'; - -include "grib2/products_destine.def" \ No newline at end of file +include "grib2/products_destine.def" diff --git a/tests/grib_ecc-1691.sh b/tests/grib_ecc-1691.sh index 679732587..31d02884d 100755 --- a/tests/grib_ecc-1691.sh +++ b/tests/grib_ecc-1691.sh @@ -27,7 +27,7 @@ tablesVersionLatest=$( ${tools_dir}/grib_get -p tablesVersionLatest $sample_grib ${tools_dir}/grib_set -s tablesVersion=$tablesVersionLatest,setLocalDefinition=1,grib2LocalSectionNumber=1 $sample_grib2 $temp_grib_a # Then change to processed data = 12 --> DestinE -${tools_dir}/grib_set -s productionStatusOfProcessedData=12 $temp_grib_a $destine_sample +${tools_dir}/grib_set -s productionStatusOfProcessedData=12,class=d1 $temp_grib_a $destine_sample # Check DestinE base related keys are present and correct grib_check_key_exists $destine_sample destineLocalVersion,dataset,marsClass,marsType,marsStream,experimentVersionNumber @@ -36,14 +36,14 @@ grib_check_key_equals $destine_sample "marsClass,dataset,destineLocalVersion" "d # Check setting dataset to climate-dt (1). Check keys are present and equal defaults ${tools_dir}/grib_set -s dataset=1 $destine_sample $temp_grib_a -grib_check_key_exists $temp_grib_a dataset,datasetVersion,datasetActivity,datasetExperiment,model -grib_check_key_equals $temp_grib_a "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 0 0 0 0" +grib_check_key_exists $temp_grib_a dataset,generation,activity,experiment,model,realisation,resolution +grib_check_key_equals $temp_grib_a "dataset,generation,activity,experiment,model,realisation,resolution" "1 255 0 0 0 255 0" # Check an example where a few additional things are set in climate-dt -${tools_dir}/grib_set -s dataset=1,datasetVersion=2,datasetActivity=1,datasetExperiment=1,model=2 $destine_sample $temp_grib_a +${tools_dir}/grib_set -s dataset=1,generation=2,activity=1,experiment=1,model=2,realisation=1,resolution=1 $destine_sample $temp_grib_a -grib_check_key_equals $temp_grib_a "dataset,datasetVersion,datasetActivity,datasetExperiment,model" "1 2 1 1 2" -grib_check_key_equals $temp_grib_a "dataset:s,datasetVersion:s,datasetActivity:s,datasetExperiment:s,model:s" "climate-dt v20231015 CMIP6 hist IFS-NEMO" +grib_check_key_equals $temp_grib_a "dataset,generation,activity,experiment,model,realisation,resolution" "1 2 1 1 2 1 1" +grib_check_key_equals $temp_grib_a "dataset:s,activity:s,experiment:s,model:s,resolution:s" "climate-dt CMIP6 hist IFS-NEMO standard" # Check mars.date and mars.time are equal to validityDate and validityTime, and that mars.step has been unaliased result1=$( ${tools_dir}/grib_get -p mars.date,mars.time $temp_grib_a )