-
Notifications
You must be signed in to change notification settings - Fork 318
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
Integrate @bekozi's ocgis tool in mkmapdata.sh #815
Closed
Closed
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
431aa58
Merge tag 'ctsm1.0.dev067' into mkmapdata_ocgis
slevis-lmwg 1cd3689
Integrating @bekozi's ocgis tool within mkmapdata.sh
slevis-lmwg 36d2041
Correcting ocgis working directory in mkmapdata.sh
slevis-lmwg b230b9c
Merge tag 'ctsm1.0.dev079' into mkmapdata_ocgis
slevis-lmwg ef5f3d5
Switch to working with UNSTUCTgrid nomask SRC files
slevis-lmwg e6d69b4
mkmapdata.sh with ocgis: updates for regional DST grids
slevis-lmwg 309ef79
Get mkmapdata.sh to work with ocgis for ALL src/dst combinations
slevis-lmwg e7d6e97
Revisions in response to @ekluzek's review
slevis-lmwg 504a8aa
Changing from specific to generic module loads
slevis-lmwg 3199196
Mainly reversing mods that were for using "nomask" SRC files
slevis-lmwg e424fc5
Replace NCHUNKS_DST with a value that works for all DST files
slevis-lmwg bde5781
Small correction to fully revert to the modifications without nomask
slevis-lmwg 5af5fa3
Changes needed for 1km SRC files to work with ocgis
slevis-lmwg 1bb9a5b
Merge tag 'ctsm5.1.dev002' into mkmapdata_ocgis
slevis-lmwg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1159,6 +1159,11 @@ Toggle to turn on on diagnostic Snow Radiative Effect | |
SCRIP format grid data file | ||
</entry> | ||
|
||
<entry id="unstructdata" type="char*256" category="mkmapdata" | ||
input_pathname="abs" group="clmexp" valid_values="" > | ||
UNSTRUCT format grid data file | ||
</entry> | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Placeholder. I'm ok with removing if that's preferred. |
||
<entry id="scripgriddata_lrgfile_needed" type="char*256" category="mkmapdata" | ||
group="clmexp" valid_values="none,64bit_offset,netcdf4" > | ||
Flag to pass to the ESMF mapping utility, telling it what kind of large | ||
|
@@ -1172,13 +1177,25 @@ Flag to pass to the ESMF mapping utility, telling it what kind of grid | |
file this is (SCRIP or UGRID). | ||
</entry> | ||
|
||
<entry id="unstructdata_type" type="char*256" category="mkmapdata" | ||
group="clmexp" valid_values="ESMFMESH" > | ||
Flag to pass to the ESMF mapping utility, telling it what kind of grid | ||
file this is. | ||
</entry> | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Placeholder. I'm ok with removing if that's preferred. |
||
<entry id="scripgriddata_meshname" type="char*256" category="mkmapdata" | ||
group="clmexp" valid_values="" > | ||
For UGRID files, flag to pass to the ESMF mapping utility, telling it the | ||
name of the dummy variable that has all of the topology information stored | ||
in its attributes. (Only used if scripgriddata_src_type = UGRID.) | ||
</entry> | ||
|
||
<entry id="max_res" type="real" category="mkmapdata" | ||
group="clmexp" valid_values="" > | ||
Maximum resolution of source and destination files required by the ocgis | ||
tool. | ||
</entry> | ||
|
||
<!-- --> | ||
<!-- mksurfdata namelist --> | ||
<!-- --> | ||
|
@@ -1849,7 +1866,7 @@ CLM run type. | |
<entry id="res" type="char*30" category="default_settings" | ||
group="default_settings" | ||
valid_values= | ||
"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> | ||
"512x1024,360x720cru,128x256,64x128,48x96,94x192,0.23x0.31,0.47x0.63,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,0.125nldas2,5x5_amazon,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.25x0.25,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min"> | ||
Horizontal resolutions | ||
Note: 0.1x0.1, 0.25x0.25, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools | ||
</entry> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I kept the above as placeholders. I'm ok with removing if that's preferred.