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

For runoff map: fix mask_b and frac_b in nearest neighbor map #2013

Merged
merged 5 commits into from
Nov 3, 2017

Conversation

billsacks
Copy link
Member

Main change: For runoff map: fix mask_b and frac_b in nearest neighbor map.
Previously, mask_b and frac_b were taken from the nearest neighbor map
to the coastal ocean, which is a small subset of what this mask/frac
should be.

Also, in the check_map tool: Do not try to get title attribute.
This wasn't being used, and I was worried that it might cause a crash
when trying to run check_map on files created with
run_merge_mapping_files.sh (because no title attribute was present on
the resulting files).

Test suite: manual checks of mapping files generated with runoff_to_ocn tool
and run of check_map.sh tool
Test baseline: n/a
Test namelist changes: n/a
Test status: bit for bit

Fixes #2009

User interface changes?: none

Update gh-pages html (Y/N)?: N

Code review:

This case came up in mapping the regional Greenland grid to an ocean
grid. Without this fix in place, we got the following error:

fatal:Subscript out of range, error in subscript #0
fatal:An error occurred reading map_in_ms_S
fatal:["Execute.c":8640]:Execute: Error occurred at or near line 177
in file ncl/merge_mapping_files.ncl

Mike Levy gets most of the credit for this fix.
Previously, mask_b and frac_b were taken from the nearest neighbor map
to the coastal ocean, which is a small subset of what this mask/frac
should be.
This wasn't being used, and I was worried that it might cause a crash
when trying to run check_map on files created with
run_merge_mapping_files.sh (because no title attribute was present on
the resulting files).
@billsacks
Copy link
Member Author

@mnlevy1981 - note that this also includes the changes from #2007 . I couldn't get the PR workflow we discussed to work right, so this branch includes both. So:

(1) For your review, do not bother reviewing the first two commits on this branch – just review f4f923f and 4a3fac5.

(2) You should merge #2007 before merging this one - otherwise I think this will auto-close #2007 .

Copy link
Contributor

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

The comment

   ! It may be possible to simply use map_smooth in place of map_orig in the above
   ! map_dup call (thus removing the need for these overrides), but that has not been
   ! tested.

should be removed -- we don't want to duplicate map_smooth because the source grid on that map is the coastal ocean rather than the runoff grid.

Mike Levy pointed out: we don't want to duplicate map_smooth because the
source grid on that map is the coastal ocean rather than the runoff
grid.
@billsacks
Copy link
Member Author

@mnlevy1981 very good point - I have removed the offending comment.

@billsacks
Copy link
Member Author

@mnlevy1981 is this ready to merge to master?

@billsacks
Copy link
Member Author

@mnlevy1981 oh wait, never mind - I forgot my own comment saying that we'll merge the other PR first.

@alperaltuntas alperaltuntas merged commit 184d7de into ESMCI:master Nov 3, 2017
@billsacks billsacks deleted the runoff_nn_fix_mask branch November 3, 2017 17:33
jgfouca pushed a commit that referenced this pull request Feb 23, 2018
Due to the recent updates on default versions of software packages
on Titan, the following softwares were updated accordingly:

cray-netcdf/4.4.1.1 -> 4.4.1.1.3
cray-netcdf-hdf5parallel/4.4.1.1 -> 4.4.1.1.3
cray-parallel-netcdf/1.7.0 -> 1.8.1.3
cray-libsci/16.06.1 -> 16.11.1
atp/2.1.1 -> 2.0.2
cray-mpich/7.4.0 -> 7.6.3
intel/15.0.2.164 -> 18.0.0.128
cce/8.5.0 -> 8.6.2

Fixes #2013

[Non-BFB] - Non Bit-For-Bit
jgfouca pushed a commit that referenced this pull request Feb 23, 2018
Due to the recent updates on default versions of software packages
on Titan, the following softwares were updated accordingly:

cray-netcdf/4.4.1.1 -> 4.4.1.1.3
cray-netcdf-hdf5parallel/4.4.1.1 -> 4.4.1.1.3
cray-parallel-netcdf/1.7.0 -> 1.8.1.3
cray-libsci/16.06.1 -> 16.11.1
atp/2.1.1 -> 2.0.2
cray-mpich/7.4.0 -> 7.6.3
intel/15.0.2.164 -> 18.0.0.128
cce/8.5.0 -> 8.6.2

Fixes #2013
[BFB] - Bit-For-Bit for PGI compiler
[Non-BFB] - Non Bit-For-Bit for Intel compiler
jgfouca pushed a commit that referenced this pull request Mar 13, 2018
Due to the recent updates on default versions of software packages
on Titan, the following softwares were updated accordingly:

cray-netcdf/4.4.1.1 -> 4.4.1.1.3
cray-netcdf-hdf5parallel/4.4.1.1 -> 4.4.1.1.3
cray-parallel-netcdf/1.7.0 -> 1.8.1.3
cray-libsci/16.06.1 -> 16.11.1
atp/2.1.1 -> 2.0.2
cray-mpich/7.4.0 -> 7.6.3
intel/15.0.2.164 -> 18.0.0.128
cce/8.5.0 -> 8.6.2

Fixes #2013

[Non-BFB] - Non Bit-For-Bit
jgfouca pushed a commit that referenced this pull request Mar 13, 2018
Due to the recent updates on default versions of software packages
on Titan, the following softwares were updated accordingly:

cray-netcdf/4.4.1.1 -> 4.4.1.1.3
cray-netcdf-hdf5parallel/4.4.1.1 -> 4.4.1.1.3
cray-parallel-netcdf/1.7.0 -> 1.8.1.3
cray-libsci/16.06.1 -> 16.11.1
atp/2.1.1 -> 2.0.2
cray-mpich/7.4.0 -> 7.6.3
intel/15.0.2.164 -> 18.0.0.128
cce/8.5.0 -> 8.6.2

Fixes #2013
[BFB] - Bit-For-Bit for PGI compiler
[Non-BFB] - Non Bit-For-Bit for Intel compiler
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

runoff_to_ocn mapping: mask_b and frac_b in nn smooth map are mostly 0
4 participants