Skip to content
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 'modis_30s_lake' for MODIS 20-class with lakes dataset to GEOGRID.TBL #25

Merged
merged 1 commit into from Apr 11, 2017

Conversation

mgduda
Copy link
Collaborator

@mgduda mgduda commented Apr 6, 2017

'modis_30s_lake' refers to the dataset created from the 30-arc-second MODIS
20-class dataset with algorithmically added inland water bodies, and which also
has corrections to remove spurious water points over Antarctica.

This commit also makes the 'modis_30s_lake' dataset the default.

For aesthetic reasons, most lines in the LANDUSEF entry have been modified
to align the ':' character; these other changes (beyond the 'modis_30s_lake'
lines) should be purely whitespace changes.

….TBL

'modis_30s_lake' refers to the dataset created from the 30-arc-second MODIS
20-class dataset with algorithmically added inland water bodies, and which also
has corrections to remove spurious water points over Antarctica.

This commit also makes the 'modis_30s_lake' dataset the default.

For aesthetic reasons, most lines in the LANDUSEF entry have been modified
to align the ':' character; these other changes (beyond the 'modis_30s_lake'
lines) should be purely whitespace changes.
@mgduda mgduda requested a review from weiwangncar April 6, 2017 01:46
@mgduda
Copy link
Collaborator Author

mgduda commented Apr 6, 2017

Just for reference, here are the changes introduced in this PR ignoring whitespace changes (i.e., using git diff -w):

--- a/geogrid/GEOGRID.TBL.ARW
+++ b/geogrid/GEOGRID.TBL.ARW
@@ -32,6 +32,7 @@ name=LANDUSEF
         landmask_water  =       ssib_5m:16         # Calculate a landmask from this field
         landmask_water =      modis_15s:17         # Calculate a landmask from this field
         landmask_water =      modis_30s:17         # Calculate a landmask from this field
+        landmask_water = modis_30s_lake:17,21      # Calculate a landmask from this field
         landmask_water =       usgs_30s:16         # Calculate a landmask from this field
         landmask_water =     usgs_lakes:16,28      # Calculate a landmask from this field
         landmask_water =    modis_lakes:17,21      # Calculate a landmask from this field
@@ -47,6 +48,7 @@ name=LANDUSEF
         interp_option =        ssib_5m:four_pt
         interp_option =      modis_15s:nearest_neighbor
         interp_option =      modis_30s:nearest_neighbor
+        interp_option = modis_30s_lake:nearest_neighbor
         interp_option =       usgs_30s:nearest_neighbor
         interp_option =     usgs_lakes:nearest_neighbor
         interp_option =    modis_lakes:nearest_neighbor
@@ -62,13 +64,14 @@ name=LANDUSEF
         rel_path =        ssib_5m:ssib_landuse_5m/
         rel_path =      modis_15s:modis_landuse_20class_15s/
         rel_path =      modis_30s:modis_landuse_20class_30s/
+        rel_path = modis_30s_lake:modis_landuse_20class_30s_with_lakes/
         rel_path =       usgs_30s:landuse_30s/
         rel_path =     usgs_lakes:landuse_30s_with_lakes/
         rel_path =    modis_lakes:modis_landuse_21class_30s/
         rel_path =        usgs_2m:landuse_2m/
         rel_path =        usgs_5m:landuse_5m/
         rel_path =       usgs_10m:landuse_10m/
-        rel_path =     default:modis_landuse_21class_30s/
+        rel_path =        default:modis_landuse_20class_30s_with_lakes/
 ===============================
 name=SOILTEMP
         priority=1

@davegill
Copy link
Collaborator

davegill commented Apr 6, 2017

@mgduda
Thank you for including the output from the git diff -w command, it makes the comparison much easier

Also, tricky name: 20 class with lakes.

@mgduda
Copy link
Collaborator Author

mgduda commented Apr 11, 2017

@weiwangncar When you have a moment, could you review this PR and approve it if you have no objections?

Copy link
Collaborator

@weiwangncar weiwangncar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with the change.

@mgduda mgduda merged commit 5fce30b into wrf-model:master Apr 11, 2017
@mgduda mgduda mentioned this pull request Apr 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants