-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
add nc4-formatted tile file when generating bcs #1028
Conversation
…Sgcm_GridComp into feature/wjiang/nc4_tilefile
…ice on EASE grid; cleanup and documentation
GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/rasterize.F90
Outdated
Show resolved
Hide resolved
...GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkEASETilesParam.F90
Show resolved
Hide resolved
GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/rasterize.F90
Outdated
Show resolved
Hide resolved
...GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkEASETilesParam.F90
Show resolved
Hide resolved
...GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkEASETilesParam.F90
Show resolved
Hide resolved
...omp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/TileFile_ASCII_to_nc4.F90
Outdated
Show resolved
Hide resolved
...omp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/TileFile_ASCII_to_nc4.F90
Outdated
Show resolved
Hide resolved
@gmao-rreichle It is ready for your review |
…ram.F90, mkEASETilesParam.F90, rmTinyCatchParaMod.F90)
@weiyuan-jiang: To compute the supplemental attributes for landice and lake tiles, I suspect we need to modify the (renamed) subroutine supplemental_tile_attributes(). Specifically, I think the indices ip1 and ip2 appear to constrain the calculations to just land tiles. Perhaps it would not be difficult to calculate the supplemental attributes for landice and lake tiles. We do not want them for ocean tiles, and we do not want them written into the legacy "catchment.def" file. The idea is to have good values for min/max lat/lon and elevation of landice and lake tiles in the new, nc4-formatted tile file. Line 2138 in 19eb1cb
|
Is the min/max of lat/lon of landice and lake calculated by the same way as land ? |
I would think so. The information from the raster (*.rst) file, which is the basis for the min/max lat/lon calculations, isn't specific to land and should work for landice and lake in the same way. |
I agree with Rolf. The lake and landice tile min and max should be calculated the same way as land. Like land, both are irregular. |
OK, I will take care of it |
Testing summary: @sdrabenh this PR is also ready for you. To be merged you must first merge #909. That is why I am leaving blocking label. |
...m_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_shared.py
Outdated
Show resolved
Hide resolved
23e2cb8
We fixed all the labels so we are good to be merged. |
The merge-base changed after approval.
This PR modifies
make_bcs
to create an NC4-formatted tile file, in addition to the ASCII-formatted tile files.The NC4-formatted tile file also includes the supplemental tile attributes (min/max lat/lon and elevation of each tile) needed by GEOSldas, which are currently stored in the (land-only) "catchment.def" file. The supplemental tile attributes are now also computed for landice and lake tiles.
The PR also includes a py script and an F90 utility program to retroactively create NC4-formatted tile files for existing bcs.
Because the PR only touches make_bcs, it should be trivially 0-diff for the standard GCM and GEOSldas nightly tests.
The PR is also 0-diff for bcs generation (except for the version-specific README file generated by make_bcs).
In the future, the ASCII-formatted tile file and catchment.def file should become obsolete.
Contingencies: #909 must be merged first.
@tclune @biljanaorescanin @sdrabenh @lcandre2