-
Notifications
You must be signed in to change notification settings - Fork 320
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
mksurfdata_map: replace source (SRC) files of various masks with SRC files with no mask #823
Changes from 2 commits
6fa062b
46ae6a9
7798006
12506f9
7e3a915
84c1630
5f20517
d93f1d6
163a231
edb5c2e
faf2aac
25e3624
57e4b24
7c8f3e2
acf99eb
a2ba7fe
0e43e79
0673a26
9b66478
a977c8a
01f2a56
d3ebddf
9c3ade8
da20c87
33dc03b
9f60042
66f14c9
d976063
14f2ba6
bba7202
f39a043
4856791
0a4f996
3e5a099
50d3085
5700ef2
9bee59b
0043191
5dfe8dd
573009a
4235c43
79a9219
d409574
f81262c
0a769de
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -263,22 +263,12 @@ fi | |
|
||
if [ "$phys" = "clm4_5" ]; then | ||
grids=( \ | ||
"0.5x0.5_AVHRR" \ | ||
"0.25x0.25_MODIS" \ | ||
"0.5x0.5_MODIS" \ | ||
"3x3min_LandScan2004" \ | ||
"3x3min_MODIS-wCsp" \ | ||
"3x3min_USGS" \ | ||
"0.5x0.5_nomask" \ | ||
"0.25x0.25_nomask" \ | ||
"5x5min_nomask" \ | ||
"5x5min_IGBP-GSDP" \ | ||
"5x5min_ISRIC-WISE" \ | ||
"5x5min_ORNL-Soil" \ | ||
"10x10min_nomask" \ | ||
"10x10min_IGBPmergeICESatGIS" \ | ||
"3x3min_GLOBE-Gardner" \ | ||
"3x3min_GLOBE-Gardner-mergeGIS" \ | ||
"0.9x1.25_GRDC" \ | ||
"360x720cru_cruncep" \ | ||
"0.9x1.25_nomask" \ | ||
"3x3min_nomask" \ | ||
"1km-merge-10min_HYDRO1K-merge-nomask" \ | ||
) | ||
|
||
|
@@ -288,7 +278,7 @@ else | |
fi | ||
|
||
# Set timestamp for names below | ||
ekluzek marked this conversation as resolved.
Show resolved
Hide resolved
|
||
CDATE="c"`date +%y%m%d` | ||
CDATE="c"`date -d "-0 days" +%y%m%d` | ||
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. I don't see that we need this change. 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. This was convenient for me when rerunning mkmapdata.sh because I didn't have to recreate all the map_ files from scratch. For example a couple of days ago I set this line to 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. OK, if you want to keep it, add a comment that explains why it's there and how it can help, and how you would use it. Otherwise, it's extra syntax that doesn't actually do anything. |
||
|
||
# Set name of each output mapping file | ||
# First determine the name of the input scrip grid file | ||
|
@@ -346,7 +336,7 @@ case $hostname in | |
intelvers=17.0.1 | ||
module load esmf_libs/$esmfvers | ||
module load intel/$intelvers | ||
module load ncl | ||
module load ncl/6.6.2 | ||
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. Is there a need for a specific version of NCL? If not using the generic one seems better. 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.
...while 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. I had to load intel/18.0.5 recently to get the generic ncl to work with mksurfdata_map.
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. I was just going to say the same thing, if you use intelvers=18.0.5 you can load generic ncl, but otherwise you have to name the version. And you should do the update to intel 18 anyway, as we have that on the release branch. 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. I think it's a bug on CISL's part that you can't load ncl without naming a specific version. We could create a ticket for them about this. |
||
module load nco | ||
|
||
if [ "$interactive" = "NO" ]; then | ||
|
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.
Regarding the diffs in VIC variables mentioned in 57e4b24,
I have confirmed that the two files above differ only in that the mask = 1 everywhere in the nomask file.