Skip to content

Commit

Permalink
Merge pull request #1594 from mnlevy1981/maps/update_ocean_maps
Browse files Browse the repository at this point in the history
Add some maps to config_grids.xml
Added the f19_g17 maps, as wall as the ww3 <-> tx1v1 maps; all files are in inputdata as well.

Test suite: none, just some stand-alone checks
Test baseline: N/A
Test namelist changes: N/A
Test status: bit for bit, plus resolutions that didn't run previously now run

Fixes #1539

User interface changes?: N/A

Code review: @dabail10 can you please look at this? (And maybe see about getting added to ESMCI so I can list you as an official reviewer?)
jedwards4b authored May 24, 2017

Verified

This commit was signed with the committer’s verified signature.
PointKernel Yunsong Wang
2 parents ebc18a9 + 7fa34f5 commit 0e9a1e0
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions config/cesm/config_grids.xml
Original file line number Diff line number Diff line change
@@ -974,6 +974,8 @@
<nx>144</nx> <ny>96</ny>
<file grid="atm|lnd" mask="gx1v6">domain.lnd.fv1.9x2.5_gx1v6.090206.nc</file>
<file grid="ocnice" mask="gx1v6">domain.ocn.1.9x2.5_gx1v6_090403.nc</file>
<file grid="atm|lnd" mask="gx1v7">domain.lnd.fv1.9x2.5_gx1v7.170518.nc</file>
<file grid="ocnice" mask="gx1v7">domain.ocn.fv1.9x2.5_gx1v7.170518.nc</file>
<file grid="ocnice" mask="null">domain.aqua.fv1.9x2.5.nc</file>
<desc>1.9x2.5 is FV 2-deg grid:</desc>
</domain>
@@ -1267,6 +1269,13 @@
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_fv1.9x2.5_aave.130322.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_fv1.9x2.5_aave.130322.nc</map>
</gridmap>
<gridmap atm_grid="1.9x2.5" ocn_grid="gx1v7">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_aave.170518.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_blin.170518.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_patc.170518.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_fv1.9x2.5_aave.170518.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_fv1.9x2.5_aave.170518.nc</map>
</gridmap>
<gridmap atm_grid="1.9x2.5" ocn_grid="tx1v1">
<map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv1.9x2.5_to_tx1v1_aave_da_090710.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv1.9x2.5_to_tx1v1_bilin_da_090710.nc</map>
@@ -1479,6 +1488,12 @@
<map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
</gridmap>

<gridmap ocn_grid="tx1v1" wav_grid="ww3a">
<map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_tx1v1_blin.170523.nc</map>
<map name="OCN2WAV_SMAPNAME">cpl/gridmaps/tx1v1/map_tx1v1_TO_ww3a_blin.170523.nc</map>
<map name="ICE2WAV_SMAPNAME">cpl/gridmaps/tx1v1/map_tx1v1_TO_ww3a_blin.170523.nc</map>
</gridmap>

<gridmap atm_grid="48x96" wav_grid="ww3a">
<map name="ATM2WAV_SMAPNAME">cpl/gridmaps/T31/map_T31_TO_ww3a_bilin_131104.nc</map>
</gridmap>

0 comments on commit 0e9a1e0

Please sign in to comment.