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

ECC-1552: Revert for now (breaks Magics)

This commit is contained in:
Shahram Najm 2023-03-16 14:49:29 +00:00
parent 6fbd09b7f3
commit cbaf279dbb
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/grib_accessor_class_proj_string.cc
View File

@ -294,7 +294,8 @@ static int proj_polar_stereographic(grib_handle* h, char* result)
return err; return err;
} }
// This is for regular_ll, regular_gg, reduced_ll, reduced_gg #if 0
// ECC-1552: This is for regular_ll, regular_gg, reduced_ll, reduced_gg
static int proj_unprojected(grib_handle* h, char* result) static int proj_unprojected(grib_handle* h, char* result)
{ {
int err = 0; int err = 0;
@ -305,6 +306,7 @@ static int proj_unprojected(grib_handle* h, char* result)
snprintf(result, 1024, "+proj=longlat %s", shape); snprintf(result, 1024, "+proj=longlat %s", shape);
return err; return err;
} }
#endif
static int proj_mercator(grib_handle* h, char* result) static int proj_mercator(grib_handle* h, char* result)
{ {
@ -323,10 +325,10 @@ static int proj_mercator(grib_handle* h, char* result)
#define NUMBER(a) (sizeof(a) / sizeof(a[0])) #define NUMBER(a) (sizeof(a) / sizeof(a[0]))
static proj_mapping proj_mappings[] = { static proj_mapping proj_mappings[] = {
{ "regular_ll", &proj_unprojected }, // { "regular_ll", &proj_unprojected },
{ "regular_gg", &proj_unprojected }, // { "regular_gg", &proj_unprojected },
{ "reduced_ll", &proj_unprojected }, // { "reduced_ll", &proj_unprojected },
{ "reduced_gg", &proj_unprojected }, // { "reduced_gg", &proj_unprojected },
{ "mercator", &proj_mercator }, { "mercator", &proj_mercator },
{ "lambert", &proj_lambert_conformal }, { "lambert", &proj_lambert_conformal },

21
tests/grib_proj_string.sh
View File

@ -46,16 +46,17 @@ for f in `echo $files`; do
done done
# Various grid types # Various grid types
${tools_dir}/grib_get -p projString $grib2_sample > $tempText # ECC-1552
grep -q "proj=longlat +R=6367470" $tempText # ${tools_dir}/grib_get -p projString $grib2_sample > $tempText
${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_ll_pl_grib2.tmpl > $tempText # grep -q "proj=longlat +R=6367470" $tempText
grep -q "proj=longlat +R=6371229" $tempText # ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_ll_pl_grib2.tmpl > $tempText
${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_gg_ml_grib1.tmpl > $tempText # grep -q "proj=longlat +R=6371229" $tempText
grep -q "proj=longlat +R=6367470" $tempText # ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/regular_gg_ml_grib1.tmpl > $tempText
${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_ll_sfc_grib1.tmpl > $tempText # grep -q "proj=longlat +R=6367470" $tempText
grep -q "proj=longlat +R=6367470" $tempText # ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_ll_sfc_grib1.tmpl > $tempText
${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl > $tempText # grep -q "proj=longlat +R=6367470" $tempText
grep -q "proj=longlat +R=6371229" $tempText # ${tools_dir}/grib_get -p projString $ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl > $tempText
# grep -q "proj=longlat +R=6371229" $tempText
${tools_dir}/grib_set -s gridType=lambert_azimuthal_equal_area $grib2_sample $tempGrib ${tools_dir}/grib_set -s gridType=lambert_azimuthal_equal_area $grib2_sample $tempGrib