Skip to content

corrected indexing into geotransform array in cetb_file.c #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mollyhardman merged 2 commits into from
Nov 26, 2024
Merged

corrected indexing into geotransform array in cetb_file.c #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b33126
corrected indexing into geotransform array in cetb_file.c
mollyhardman Nov 12, 2024
9fc50bb
tweaks to cetb.h per Scott Stewart review
mollyhardman Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions include/cetb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ static const char *cetb_geotransform[CETB_NUM_REGIONS]
"-9000000.00000 9000.00000 0 9000000.00000 0 -9000.00000 ",
"-9000000.00000 4500.00000 0 9000000.00000 0 -4500.00000 " ,
"-9000000.00000 2250.00000 0 9000000.00000 0 -2250.00000 "}, /* row indexed by EASE2_S 36 km */
{ "-17367530.44516 36032.22084 0 7314540.83063 0 -36032.22084 ",
"-17367530.44516 18016.11042 0 7314540.83063 0 -18016.11042 ",
"-17367530.44516 9008.05521 0 7314540.83063 0 -9008.05521 ",
"-17367530.44516 4504.02760 0 7314540.83063 0 -4504.02760 ",
"-17367530.44516 2252.01380 0 7314540.83063 0 -2252.01380 "}, /* row indexed by EASE2_M 36 km */
{ "-17367530.44516 36032.22084 0 7314540.83064 0 -36032.22084 ",
"-17367530.44516 18016.11042 0 7314540.83064 0 -18016.11042 ",
"-17367530.44516 9008.05521 0 7314540.83064 0 -9008.05521 ",
"-17367530.44516 4504.02760 0 7314540.83064 0 -4504.02760 ",
"-17367530.44516 2252.01380 0 7314540.83064 0 -2252.01380 "}, /* row indexed by EASE2_M 36 km */
{ "-9000000.00000 24000.00000 0 9000000.00000 0 -24000.00000 ",
"-9000000.00000 12000.00000 0 9000000.00000 0 -12000.00000 ",
"-9000000.00000 6000.00000 0 9000000.00000 0 -6000.00000 ",
Expand All @@ -207,20 +207,20 @@ static const char *cetb_geotransform[CETB_NUM_REGIONS]
"-9000000.00000 6000.00000 0 9000000.00000 0 -6000.00000 ",
"-9000000.00000 3000.00000 0 9000000.00000 0 -3000.00000 ",
"-9000000.00000 1500.00000 0 9000000.00000 0 -1500.00000 "}, /* row indexed by EASE2_S 24 km */
{ "-17367530.44516 24021.48056 0 7314540.83063 0 -24021.48056 ",
"-17367530.44516 12010.74028 0 7314540.83063 0 -12010.74028 ",
"-17367530.44516 6005.37014 0 7314540.83063 0 -6005.37014 ",
"-17367530.44516 3002.68507 0 7314540.83063 0 -3002.68507 ",
"-17367530.44516 1501.34253 0 7314540.83063 0 -1501.34253 " } /* row indexed by EASE2_M 24 km */
{ "-17367530.44516 24021.48056 0 7314540.83064 0 -24021.48056 ",
"-17367530.44516 12010.74028 0 7314540.83064 0 -12010.74028 ",
"-17367530.44516 6005.37014 0 7314540.83064 0 -6005.37014 ",
"-17367530.44516 3002.68507 0 7314540.83064 0 -3002.68507 ",
"-17367530.44516 1501.34254 0 7314540.83064 0 -1501.34254 " } /* row indexed by EASE2_M 24 km */
};

/*
* Number of rows is a function of projection (N, S, T) and resolution factor
*/
static long int cetb_grid_rows[CETB_NUM_REGIONS]
[CETB_MAX_RESOLUTION_FACTOR+1] = {
{ 720, 1440, 2880, 5760, 11510 }, /* row indexed by EASE2_N 25 km */
{ 720, 1440, 2880, 5760, 11510 }, /* row indexed by EASE2_S 25 km */
{ 720, 1440, 2880, 5760, 11520 }, /* row indexed by EASE2_N 25 km */
{ 720, 1440, 2880, 5760, 11520 }, /* row indexed by EASE2_S 25 km */
{ 540, 1080, 2160, 4320, 8640 }, /* row indexed by EASE2_T 25 km */
{ 500, 1000, 2000, 4000, 8000 }, /* row indexed by EASE2_N 36 km */
{ 500, 1000, 2000, 4000, 8000 }, /* row indexed by EASE2_S 36 km */
Expand All @@ -235,8 +235,8 @@ static long int cetb_grid_rows[CETB_NUM_REGIONS]
*/
static long int cetb_grid_cols[CETB_NUM_REGIONS]
[CETB_MAX_RESOLUTION_FACTOR+1] = {
{ 720, 1440, 2880, 5760, 11510 }, /* row indexed by EASE2_N 25 km */
{ 720, 1440, 2880, 5760, 11510 }, /* row indexed by EASE2_S 25 km */
{ 720, 1440, 2880, 5760, 11520 }, /* row indexed by EASE2_N 25 km */
{ 720, 1440, 2880, 5760, 11520 }, /* row indexed by EASE2_S 25 km */
{ 1388, 2776, 5552, 11104, 22208 }, /* row indexed by EASE2_T 25 km */
{ 500, 1000, 2000, 4000, 8000 }, /* row indexed by EASE2_N 36 km */
{ 500, 1000, 2000, 4000, 8000 }, /* row indexed by EASE2_S 36 km */
Expand Down
6 changes: 3 additions & 3 deletions src/prod/cetb_file/src/cetb_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,10 +1855,10 @@ int fetch_crs( cetb_file_class *this, int template_fid ) {
}

if ( ( status = nc_put_att_text( this->fid, crs_id, "GeoTransform",
strlen( cetb_geotransform[this->region_id][this->resolution_id] ),
cetb_geotransform[this->region_id][this->resolution_id] ) ) ) {
strlen( cetb_geotransform[this->region_id][this->factor] ),
cetb_geotransform[this->region_id][this->factor] ) ) ) {
fprintf( stderr, "%s: Error setting %s to %s: %s.\n",
__FUNCTION__, "GeoTransform", cetb_geotransform[this->region_id][this->resolution_id],
__FUNCTION__, "GeoTransform", cetb_geotransform[this->region_id][this->factor],
nc_strerror( status ) );
return 1;
}
Expand Down
Loading