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

Cleanup

This commit is contained in:
shahramn 2024-07-26 12:41:32 +01:00
parent 49d0a0cd70
commit 2d28023aba
2 changed files with 1 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/accessor/grib_accessor_class_g2_eps.cc
View File

@ -123,47 +123,6 @@ int grib_accessor_class_g2_eps_t::pack_long(grib_accessor* a, const long* val, s
// }
}
// Adjust for chemical species
// if (chemical == 1) {
// if (eps == 1) {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 41;
// }
// else {
// productDefinitionTemplateNumberNew = 43;
// }
// }
// else {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 40;
// }
// else {
// productDefinitionTemplateNumberNew = 42;
// }
// }
// }
// Adjust for aerosols
// if (aerosol == 1) {
// if (eps == 1) {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 45;
// }
// else {
// // productDefinitionTemplateNumberNew = 47; This PDT is deprecated
// productDefinitionTemplateNumberNew = 85;
// }
// }
// else {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 48; // 44 is deprecated*/
// }
// else {
// productDefinitionTemplateNumberNew = 46;
// }
// }
// }
if (productDefinitionTemplateNumberNew >=0 && productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
grib_set_long(hand, self->productDefinitionTemplateNumber, productDefinitionTemplateNumberNew);
if (derivedForecast >= 0)

102
src/accessor/grib_accessor_class_local_definition.cc
View File

@ -54,9 +54,6 @@ int grib_accessor_class_local_definition_t::pack_long(grib_accessor* a, const lo
long eps = -1;
long chemical = -1;
long aerosol = -1;
long chemical_distfn = -1;
long chemical_srcsink = -1;
long aerosol_optical = -1;
char stepType[15] = {0,};
size_t slen = 15;
int localDefinitionNumber = *val;
@ -81,10 +78,8 @@ int grib_accessor_class_local_definition_t::pack_long(grib_accessor* a, const lo
isInstant = 1;
grib_get_long(hand, self->grib2LocalSectionNumber, &grib2LocalSectionNumber);
grib_get_long(hand, "is_chemical", &chemical);
grib_get_long(hand, "is_chemical_distfn", &chemical_distfn);
grib_get_long(hand, "is_chemical_srcsink", &chemical_srcsink);
grib_get_long(hand, "is_aerosol", &aerosol);
grib_get_long(hand, "is_aerosol_optical", &aerosol_optical);
if (chemical == 1 && aerosol == 1) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Parameter cannot be both chemical and aerosol!");
return GRIB_ENCODING_ERROR;
@ -224,101 +219,6 @@ int grib_accessor_class_local_definition_t::pack_long(grib_accessor* a, const lo
productDefinitionTemplateNumberNew = -1; // disable PDT selection
}
// // Adjust for atmospheric chemical constituents
// if (chemical == 1) {
// if (eps == 1) {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 41);
// }
// else {
// Assert(productDefinitionTemplateNumber == 43);
// }
// }
// else {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 40);
// }
// else {
// Assert(productDefinitionTemplateNumber == 42);
// }
// }
// }
// // Adjust for atmospheric chemical constituents based on a distribution function
// if (chemical_distfn == 1) {
// if (eps == 1) {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 58);
// }
// else {
// Assert(productDefinitionTemplateNumber == 68);
// }
// }
// else {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 57);
// }
// else {
// Assert(productDefinitionTemplateNumber == 67);
// }
// }
// }
// // Adjust for atmospheric chemical constituents with source or sink
// if (chemical_srcsink == 1) {
// if (eps == 1) {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 77);
// }
// else {
// Assert(productDefinitionTemplateNumber == 79);
// }
// }
// else {
// if (isInstant) {
// Assert(productDefinitionTemplateNumber == 76);
// }
// else {
// Assert(productDefinitionTemplateNumber == 78);
// }
// }
// }
// Adjust for aerosols
// if (aerosol == 1) {
// if (eps == 1) {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 45;
// }
// else {
// // productDefinitionTemplateNumberNew = 47; This PDT is deprecated
// productDefinitionTemplateNumberNew = 85;
// }
// }
// else {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 48; // 44 is deprecated*/
// }
// else {
// productDefinitionTemplateNumberNew = 46;
// }
// }
// }
// // Adjust for optical properties of aerosol
// if (aerosol_optical == 1) {
// if (eps == 1) {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 49;
// }
// }
// else {
// if (isInstant) {
// productDefinitionTemplateNumberNew = 48;
// }
// }
// }
if (productDefinitionTemplateNumberNew >=0 && productDefinitionTemplateNumber != productDefinitionTemplateNumberNew) {
if (a->context->debug) {
fprintf(stderr, "ECCODES DEBUG %s %s: ldNumber=%d, newPDTN=%ld\n", a->cclass->name, __func__,